Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv ... In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix		2014-09-08 18:16:54 +02:00
..
default.nix	include ssl with python2.6 as is the case with 2.7	2014-08-12 13:33:23 +02:00
nix-store-mtime.patch
search-path.patch
setup-hook.sh	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00