cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Python hooks: use spliced packages in hooks

Browse source 
This fixes issues when cross-compiling.
This commit is contained in:
Frederik Rietdijk 2022-09-23 15:24:32 +02:00 committed by Artturin
parent 52117cce92
commit 7a41be7b2a
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/interpreters/python/hooks/default.nix
View file

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