Skip to content

python3.pkgs.pypaBuildHook: fix conflicts via propagated inputs 2 #279496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavHau wants to merge 1 commit into
base: master
Choose a base branch
from
Open

python3.pkgs.pypaBuildHook: fix conflicts via propagated inputs 2 #279496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkgs/development/interpreters/python/hooks/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ self: dontUse: with self;

let
inherit (python) pythonOnBuildForHost;
inherit (pkgs) runCommand;
pythonInterpreter = pythonOnBuildForHost.interpreter;
pythonSitePackages = python.sitePackages;
pythonCheckInterpreter = python.interpreter;
Expand Down Expand Up @@ -58,7 +57,6 @@ in {
pypaBuildHook = callPackage ({ makePythonHook, build, wheel }:
makePythonHook {
name = "pypa-build-hook.sh";
propagatedBuildInputs = [ wheel ];
substitutions = {
inherit build;
};
Expand All @@ -68,8 +66,8 @@ in {
# Such conflicts don't happen within the standard nixpkgs python package
# set, but in downstream projects that build packages depending on other
# versions of this hook's dependencies.
passthru.tests = import ./pypa-build-hook-test.nix {
inherit pythonOnBuildForHost runCommand;
passthru.tests = callPackage ./pypa-build-hook-tests.nix {
inherit pythonOnBuildForHost;
};
} ./pypa-build-hook.sh) {
inherit (pythonOnBuildForHost.pkgs) build;
Expand Down
1 change: 1 addition & 0 deletions ...ers/python/hooks/pypa-build-hook-test.nix → ...rs/python/hooks/pypa-build-hook-tests.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
# At least one dependency of `build` should be included here to
# keep the test meaningful
(mkConflict pythonOnBuildForHost.pkgs.tomli)
(mkConflict pythonOnBuildForHost.pkgs.wheel)
# setuptools is also needed to build the example project
pythonOnBuildForHost.pkgs.setuptools
];
Expand Down
7 changes: 7 additions & 0 deletions pkgs/development/python-modules/build/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
, pytest-rerunfailures
, pytest-xdist
, pytestCheckHook
, python3
, pythonOlder
, setuptools
, tomli
Expand Down Expand Up @@ -93,6 +94,12 @@ buildPythonPackage rec {
"build"
];

# Add the wheel dependency via a wrapper.
# DO NOT use propagatedBuildInputs to prevent leakage into the build env.
makeWrapperArgs = [
''--suffix PYTHONPATH : "${wheel}/${python3.sitePackages}"''
];

meta = with lib; {
mainProgram = "pyproject-build";
description = "Simple, correct PEP517 package builder";
Expand Down