From 792fff716eecfa9ef1ec0033e295db0207f89753 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Sun, 5 Jan 2025 15:58:52 +0300 Subject: [PATCH] cadical: fix darwin Disable flaky tests on darwin. --- pkgs/by-name/ca/cadical/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index 76fd676fba51..fde53b371fb5 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -58,9 +58,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # fix static build - postPatch = '' - substituteInPlace makefile.in --replace-fail "ar rc" '$(AR) rc' - ''; + postPatch = + '' + substituteInPlace makefile.in --replace-fail "ar rc" '$(AR) rc' + '' + # Racy/flaky tests that sometimes spontaneously combust on darwin. + + lib.optionalString (stdenv.hostPlatform.isDarwin && (lib.versionAtLeast version "2.1.1")) '' + substituteInPlace test/api/run.sh --replace-fail 'run parcompwrite' "" + substituteInPlace test/api/run.sh --replace-fail 'run example_tracer' "" + ''; # the configure script is not generated by autotools and does not accept the # arguments that the default configurePhase passes like --prefix and --libdir