diff options
| author | Artturi <Artturin@artturin.com> | 2023-08-06 06:00:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-06 06:00:37 +0300 |
| commit | b93d79adf36e4430aa7bf7163c3bc1e0ffdf3e4e (patch) | |
| tree | 81aaeea74bc9fe710f1f71d309f60bccd14f7e5c | |
| parent | Merge staging-next into staging (diff) | |
| download | nixpkgs-origin/revert-247245-passthrufunthng1.tar.gz | |
Revert "Revert "Revert "python3: splice python within python3Packages.callPackage"""origin/revert-247245-passthrufunthng1
| -rw-r--r-- | pkgs/development/interpreters/python/hooks/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/passthrufun.nix | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index a653ada4837d..bd29d493ebb8 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -1,9 +1,9 @@ -self: dontUse: with self; +self: super: with self; let - pythonInterpreter = python.pythonForBuild.interpreter; - pythonSitePackages = python.sitePackages; - pythonCheckInterpreter = python.interpreter; + pythonInterpreter = super.python.pythonForBuild.interpreter; + pythonSitePackages = super.python.sitePackages; + pythonCheckInterpreter = super.python.interpreter; setuppy = ../run_setup.py; in { makePythonHook = args: pkgs.makeSetupHook ({passthru.provides.setupHook = true; } // args); diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index b73885b5e29e..aa63f354e085 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -47,13 +47,12 @@ selfTargetTarget = pythonOnTargetForTarget.pkgs or {}; # There is no Python TargetTarget. }; hooks = import ./hooks/default.nix; - keep = self: hooks self {}; + keep = lib.extends hooks pythonPackagesFun; extra = _: {}; optionalExtensions = cond: as: lib.optionals cond as; pythonExtension = import ../../../top-level/python-packages.nix; python2Extension = import ../../../top-level/python2-packages.nix; extensions = lib.composeManyExtensions ([ - hooks pythonExtension ] ++ (optionalExtensions (!self.isPy3k) [ python2Extension @@ -65,7 +64,7 @@ otherSplices keep extra - (lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun)) + (lib.extends (lib.composeExtensions aliases extensions) keep)) { overrides = packageOverrides; python = self; |