Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates. ... Conflicts: pkgs/development/libraries/icu/default.nix pkgs/tools/misc/coreutils/default.nix		2013-04-19 11:48:11 +02:00
..
admin	tigervnc: Drop dependency on libxcrypt	2013-01-28 17:19:03 +01:00
archivers	cpio: fix build without gets	2013-03-20 23:01:36 +01:00
backup	obnam: Update to 1.4	2013-04-18 16:09:35 +02:00
bluetooth	koffice, kbluetooth: remove from hydra	2013-03-02 09:21:11 +01:00
cd-dvd	cuetools metadata: license, maintainer, platforms	2013-03-31 21:43:53 -07:00
compression	Merge remote-tracking branch 'origin/stdenv-updates' into illumos	2013-03-17 13:22:24 +01:00
filesystems	openssh: Update to 6.2p1	2013-04-12 15:27:13 +02:00
graphics	glxinfo: update the mesa-demos source	2013-04-17 13:36:05 +02:00
inputmethods/fcitx	add fcitx-4.2.7	2013-01-28 11:35:03 +08:00
misc	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
networking	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
package-management	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-03-28 14:02:56 +01:00
security	Remove the "proprietary" license	2013-04-12 14:37:50 +02:00
system	garden	2013-04-06 08:20:27 +02:00
text	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-04-01 13:39:57 +02:00
typesetting	some libintl and libiconv cleanups + non-linux fixes	2013-04-14 13:43:09 +02:00
video	add swfmill-0.3.2	2013-02-05 11:36:18 +08:00
virtualization	ec2-ami-tools: Update to 1.4.0.9	2013-01-24 18:23:04 +01:00
X11	xpra: Use new ffmpeg attribute	2013-04-05 06:49:23 -04:00