nixpkgs/pkgs/tools
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
..
admin Merge master into x-updates 2013-12-02 21:41:16 +01:00
archivers dar: update from 2.4.6 to 2.4.11 2013-12-15 12:49:39 +02:00
audio pa_applet: work around a build problem 2013-12-10 13:41:20 +01:00
backup obnam: Update to 1.6 2013-12-18 16:21:47 +01:00
bluetooth
cd-dvd
compression
filesystems archivemount: update from 0.6.1 to 0.8.3 2013-12-18 18:18:16 +02:00
graphics Merge master into x-updates 2013-12-18 23:21:29 +01:00
inputmethods/fcitx
misc Merge master into x-updates 2013-12-18 23:21:29 +01:00
networking Merge master into x-updates 2013-12-18 23:21:29 +01:00
package-management cabal-install: jailbreak version 1.18.0.2 to fix the build with GHC 7.7 or later 2013-12-03 22:23:21 +01:00
security pinentry: update from 0.8.2 to 0.8.3 2013-12-18 18:18:39 +02:00
system freeipmi: update from 1.1.3 to 1.3.4 2013-12-18 18:18:27 +02:00
text highlight: update from 3.5 to 3.9 2013-12-18 18:18:31 +02:00
typesetting auctex: update from 11.85 to 11.87 2013-12-18 18:18:17 +02:00
video
virtualization
X11 Merge master into x-updates 2013-12-18 23:21:29 +01:00