From 96d15eaddb17e0bb9097a04cfe9d1afbe46a1de5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 17 Sep 2017 11:08:12 +0200 Subject: [PATCH] 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. --- pkgs/development/interpreters/python/cpython/2.7/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 0d5f1e7e4ca3..4ac827db7cb6 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