Merge branch 'master' into staging-next

2023-11-06 14:33:18 +01:00
parent 2ee2d62dce 250c07f960
commit 32da89a1a1
77 changed files with 7334 additions and 228 deletions
@@ -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;