Vladimír Čunát 9443129b08 Merge master into stdenv-updates ... Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)		2014-01-04 18:34:53 +01:00
..
all-packages.nix	Merge master into stdenv-updates	2014-01-04 18:34:53 +01:00
guile-2-test.nix
haskell-defaults.nix	haskell-defaults.nix: fix quickcheck-io build with GHC 7.2.2	2013-12-29 14:12:57 +01:00
haskell-packages.nix	haskell-bson: depend on binary 0.7.1.0	2014-01-01 23:36:56 +01:00
make-tarball.nix
mingw.nix
node-packages-generated.nix	Update bower2nix	2014-01-03 14:27:07 -05:00
node-packages.json	Add bower2nix and update nix packages	2014-01-03 14:15:36 -05:00
node-packages.nix	add node-protobuf + binary dep	2013-12-23 11:29:16 +01:00
perl-packages.nix	Remove uses of __overrides feature	2013-12-30 11:04:45 -05:00
platforms.nix
python-packages-generated.nix
python-packages.json
python-packages.nix	pythonPackages.nose: skip failing test	2014-01-02 23:38:27 +01:00
r-packages.nix	Remove uses of __overrides feature	2013-12-30 11:04:45 -05:00
release-cross.nix
release-lib.nix
release-python.nix	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
release-small.nix
release.nix	Merge master into stdenv-updates	2014-01-04 18:34:53 +01:00