Vladimír Čunát 77da5efc78 merge the rest of multiple-outputs ... Conflicts: pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken) pkgs/development/tools/misc/patchelf/default.nix (easy) pkgs/stdenv/generic/setup.sh (previous merge taken)		2014-08-25 10:41:49 +02:00
..
all-packages.nix	merge the rest of multiple-outputs	2014-08-25 10:41:49 +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-timeparsers: build this package with a recent version of 'convertible'	2014-08-20 20:26:57 +02:00
make-tarball.nix
node-packages-generated.nix	Revert "titanium: Bump to 3.3.0"	2014-07-18 23:49:33 +02:00
node-packages.json	Revert "titanium: Bump to 3.3.0"	2014-07-18 23:49:33 +02:00
node-packages.nix
perl-packages.nix	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
php-packages.nix	Use buildPecl for php-xcache	2014-07-03 11:01:19 -04:00
platforms.nix
python-packages-generated.nix	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
python-packages.json
python-packages.nix	Merge pull request #3612 from nathanielbaxter/dev/flexget_update	2014-08-16 15:05:23 +02:00
release-cross.nix
release-lib.nix
release-python.nix	release-python: heavily reduce list of built packages	2014-06-20 14:17:50 +02:00
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