From 76affaddd246fbb26dece2fbcd2da0fad93ced0e Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 21 Mar 2026 10:42:57 -0700 Subject: [PATCH 1/2] shrinkray: Fix broken shrinkray-worker invocation Signed-off-by: Anders Kaseorg --- pkgs/by-name/sh/shrinkray/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/sh/shrinkray/package.nix b/pkgs/by-name/sh/shrinkray/package.nix index c7e16519b944..cc2895b4ea3a 100644 --- a/pkgs/by-name/sh/shrinkray/package.nix +++ b/pkgs/by-name/sh/shrinkray/package.nix @@ -38,6 +38,10 @@ python3.pkgs.buildPythonApplication rec { --replace-fail 'which("clang-format")' '"${lib.getExe' clang-tools "clang-format"}"' substituteInPlace src/shrinkray/passes/clangdelta.py \ --replace-fail 'which("clang_delta")' '"${cvise}/libexec/cvise/clang_delta"' + substituteInPlace src/shrinkray/subprocess/client.py \ + --replace-fail 'sys.executable, + "-m", + "shrinkray.subprocess.worker"' "\"$out/bin/shrinkray-worker\"" ''; build-system = [ python3.pkgs.setuptools ]; From 417b346321e1637ba0f48dc4e512c968527e4391 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 26 Mar 2026 17:01:02 -0700 Subject: [PATCH 2/2] shrinkray: Disable timing sensitive test Signed-off-by: Anders Kaseorg --- pkgs/by-name/sh/shrinkray/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sh/shrinkray/package.nix b/pkgs/by-name/sh/shrinkray/package.nix index cc2895b4ea3a..73fd7d966576 100644 --- a/pkgs/by-name/sh/shrinkray/package.nix +++ b/pkgs/by-name/sh/shrinkray/package.nix @@ -81,6 +81,8 @@ python3.pkgs.buildPythonApplication rec { "tests/test_clang_delta.py::test_find_clang_delta_when_found_in_path" "tests/test_clang_delta.py::test_find_clang_delta_when_not_found_anywhere" "tests/test_formatting.py::test_default_formatter_python_files_without_black" + # This test is too timing sensitive + "tests/test_validation.py::test_validation_output_streams_immediately" ]; meta = {