nixpkgs/pkgs/development/interpreters/python
Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
..
2.6 merge 'staging' into modular-stdenv 2014-09-08 18:16:54 +02:00
2.7 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
3.2 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
3.3 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
3.4 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
docs pythonDocs: recurseIntoAttrs does not recurse, bypass problem 2013-03-13 13:16:03 +01:00
python-linkme-wrapper.nix preferLocalBuild: set to true for wrappers and fetchers 2014-02-10 21:04:17 +01:00
python-linkme-wrapper.sh python: fix linkme-wrapper 2013-02-15 06:14:58 +01:00
wrapper.nix python-wrapper: add 'ignoreCollisions' parameter (which default to 'false') 2014-02-24 12:41:12 +01:00