Eelco Dolstra 2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv ... Conflicts: pkgs/stdenv/generic/default.nix		2014-08-22 00:07:05 +02:00
..
all-packages.nix	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
guile-2-test.nix
haskell-defaults.nix	Revert "Many minor fixes to get things building after recent compiler changes".	2014-08-11 14:48:35 +02:00
haskell-packages.nix	haskell-{pure-cdb,hscope}: pass 'null' instead of 'testSimple', which is broken	2014-08-14 14:41:23 +02:00
make-tarball.nix
node-packages-generated.nix
node-packages.json
node-packages.nix
perl-packages.nix	Enable perl-libwww-perl-6.05 on OS X	2014-08-08 09:32:48 +02:00
php-packages.nix
platforms.nix
python-packages-generated.nix
python-packages.json
python-packages.nix	add pythonPackages.tox	2014-08-14 20:28:39 +02:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix	Make platforms.allBut accept a list rather than a single platform	2014-08-09 12:31:33 +02:00
release.nix	get xorg/x11 working on Darwin	2014-08-12 20:40:57 -04:00