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
..
all-packages.nix	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
guile-2-test.nix
haskell-defaults.nix	ghc: add version 7.6.3 (and a corresponding package set)	2013-04-21 20:10:27 +02:00
haskell-packages.nix	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
make-tarball.nix	Add an "unstable" aggregate to replace the "unstable" view	2013-03-26 11:59:00 +01:00
mingw.nix
node-packages.nix	nodePackages.patchLatest: Handle tarballs whose root directories are already named 'package'	2013-04-03 07:41:02 -04:00
perl-packages.nix	Merge pull request #499 from bjornfor/perl-modules	2013-05-03 00:43:16 -07:00
platforms.nix	fuloong linux: add CGROUPS and disable FTRACE	2013-03-30 23:38:39 +01:00
python-packages.nix	Add doxypy nixpkg	2013-04-29 14:25:25 -04:00
release-cross.nix	release-lib.nix: Make the set of supported platforms an argument	2013-03-26 13:12:25 +01:00
release-haskell.nix	release-haskell.nix: fsnotify won't build with ghc 6.x	2013-04-24 13:21:06 +02:00
release-lib.nix	release-lib.nix: Make the set of supported platforms an argument	2013-03-26 13:12:25 +01:00
release-python.nix	vdrift: Remove from the channel	2013-05-02 13:26:15 +02:00
release-small.nix	Merge branch 'master' into stdenv-updates.	2013-04-07 23:37:12 +02:00
release.nix	openssh: Update to 6.2p1	2013-04-12 15:27:13 +02:00