Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/boost/generic.nix		2014-11-11 23:48:08 +01:00
..
all-packages.nix	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
guile-2-test.nix
haskell-defaults.nix	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
haskell-packages.nix	Revert "Revert "haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5"".	2014-11-11 21:17:14 +01:00
lua-packages.nix	Merge pull request #4535 from flosse/lua-bitop	2014-10-15 09:41:32 +02:00
make-tarball.nix
node-packages-generated.nix	nodejs: added some packages	2014-11-02 22:42:09 +01:00
node-packages.json	nodejs: added some packages	2014-11-02 22:42:09 +01:00
node-packages.nix	nodejs: added some packages	2014-11-02 22:42:09 +01:00
perl-packages.nix	Fixed many descriptions	2014-11-11 14:36:34 +01:00
php-packages.nix
platforms.nix
python-packages-generated.nix	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
python-packages.json
python-packages.nix	Fixed many descriptions	2014-11-11 14:36:34 +01:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix
release.nix	Fix unstable job evaluation	2014-11-05 13:00:26 +01:00