Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/top-level/all-packages.nix		2013-11-01 08:31:54 +01:00
..
all-packages.nix	Merge branch 'master' into stdenv-updates	2013-11-01 08:31:54 +01:00
guile-2-test.nix	…
haskell-defaults.nix	…
haskell-packages.nix	…
make-tarball.nix	…
mingw.nix	…
node-packages-generated.nix	…
node-packages.json	…
node-packages.nix	…
perl-packages.nix	…
platforms.nix	…
python-packages-generated.nix	…
python-packages.json	…
python-packages.nix	…
r-packages.nix	…
release-cross.nix	…
release-lib.nix	…
release-python.nix	…
release-small.nix	…
release.nix	…