Vladimír Čunát 52404a868d Merge recent master into staging ... Nixpkgs Hydra: ?compare=1157272 TODO: port e22889064f Conflicts: nixos/tests/gnome3_10.nix (auto-solved) pkgs/applications/video/aegisub/default.nix pkgs/development/libraries/boost/1.55.nix		2014-11-05 15:00:44 +01:00
..
all-packages.nix	Merge recent master into staging	2014-11-05 15:00:44 +01:00
guile-2-test.nix
haskell-defaults.nix	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
haskell-packages.nix	add elm-reactor to the package list	2014-11-04 11:47:32 +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	perlPackages.Encode: update from 2.55 to 2.63	2014-10-27 07:40:24 +02:00
php-packages.nix	change md5sum to sha256sum for a few packages	2014-10-12 16:13:21 +02:00
platforms.nix
python-packages-generated.nix
python-packages.json
python-packages.nix	fix eval..	2014-11-04 21:36:19 +01:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix
release.nix	jfsrec: Remove derivation	2014-11-02 17:22:27 -08:00