summary refs log tree commit diff
path: root/pkgs/development/interpreters/python
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2017-09-17 11:08:12 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2017-09-17 11:09:26 +0200
commit96d15eaddb17e0bb9097a04cfe9d1afbe46a1de5 (patch)
treef314d781a6d7adf94a1a6046788975b423f84941 /pkgs/development/interpreters/python
parentbebdd7ac61ba0cd245cb8cfe852001b5d413c57e (diff)
downloadnixpkgs-96d15eaddb17e0bb9097a04cfe9d1afbe46a1de5.tar
nixpkgs-96d15eaddb17e0bb9097a04cfe9d1afbe46a1de5.tar.gz
nixpkgs-96d15eaddb17e0bb9097a04cfe9d1afbe46a1de5.tar.bz2
nixpkgs-96d15eaddb17e0bb9097a04cfe9d1afbe46a1de5.tar.lz
nixpkgs-96d15eaddb17e0bb9097a04cfe9d1afbe46a1de5.tar.xz
nixpkgs-96d15eaddb17e0bb9097a04cfe9d1afbe46a1de5.tar.zst
nixpkgs-96d15eaddb17e0bb9097a04cfe9d1afbe46a1de5.zip
python27: support test/support
In the maintenance release bump in
90059701a836b0d0dbc676e2d1ce417cc5a25bd2 a certain change to /test/ was
backported from Python 3:

- bpo-30207: To simplify backports from Python 3, the test.test_support
  module was converted into a package and renamed to test.support.  The
  test.script_helper module was moved into the test.support package.
  Names test.test_support and test.script_helper are left as aliases to
  test.support and test.support.script_helper.
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r--pkgs/development/interpreters/python/cpython/2.7/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 0d5f1e7e4ca..4ac827db7cb 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -163,7 +163,8 @@ in stdenv.mkDerivation {
         # functionality to 2.x from 3.x
         for item in $out/lib/python${majorVersion}/test/*; do
           if [[ "$item" != */test_support.py*
-             && "$item" != */regrtest.py* ]]; then
+             && "$item" != */test/support
+             && "$item" != */test/regrtest.py* ]]; then
             rm -rf "$item"
           else
             echo $item