treewide: change pythonForBuild to pythonOnBuildForHost
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
self: dontUse: with self;
|
||||
|
||||
let
|
||||
inherit (python) pythonForBuild;
|
||||
pythonInterpreter = pythonForBuild.interpreter;
|
||||
inherit (python) pythonOnBuildForHost;
|
||||
pythonInterpreter = pythonOnBuildForHost.interpreter;
|
||||
pythonSitePackages = python.sitePackages;
|
||||
pythonCheckInterpreter = python.interpreter;
|
||||
setuppy = ../run_setup.py;
|
||||
@@ -68,10 +68,10 @@ in {
|
||||
# set, but in downstream projects that build packages depending on other
|
||||
# versions of this hook's dependencies.
|
||||
passthru.tests = import ./pypa-build-hook-tests.nix {
|
||||
inherit pythonForBuild runCommand;
|
||||
inherit pythonOnBuildForHost runCommand;
|
||||
};
|
||||
} ./pypa-build-hook.sh) {
|
||||
inherit (pythonForBuild.pkgs) build;
|
||||
inherit (pythonOnBuildForHost.pkgs) build;
|
||||
};
|
||||
|
||||
pipInstallHook = callPackage ({ makePythonHook, pip }:
|
||||
@@ -91,7 +91,7 @@ in {
|
||||
inherit pythonInterpreter pythonSitePackages;
|
||||
};
|
||||
} ./pypa-install-hook.sh) {
|
||||
inherit (pythonForBuild.pkgs) installer;
|
||||
inherit (pythonOnBuildForHost.pkgs) installer;
|
||||
};
|
||||
|
||||
pytestCheckHook = callPackage ({ makePythonHook, pytest }:
|
||||
@@ -227,6 +227,6 @@ in {
|
||||
sphinxHook = callPackage ({ makePythonHook, installShellFiles }:
|
||||
makePythonHook {
|
||||
name = "python${python.pythonVersion}-sphinx-hook";
|
||||
propagatedBuildInputs = [ pythonForBuild.pkgs.sphinx installShellFiles ];
|
||||
propagatedBuildInputs = [ pythonOnBuildForHost.pkgs.sphinx installShellFiles ];
|
||||
} ./sphinx-hook.sh) {};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pythonForBuild, runCommand }: {
|
||||
{ pythonOnBuildForHost, runCommand }: {
|
||||
dont-propagate-conflicting-deps = let
|
||||
# customize a package so that its store paths differs
|
||||
mkConflict = pkg: pkg.overrideAttrs { some_modification = true; };
|
||||
@@ -16,7 +16,7 @@
|
||||
'';
|
||||
in
|
||||
# this build must never triger conflicts
|
||||
pythonForBuild.pkgs.buildPythonPackage {
|
||||
pythonOnBuildForHost.pkgs.buildPythonPackage {
|
||||
pname = "dont-propagate-conflicting-deps";
|
||||
version = "0.0.0";
|
||||
src = projectSource;
|
||||
@@ -24,9 +24,9 @@
|
||||
propagatedBuildInputs = [
|
||||
# At least one dependency of `build` should be included here to
|
||||
# keep the test meaningful
|
||||
(mkConflict pythonForBuild.pkgs.tomli)
|
||||
(mkConflict pythonOnBuildForHost.pkgs.tomli)
|
||||
# setuptools is also needed to build the example project
|
||||
pythonForBuild.pkgs.setuptools
|
||||
pythonOnBuildForHost.pkgs.setuptools
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user