diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-24 12:24:13 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-24 12:24:13 +0200 |
commit | f4be4f5e54c8fa992249da71a72e27b4005656a7 (patch) | |
tree | 6e417c55e3cd8413c51bbf01ad3f5be656ed807e /pkgs/development/interpreters/python/3.4 | |
parent | ffc2c539b4d2b905ca99ceda99a4af81fec8e459 (diff) | |
parent | 2a44f5628dba986a7ae36ac4fb2ae76d35d37779 (diff) |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/development/interpreters/python/3.4')
-rw-r--r-- | pkgs/development/interpreters/python/3.4/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index b76b00047ba6b..e585c6c148ddc 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -54,9 +54,18 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; postInstall = '' - rm -rf "$out/lib/python${majorVersion}/test" - ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" + # needed for some packages, especially packages that backport functionality + # to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* ]]; then + rm -rf "$item" + else + echo $item + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py + ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" paxmark E $out/bin/python${majorVersion} ''; |