diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-07 03:41:49 +0100 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-07 03:41:49 +0100 |
commit | 80120346928d20933cec90e072232684e351b895 (patch) | |
tree | 3eb9a43d7b173e14e4c145782cb9e5bbc8f8aad4 /pkgs/development/interpreters/python | |
parent | fbb3ff5e1228d8d54c4cdf40302e4193a15e8648 (diff) | |
parent | 311c0ae69975edb036a3f22dca42d9832e17d5b1 (diff) | |
download | nixlib-80120346928d20933cec90e072232684e351b895.tar nixlib-80120346928d20933cec90e072232684e351b895.tar.gz nixlib-80120346928d20933cec90e072232684e351b895.tar.bz2 nixlib-80120346928d20933cec90e072232684e351b895.tar.lz nixlib-80120346928d20933cec90e072232684e351b895.tar.xz nixlib-80120346928d20933cec90e072232684e351b895.tar.zst nixlib-80120346928d20933cec90e072232684e351b895.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/passthrufun.nix | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index eac1ba98beed..9ecc27fa1c72 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -581,7 +581,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { mv $out/share/doc/* $out/share/doc/python${pythonVersion}-${version} ''; - nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python_docs_theme ]; + nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python-docs-theme ]; }; tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 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; |