Vincent Laporte 7d3706c788 Merge remote-tracking branch 'upstream/master' into ocaml-sqlite3EZ ... Conflicts: pkgs/top-level/all-packages.nix		2014-09-02 13:32:43 +02:00
..
all-packages.nix
guile-2-test.nix
haskell-defaults.nix
haskell-packages.nix
make-tarball.nix
node-packages-generated.nix
node-packages.json
node-packages.nix
perl-packages.nix
php-packages.nix
platforms.nix
python-packages-generated.nix
python-packages.json
python-packages.nix
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix
release.nix