Commit graph

1145 commits

Author SHA1 Message Date
Vladimír Čunát
46b48b0b43 Revert "vimPlugins: update" due to bad hashes
This reverts commit 57a0c44c2c.
https://github.com/NixOS/nixpkgs/commit/f799749442489#commitcomment-9901870
2015-02-24 21:59:41 +01:00
Vladimír Čunát
f799749442 vimPlugins.Syntastic: fix fetchgit hash
I've got no idea why the hash was wrong. I hope the hashes aren't unstable.
Reported on http://unix.stackexchange.com/questions/186519/unable-to-install-vim-plugins
2015-02-24 21:21:05 +01:00
Thomas Tuegel
18e594eddb hplip: update to 3.15.2 2015-02-21 20:19:21 -06:00
Tobias Geerinckx-Rice
72b30b1b3d wakatime 20150213 -> 3.0.7 2015-02-19 14:47:52 +01:00
Nikolay Amiantov
aec96d46c1 Merge pull request #6375 from abbradar/winetricks
winetricks: update
2015-02-19 02:29:54 +03:00
Nikolay Amiantov
ca8137d4a8 winetricks: update 2015-02-19 02:12:09 +03:00
Arseniy Seroka
57a0c44c2c vimPlugins: update 2015-02-18 18:36:48 +03:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Arseniy Seroka
a6b1cb8411 vimPlugins.YCM: fix sha 2015-02-17 16:54:06 +03:00
Tobias Geerinckx-Rice
3049ef6769 vim-plugins: add wakatime 2015-02-16 02:20:11 +01:00
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Shea Levy
127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
Herwig Hochleitner
dea3ac7783 Use XDG_ICON_DIRS in cdemu's XDG_DATA_DIRS 2015-02-10 14:44:29 +01:00
Herwig Hochleitner
7d24bcdbcf Add gdk_pixbuf, gnome_icon_theme and librsvg to cdemu gui programs 2015-02-10 14:25:23 +01:00
Herwig Hochleitner
eb03122cf6 Use gnome3 icon theme in cdemu 2015-02-10 14:09:27 +01:00
Herwig Hochleitner
67f9c8b025 Fix cdemu ui gsettings schema paths 2015-02-10 13:14:25 +01:00
Herwig Hochleitner
b909def3e1 Whitespace cleanup 2015-02-10 11:49:32 +01:00
Herwig Hochleitner
2961b83d08 Add cdemu packages and module 2015-02-10 06:49:47 +01:00
Michael Raskin
7a7572dc31 Update Wine unstable 2015-02-10 00:28:00 +03:00
Arseniy Seroka
e7db6fd1ac vimplugins: update vim2nix and VAM 2015-02-09 01:43:24 +03:00
Valérian Galliat
f4951338ce vim-plugins: add sensible 2015-02-08 16:16:31 +01:00
Eric Seidel
e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Arseniy Seroka
a6a9d8137f vimPlugins.youCompleteMe: fix name
Using date instead of rev
See https://github.com/NixOS/nixpkgs/pull/4499#issuecomment-58805580 for more info why.
2015-02-07 23:15:00 +03:00
Cillian de Róiste
c6c1aa11f8 update jack2 to version 1.9.10
Copied from 8bae32afb58b2bd21, without the tags file
2015-02-07 10:37:54 +01:00
Rok Garbas
525a318a0f vimPlugins.YouCompleteMe: name should reflect revision 2015-02-06 21:05:43 +01:00
Rok Garbas
e4c0ee53d2 vimPlugins.YouCompleteMe: updated to latest 2015-02-06 20:07:10 +01:00
Marc Weber
411545b038 update vam, vim2nix, fixes 6183 2015-02-06 20:02:56 +01:00
Pascal Wittmann
288ed0cfa0 xosd: update from 2.2.12 to 2.2.14 and added meta information 2015-02-06 15:31:32 +01:00
Arseniy Seroka
e01997e1ef vim-plugins: add xkb-switch 2015-02-04 00:17:08 +03:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Michael Alyn Miller
6cb1d1aaaf Add xss-lock 2015-02-01 10:07:01 -08:00
Michael Raskin
3566a73b5e Update wine-unstable 2015-02-01 18:41:33 +03:00
Cray Elliott
221a6f67a5 monthly bump of dolphinEmuMaster
check out what's new at https://dolphin-emu.org/blog/2015/02/01/dolphin-progress-report-january-2015/
2015-02-01 03:59:44 -08:00
Thomas Tuegel
8994b50dda orion: add GTK3 theme 2015-01-26 20:59:51 -06:00
Edward Tjörnhammar
6bbec634a7 Merge pull request #5850 from edwtjo/kodi-plugins
XBMC to Kodi migrations
2015-01-24 14:17:14 +01:00
David Virgilio
0075e6bd3a frescobaldi: add pygame dependency for midi support 2015-01-22 23:34:10 -06:00
Charles Strahan
8d49e87dec Merge pull request #4677 from cstrahan/pleasant-ruby
Pleasant ruby
2015-01-21 23:27:38 -05:00
Thomas Tuegel
28b55a318a hplip: ensure plugin version always up-to-date 2015-01-21 07:57:05 -06:00
Thomas Tuegel
7a20c4cae4 hplip: version 3.14.10 2015-01-21 07:57:05 -06:00
Charles Strahan
dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Edward Tjörnhammar
3a321906d1 Add Kodi retroarch launchers 2015-01-19 22:14:37 +01:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Michael Raskin
41f0b9e851 Wine unstable: 1.7.33 -> 1.7.34 2015-01-11 16:43:29 +03:00
Moritz Maxeiner
56fe81a2e6 seafile: update client, ccnet, libsearpc and shared 2015-01-09 13:37:44 +01:00
Sander van der Burg
af9bb71848 Merge pull request #5592 from AndersonTorres/fsuae
FS-UAE (version 2.4.1): New Package
2015-01-06 09:59:56 +00:00
AndersonTorres
291d507d98 FS-UAE (version 2.4.1): New Package
FS-UAE is a new, cycle-accurate, customizable Amiga Emulator.
2015-01-05 17:47:07 -02:00
Cray Elliott
5a92c9f0a1 remove extraneous platform from dolphinEmuMaster 2015-01-03 23:00:29 -08:00
Cray Elliott
c9d963c4e6 time for the monthly dolphinEmuMaster bump 2015-01-03 19:44:34 -08:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Charles Strahan
145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00