diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-07 12:01:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-07 12:01:11 +0000 |
commit | 03dd2b9470307c4ca13ac4d217a151ba0f06b46c (patch) | |
tree | e18c7a8534e2be64d90e84d9f802d2addde248f3 /pkgs/development/interpreters | |
parent | 966fd30804ad0e400fa3502e9f848bfad63b1852 (diff) | |
parent | 5ef42fcd84b2baa16f43554f1c1f1d614e23ef9a (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/python/mk-python-derivation.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index e6f9087de866e..6944f70a4918b 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -308,7 +308,10 @@ let passthru.updateScript = let filename = builtins.head (lib.splitString ":" self.meta.position); in attrs.passthru.updateScript or [ update-python-libraries filename ]; -in lib.extendDerivation - (disabled -> throw "${name} not supported for interpreter ${python.executable}") - passthru - self +in + if disabled then + throw "${name} not supported for interpreter ${python.executable}" +else + self.overrideAttrs (attrs: { + passthru = lib.recursiveUpdate passthru attrs.passthru; + }) |