Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. ...

Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix

2013-12-04 18:33:52 +01:00

..

2.6

Merge branch 'origin/master' into stdenv-updates.

2013-10-18 18:57:24 +02:00

2.7

Merge branch 'origin/master' into stdenv-updates.

2013-10-18 18:57:24 +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

Partial revert of b09f8110db

2013-11-19 09:04:32 -05:00