Merge pull request #192624 from FRidh/hooks-cross

This commit is contained in:
Artturi 2022-09-23 22:41:36 +03:00 committed by GitHub
commit c326b7e088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,9 +4,6 @@
, makeSetupHook
, disabledIf
, isPy3k
, ensureNewerSourcesForZipFilesHook
, findutils
, installShellFiles
}:
let
@ -107,7 +104,7 @@ in rec {
};
} ./python-imports-check-hook.sh) {};
pythonNamespacesHook = callPackage ({}:
pythonNamespacesHook = callPackage ({ findutils }:
makeSetupHook {
name = "python-namespaces-hook.sh";
substitutions = {
@ -173,7 +170,7 @@ in rec {
};
} ./unittest-check-hook.sh) {};
venvShellHook = disabledIf (!isPy3k) (callPackage ({ }:
venvShellHook = disabledIf (!isPy3k) (callPackage ({ ensureNewerSourcesForZipFilesHook }:
makeSetupHook {
name = "venv-shell-hook";
deps = [ ensureNewerSourcesForZipFilesHook ];
@ -188,7 +185,7 @@ in rec {
deps = [ wheel ];
} ./wheel-unpack-hook.sh) {};
sphinxHook = callPackage ({ sphinx }:
sphinxHook = callPackage ({ sphinx, installShellFiles }:
makeSetupHook {
name = "python${python.pythonVersion}-sphinx-hook";
deps = [ sphinx installShellFiles ];