Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix		2014-10-07 00:09:37 +02:00
..
all-packages.nix	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
guile-2-test.nix
haskell-defaults.nix	haskell-parsec: update to version 3.1.6	2014-09-14 00:06:40 +02:00
haskell-packages.nix	haskell-sloane: update to version 1.9.3	2014-10-06 11:21:39 +02:00
lua-packages.nix	Added more lua modules to lua-packages, added them as dependencies for	2014-09-30 07:42:19 +01:00
make-tarball.nix
node-packages-generated.nix	Re-add bower/bower2nix, regenerated node-packages-generated.nix	2014-10-06 20:40:14 +02:00
node-packages.json	Re-add bower/bower2nix, regenerated node-packages-generated.nix	2014-10-06 20:40:14 +02:00
node-packages.nix
perl-packages.nix	perl-packages.nix: strip trailing whitespace	2014-10-04 22:52:21 +02:00
php-packages.nix
platforms.nix
python-packages-generated.nix	python-packages-generated.nix: fix lxml-2.3.6 by hardcoding the fix	2014-09-17 21:37:37 +02:00
python-packages.json	python-packages-generated.nix: fix lxml-2.3.6 by hardcoding the fix	2014-09-17 21:37:37 +02:00
python-packages.nix	python-scipy: update 0.12 -> 0.14	2014-10-04 18:41:42 +02:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix
release.nix	Merge recent master into staging	2014-09-13 21:48:29 +02:00