Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates ... Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix		2013-05-08 13:46:46 +02:00
..
all-packages.nix	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
guile-2-test.nix
haskell-defaults.nix
haskell-packages.nix	haskell-cgi: downgrade to version 3001.1.7.5 in GHC 7.6.x	2013-05-03 11:38:57 +02:00
make-tarball.nix
mingw.nix
node-packages.nix	nodePackages.underscore: Update	2013-05-06 12:56:15 -04:00
perl-packages.nix
platforms.nix
python-packages.nix	Merge pull request #509 from coroa/elpy-pkg	2013-05-07 16:45:29 -07:00
release-cross.nix
release-haskell.nix
release-lib.nix
release-python.nix	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
release-small.nix
release.nix