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
..
cabal-install	Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix.	2013-03-23 15:58:14 +01:00
checkinstall	checkinstall: Fix build on i686-linux	2013-05-03 13:43:47 +02:00
disnix	Update disnix.	2013-02-28 20:04:03 +01:00
dpkg	dpkg: Fix caching of architecture name	2012-12-04 19:54:44 +01:00
nix	nixUnstable: Update to 1.5.2pre3091_772b709	2013-04-30 00:17:18 +02:00
opkg	Added opkg package	2011-06-28 09:45:51 +00:00
rpm	Revert "Update RPM to 4.10.0."	2012-07-24 21:57:18 +02:00