diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-06 14:33:18 +0100 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-06 14:33:18 +0100 |
commit | 32da89a1a1dfb314f614213cdd0f574baf873156 (patch) | |
tree | 312e552d4df4f142cf08fba1c5f3d45f61e82575 /pkgs/development/interpreters/python | |
parent | 2ee2d62dce74178c62736fe4a8c784ef40476465 (diff) | |
parent | 250c07f960eaefd781df539ee0d877b13da17b97 (diff) | |
download | nixlib-32da89a1a1dfb314f614213cdd0f574baf873156.tar nixlib-32da89a1a1dfb314f614213cdd0f574baf873156.tar.gz nixlib-32da89a1a1dfb314f614213cdd0f574baf873156.tar.bz2 nixlib-32da89a1a1dfb314f614213cdd0f574baf873156.tar.lz nixlib-32da89a1a1dfb314f614213cdd0f574baf873156.tar.xz nixlib-32da89a1a1dfb314f614213cdd0f574baf873156.tar.zst nixlib-32da89a1a1dfb314f614213cdd0f574baf873156.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r-- | pkgs/development/interpreters/python/passthrufun.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index 867027e3841c..6cb906be0a51 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -67,6 +67,8 @@ overrides = packageOverrides; python = self; }); + pythonOnBuildForHost_overridden = + pythonOnBuildForHost.override { inherit packageOverrides; self = pythonOnBuildForHost_overridden; }; in rec { isPy27 = pythonVersion == "2.7"; isPy37 = pythonVersion == "3.7"; @@ -89,9 +91,10 @@ in rec { pythonAtLeast = lib.versionAtLeast pythonVersion; pythonOlder = lib.versionOlder pythonVersion; inherit hasDistutilsCxxPatch; - # TODO: rename to pythonOnBuild + # TODO: deprecate # Not done immediately because its likely used outside Nixpkgs. - pythonForBuild = pythonOnBuildForHost.override { inherit packageOverrides; self = pythonForBuild; }; + pythonForBuild = pythonOnBuildForHost_overridden; + pythonOnBuildForHost = pythonOnBuildForHost_overridden; tests = callPackage ./tests.nix { python = self; |