Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates ... x-updates is supposed to merge after stdenv-updates, so let's test it Conflicts: pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer) pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)		2013-02-21 12:43:00 +01:00
..
all-packages.nix	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
guile-2-test.nix
haskell-defaults.nix	GHC 7.6.2	2013-01-29 20:42:28 +01:00
haskell-packages.nix	haskell-uuid: add version 1.2.9	2013-02-18 11:20:20 +01:00
make-tarball.nix	Nixpkgs channel: Use XZ compression for nixexprs.tar	2013-01-30 12:52:07 +01:00
mingw.nix
node-packages.nix
perl-packages.nix	JSON::Any: Pull in JSON	2013-01-28 23:14:59 +01:00
platforms.nix	Raspberrypi platform: make ext4 in kernel	2013-01-29 20:17:36 +01:00
python-packages.nix	Merge branch 'upstream-master' into stdenv-updates	2013-02-19 10:09:39 -05:00
release-cross.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
release-lib.nix
release-python.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
release-small.nix	pwdutils: Remove	2013-01-28 17:58:43 +01:00
release.nix	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00