pyrox.dev
Merge pull request #271961 from adisbladis/python-pypaBuildHook-tests
python3.pkgs.pypaBuildHook: Fix passthru.tests
authored by Martin Weinelt and committed by GitHub 35c5863c c81dee1f
+5
-3
pkgs/development/interpreters/python/hooks/default.nix
+5
-3
pkgs/development/interpreters/python/hooks/default.nix
···
8
8
pythonCheckInterpreter = python.interpreter;
9
9
setuppy = ../run_setup.py;
10
10
in {
11
-
makePythonHook = args: pkgs.makeSetupHook ({passthru.provides.setupHook = true; } // args);
11
+
makePythonHook = let
12
+
defaultArgs = { passthru.provides.setupHook = true; };
13
+
in args: pkgs.makeSetupHook (lib.recursiveUpdate defaultArgs args);
12
14
13
15
condaInstallHook = callPackage ({ makePythonHook, gnutar, lbzip2 }:
14
16
makePythonHook {
···
68
70
# Such conflicts don't happen within the standard nixpkgs python package
69
71
# set, but in downstream projects that build packages depending on other
70
72
# versions of this hook's dependencies.
71
-
passthru.tests = import ./pypa-build-hook-test.nix {
72
-
inherit pythonOnBuildForHost runCommand;
73
+
passthru.tests = callPackage ./pypa-build-hook-test.nix {
74
+
inherit pythonOnBuildForHost;
73
75
};
74
76
} ./pypa-build-hook.sh) {
75
77
inherit (pythonOnBuildForHost.pkgs) build;