Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. ...

Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix

2013-07-30 11:29:30 +02:00

..

2.6

Merge remote-tracking branch 'master' into stdenv-updates.

2013-07-30 11:29:30 +02:00

2.7

Merge remote-tracking branch 'master' into stdenv-updates.

2013-07-30 11:29:30 +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