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
..
2.6	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
2.7	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
3.2	recurse into python33 and pypy packages	2013-07-29 14:52:19 +02:00
3.3	recurse into python33 and pypy packages	2013-07-29 14:52:19 +02:00
docs	pythonDocs: recurseIntoAttrs does not recurse, bypass problem	2013-03-13 13:16:03 +01:00
python-linkme-wrapper.nix	python-linkme-wrapper	2013-01-22 15:28:30 +01:00
python-linkme-wrapper.sh	python: fix linkme-wrapper	2013-02-15 06:14:58 +01:00
wrapper.nix	fix pythonWrapper for non-gnu ln	2013-03-25 15:13:08 +01:00