diff options
| author | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-20 12:01:10 -0700 |
|---|---|---|
| committer | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-20 12:01:22 -0700 |
| commit | dab839357e9e914993a338fd1c8003a6047a8aaf (patch) | |
| tree | 99039605e23e9972492069a2e0deeeb18849fc51 /pkgs/development/interpreters/python | |
| parent | 57d8f92a860e4e531419cf2493c08ce194588c10 (diff) | |
| parent | 0b07d4957ee1bd7fd3bdfd12db5f361bd70175a6 (diff) | |
Merge branch 'master' into staging-next
Had to merge https://github.com/NixOS/nixpkgs/pull/245957 and https://github.com/NixOS/nixpkgs/pull/247245.
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/passthrufun.nix | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 8ea1c14c7111c..fb504c5043c80 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -5,7 +5,7 @@ , db , lib , libffiBoot -, makeScopeWithSplicing +, makeScopeWithSplicing' , pythonPackagesExtensions , stdenv }@args: diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index b73885b5e29e1..867027e3841c9 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, pythonPackagesExtensions, config, makeScopeWithSplicing, ... }: +{ lib, stdenv, callPackage, pythonPackagesExtensions, config, makeScopeWithSplicing', ... }: { implementation , libPrefix @@ -48,7 +48,6 @@ }; hooks = import ./hooks/default.nix; keep = self: hooks self {}; - extra = _: {}; optionalExtensions = cond: as: lib.optionals cond as; pythonExtension = import ../../../top-level/python-packages.nix; python2Extension = import ../../../top-level/python2-packages.nix; @@ -61,12 +60,10 @@ overrides ]); aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super); - in makeScopeWithSplicing - otherSplices - keep - extra - (lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun)) - { + in makeScopeWithSplicing' { + inherit otherSplices keep; + f = lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun; + }) { overrides = packageOverrides; python = self; }); |