Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates ... Conflict in kerberos, which was updated both in master and in stdenv-updates. Kept the stdenv-updates version, except pulled in the enableParallelBuilding change from master. Signed-off-by: Shea Levy <shea@shealevy.com> Conflicts: pkgs/development/libraries/kerberos/krb5.nix		2013-05-04 18:28:48 -04:00
..
admin	tigervnc: Drop dependency on libxcrypt	2013-01-28 17:19:03 +01:00
archivers	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
backup	bup: enable Hydra builds	2013-04-26 12:51:46 +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 branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
networking	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
package-management	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
security	munge 0.5.10: New package, a credentials handler for clusters	2013-04-22 16:04:41 +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	x11vnc: Properly hard-code the path to xdpyinfo	2013-05-01 20:49:56 -04:00