From edd2bb1fe03cd7a3e5859526f3676430e8ba1e79 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Sun, 3 May 2026 05:16:14 +0200 Subject: [PATCH 1/2] borgmatic: disable test with TOCTOU race on x86_64-darwin test_log_outputs_includes_error_output_in_exception has a race between process.poll() in raise_for_process_errors (returns None) and the while-loop exit check (returns non-None), so CalledProcessError is never raised. Timing-dependent; reproduces on x86_64-darwin. Signed-off-by: Sirio Balmelli --- pkgs/by-name/bo/borgmatic/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix index 917f17302cd0..d1103858c34b 100644 --- a/pkgs/by-name/bo/borgmatic/package.nix +++ b/pkgs/by-name/bo/borgmatic/package.nix @@ -35,9 +35,14 @@ python3Packages.buildPythonApplication rec { ++ optional-dependencies.apprise; # - test_borgmatic_version_matches_news_version - # The file NEWS not available on the pypi source, and this test is useless + # NEWS file not available on the pypi source + # - test_log_outputs_includes_error_output_in_exception + # TOCTOU race in log_outputs(): process.poll() returns None in + # raise_for_process_errors but non-None in the while-loop exit check, + # so the error is never raised. Timing-dependent; fails on x86_64-darwin. disabledTests = [ "test_borgmatic_version_matches_news_version" + "test_log_outputs_includes_error_output_in_exception" ]; nativeBuildInputs = [ installShellFiles ]; From d62e4c9d013a49094062b11b9edc769acc368009 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Sun, 3 May 2026 05:16:14 +0200 Subject: [PATCH 2/2] borgmatic: 2.1.3 -> 2.1.5 Signed-off-by: Sirio Balmelli --- pkgs/by-name/bo/borgmatic/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix index d1103858c34b..31ad075a0345 100644 --- a/pkgs/by-name/bo/borgmatic/package.nix +++ b/pkgs/by-name/bo/borgmatic/package.nix @@ -15,12 +15,12 @@ }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "2.1.3"; + version = "2.1.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-mWZQBoQUd+cwOV3QU62XyTCFdFpnBz2BsyImzVAozJE="; + hash = "sha256-T0+E6opyfr7zxfP44OlNuhqsdQyi7OdIXiE5r310LaU="; }; passthru.updateScript = nix-update-script { }; @@ -31,6 +31,7 @@ python3Packages.buildPythonApplication rec { flexmock pytestCheckHook pytest-cov-stub + pytest-timeout ] ++ optional-dependencies.apprise;