Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates ... Conflicts (relatively simple): pkgs/development/interpreters/python/2.7/default.nix pkgs/development/libraries/dbus/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/common.nix		2013-06-20 19:21:25 +02:00
..
admin
archivers	unzip: add bzip2 as native build input	2013-05-26 19:25:37 +02:00
audio/pa-applet	pa-audio: adding hash	2013-05-13 10:10:05 +02:00
backup	partclone, partimage. both are used by clonezilla and drbl (which I haven't packaged yet)	2013-05-16 17:18:11 +02:00
bluetooth	bluedevil: update to 1.3.1	2013-05-10 04:38:16 +03:00
cd-dvd
compression	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-05-22 12:30:02 +02:00
filesystems	Add unionfs-fuse and ntfs-3g to the channel	2013-06-15 20:47:47 +02:00
graphics	Fix graphviz building on darwin	2013-06-18 12:24:40 +02:00
inputmethods/fcitx
misc	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
networking	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
package-management	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
security	gnupg: use libiconvOrEmpty instead of libiconv (not required for glibc platforms)	2013-06-13 14:17:27 +10:00
system	Fix vboot_reference's libuuid overriding to work on systems wo libuuid	2013-05-27 23:36:43 +02:00
text	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
typesetting	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-15 17:15:32 +04:00
video	Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.	2013-06-07 03:15:45 +03:00
virtualization	Update euca2ools to 2.1.3	2013-05-30 15:02:36 +02:00
X11	Update xpra to 0.9.5	2013-06-18 15:36:42 +02:00