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
python-linkme-wrapper.nix
python-linkme-wrapper.sh
wrapper.nix