Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix		2014-07-28 11:30:49 +02:00
..
all-packages.nix	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
guile-2-test.nix
haskell-defaults.nix	haskell-defaults.nix: simplify references to the latest version of happy	2014-07-14 17:33:48 +02:00
haskell-packages.nix	haskell-haste-perch: drop unsupported package	2014-07-22 14:20:59 +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	ListBinarySearch: add package	2014-07-09 16:33:09 +02:00
php-packages.nix	Use buildPecl for php-xcache	2014-07-03 11:01:19 -04:00
platforms.nix
python-packages-generated.nix	Plone: update to 4.3.3	2014-05-30 21:08:56 +01:00
python-packages.json	Plone: update to 4.3.3	2014-05-30 21:08:56 +01:00
python-packages.nix	Merge pull request #3365 from geerds/virtualenvwrapper	2014-07-25 00:20:10 +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