Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
all-packages.nix	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
guile-2-test.nix
haskell-defaults.nix	haskell-vty: update to version 5.1.3	2014-07-28 20:32:59 +02:00
haskell-packages.nix	Merge pull request #3457 from luke-clifton/lc-haskell-ad	2014-08-04 14:16:25 +03:00
make-tarball.nix	Tarball: Check whether Nixpkgs evaluation doesn't depend on its path	2014-04-20 00:08:52 +02:00
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	Add a bunch of Hydra dependencies to the channel	2014-08-01 16:11:33 +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	Plone: update to 4.3.3	2014-05-30 21:08:56 +01:00
python-packages.nix	pythonPackage.gunicorn: update to 19.1.0	2014-08-04 10:11:52 +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	Fix tarball job	2014-07-23 23:00:18 +02:00
release.nix	Fix tarball job	2014-07-23 23:00:18 +02:00