Vladimír Čunát 1575bc652e Merge branch 'master' into staging ... Conflicts (simple): pkgs/os-specific/linux/util-linux/default.nix It seems this merge creates a new stdenv hash, because we had changes on both branches :-/		2015-01-13 18:07:11 +01:00
..
all-packages.nix	Merge branch 'master' into staging	2015-01-13 18:07:11 +01:00
guile-2-test.nix
haskell-defaults.nix	haskell-defaults.nix: down-grade cabal-install to 1.20.x for GHC < 7.4.x	2015-01-05 19:52:28 +01:00
haskell-ng.nix	pkgs/development/haskell-modules/lib.nix: add funky helper function for overriding	2015-01-10 23:36:59 +01:00
haskell-packages.nix	Merge pull request #5740 from alpmestan/add-haskell-sitemap	2015-01-13 13:35:56 +00:00
lua-packages.nix
make-tarball.nix
node-packages-generated.nix	node-packages.json: Add castnow & regenerate.	2015-01-10 12:11:58 +01:00
node-packages.json	node-packages.json: Add castnow & regenerate.	2015-01-10 12:11:58 +01:00
node-packages.nix
perl-packages.nix	NetAddrIP: 4.072 -> 4.075	2015-01-09 15:01:30 -08:00
php-packages.nix	php: add geoip-1.1.0 module	2015-01-09 13:55:08 +00:00
platforms.nix
python-packages-generated.nix
python-packages.json
python-packages.nix	capnproto: update to 0.5.0	2015-01-12 03:24:52 -05:00
release-cross.nix
release-lib.nix	Tweak	2015-01-06 11:55:47 +01:00
release-python.nix
release-small.nix
release.nix	Build stdenv on Darwin	2015-01-06 11:55:47 +01:00