Eelco Dolstra 2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv ... Conflicts: pkgs/stdenv/generic/default.nix		2014-08-22 00:07:05 +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	* By popular demand, restore Python 2.6.	2011-04-06 21:57:30 +00:00
search-path.patch	* By popular demand, restore Python 2.6.	2011-04-06 21:57:30 +00:00
setup-hook.sh	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00