diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-18 10:18:14 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-18 10:18:14 -0500 |
| commit | da8f155b2a5d481770172e25bfdc6e9fc2da8c1b (patch) | |
| tree | 23aaf94336fd9c120f904374afbe19547b08cf03 /pkgs/development/interpreters/python | |
| parent | f7775a4c2c9cd5b24890194a4644ae06a4d4fd1c (diff) | |
| parent | da4ef05326bce443effc500b33a97a2f370a54ff (diff) | |
| download | nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.tar nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.tar.gz nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.tar.bz2 nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.tar.lz nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.tar.xz nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.tar.zst nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.zip | |
Merge branch 'master' into staging-next
Conflicts: pkgs/development/python-modules/sphinxext-opengraph/default.nix
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/tests.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 764ab29e919..49dfe0e4644 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -20,7 +20,15 @@ let envs = let inherit python; pythonEnv = python.withPackages(ps: with ps; [ ]); - pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]); + pythonVirtualEnv = if python.isPy3k + then + python.withPackages(ps: with ps; [ virtualenv ]) + else + python.buildEnv.override { + extraLibs = with python.pkgs; [ virtualenv ]; + # Collisions because of namespaces __init__.py + ignoreCollisions = true; + }; in { # Plain Python interpreter plain = rec { |