about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNils André <nils@neuralink.com>2023-12-27 19:43:44 -0800
committerNils André <nils@neuralink.com>2023-12-27 19:48:37 -0800
commit69d78abdb885134bc339a89faa038dde99412f34 (patch)
treee7deb84f97fe7de0a5a45f8c52c9640501e9bdc7
parent7eddbf56907e20b14a2996597cfc6619d1c18aed (diff)
pre-commit: fix pygrep hooks
Fixes https://github.com/NixOS/nixpkgs/issues/173707
-rw-r--r--pkgs/tools/misc/pre-commit/default.nix1
-rw-r--r--pkgs/tools/misc/pre-commit/pygrep-pythonpath.patch13
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix
index ded7b3290d3c4..56afc22f19ead 100644
--- a/pkgs/tools/misc/pre-commit/default.nix
+++ b/pkgs/tools/misc/pre-commit/default.nix
@@ -32,6 +32,7 @@ buildPythonApplication rec {
   patches = [
     ./languages-use-the-hardcoded-path-to-python-binaries.patch
     ./hook-tmpl.patch
+    ./pygrep-pythonpath.patch
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/tools/misc/pre-commit/pygrep-pythonpath.patch b/pkgs/tools/misc/pre-commit/pygrep-pythonpath.patch
new file mode 100644
index 0000000000000..722b436169bef
--- /dev/null
+++ b/pkgs/tools/misc/pre-commit/pygrep-pythonpath.patch
@@ -0,0 +1,13 @@
+diff --git a/pre_commit/languages/pygrep.py b/pre_commit/languages/pygrep.py
+index ec55560..44e08a1 100644
+--- a/pre_commit/languages/pygrep.py
++++ b/pre_commit/languages/pygrep.py
+@@ -98,7 +98,7 @@ def run_hook(
+         color: bool,
+ ) -> tuple[int, bytes]:
+     cmd = (sys.executable, '-m', __name__, *args, entry)
+-    return xargs(cmd, file_args, color=color)
++    return xargs(cmd, file_args, color=color, env={ "PYTHONPATH": ':'.join(sys.path) })
+ 
+ 
+ def main(argv: Sequence[str] | None = None) -> int: