Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/development/compilers/ghc/with-packages.nix		2013-08-16 22:51:13 +02:00
..
default.nix	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +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	* By popular demand, restore Python 2.6.	2011-04-06 21:57:30 +00:00