diff options
author | K900 <me@0upti.me> | 2024-01-09 22:42:37 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2024-01-09 22:42:37 +0300 |
commit | 838aefefc3ff5e4c8e29efe98cd38284d179d98a (patch) | |
tree | db9d4b01f4c58b9e062386edbf91c3351903f999 /pkgs/development/interpreters/python | |
parent | d8364a95c7048af5d4036f1bc1d03d448a8bb017 (diff) | |
parent | 8736250fc2dd54702e7d53936b672e20f44fc9d1 (diff) | |
download | nixlib-838aefefc3ff5e4c8e29efe98cd38284d179d98a.tar nixlib-838aefefc3ff5e4c8e29efe98cd38284d179d98a.tar.gz nixlib-838aefefc3ff5e4c8e29efe98cd38284d179d98a.tar.bz2 nixlib-838aefefc3ff5e4c8e29efe98cd38284d179d98a.tar.lz nixlib-838aefefc3ff5e4c8e29efe98cd38284d179d98a.tar.xz nixlib-838aefefc3ff5e4c8e29efe98cd38284d179d98a.tar.zst nixlib-838aefefc3ff5e4c8e29efe98cd38284d179d98a.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r-- | pkgs/development/interpreters/python/tests.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 67670ceb6546..df4484f9ec68 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -125,6 +125,9 @@ let extension = self: super: { foobar = super.numpy; }; + # `pythonInterpreters.pypy39_prebuilt` does not expose an attribute + # name (is not present in top-level `pkgs`). + is_prebuilt = python: python.pythonAttr == null; in lib.optionalAttrs (python.isPy3k) ({ test-packageOverrides = let myPython = let @@ -138,7 +141,10 @@ let # test-overrideScope = let # myPackages = python.pkgs.overrideScope extension; # in assert myPackages.foobar == myPackages.numpy; myPackages.python.withPackages(ps: with ps; [ foobar ]); - } // lib.optionalAttrs (python ? pythonAttr) { + # + # Have to skip prebuilt python as it's not present in top-level + # `pkgs` as an attribute. + } // lib.optionalAttrs (python ? pythonAttr && !is_prebuilt python) { # Test applying overrides using pythonPackagesOverlays. test-pythonPackagesExtensions = let pkgs_ = pkgs.extend(final: prev: { |