colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #245475 from Artturin/splicepython1

Browse Source
This commit is contained in:
Artturi 2023-07-26 22:43:37 +03:00 committed by GitHub
commit 906f999a2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/python/hooks/default.nix
View File

@ -1,9 +1,9 @@
self: super: with self; self: dontUse: with self;
let let
pythonInterpreter = super.python.pythonForBuild.interpreter; pythonInterpreter = python.pythonForBuild.interpreter;
pythonSitePackages = super.python.sitePackages; pythonSitePackages = python.sitePackages;
pythonCheckInterpreter = super.python.interpreter; pythonCheckInterpreter = python.interpreter;
setuppy = ../run_setup.py; setuppy = ../run_setup.py;
in { in {
makePythonHook = args: pkgs.makeSetupHook ({passthru.provides.setupHook = true; } // args); makePythonHook = args: pkgs.makeSetupHook ({passthru.provides.setupHook = true; } // args);

5
pkgs/development/interpreters/python/passthrufun.nix
View File

@ -47,12 +47,13 @@
selfTargetTarget = pythonOnTargetForTarget.pkgs or {}; # There is no Python TargetTarget. selfTargetTarget = pythonOnTargetForTarget.pkgs or {}; # There is no Python TargetTarget.
}; };
hooks = import ./hooks/default.nix; hooks = import ./hooks/default.nix;
keep = lib.extends hooks pythonPackagesFun; keep = self: hooks self {};
extra = _: {}; extra = _: {};
optionalExtensions = cond: as: lib.optionals cond as; optionalExtensions = cond: as: lib.optionals cond as;
pythonExtension = import ../../../top-level/python-packages.nix; pythonExtension = import ../../../top-level/python-packages.nix;
python2Extension = import ../../../top-level/python2-packages.nix; python2Extension = import ../../../top-level/python2-packages.nix;
extensions = lib.composeManyExtensions ([ extensions = lib.composeManyExtensions ([
hooks
pythonExtension pythonExtension
] ++ (optionalExtensions (!self.isPy3k) [ ] ++ (optionalExtensions (!self.isPy3k) [
python2Extension python2Extension
@ -64,7 +65,7 @@
otherSplices otherSplices
keep keep
extra extra
(lib.extends (lib.composeExtensions aliases extensions) keep)) (lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun))
{ {
overrides = packageOverrides; overrides = packageOverrides;
python = self; python = self;