From 4eb7390cb5c15474e64883a5e73d6df6f5186ec8 Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Sat, 24 Jan 2026 13:49:35 -0500 Subject: [PATCH] llama-swap: fix build on Darwin llama-swap has added a new test TestProcess_ReverseProxyPanicIsHandled that isn't covered by the existing skippedTests list, and which fails in a similar way to those tests on the x86_64 build. Meanwhile, the aarch64 build is now failing on the same tests that previously only had problems on x86_64. (At least on Hydra - don't have an Apple Silicon machine to test locally on.) This adds the new test to skippedTests, and enables the skippedTests list for both Darwin platforms, rather than just x86_64. Fixes #483423. --- pkgs/by-name/ll/llama-swap/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-swap/package.nix b/pkgs/by-name/ll/llama-swap/package.nix index a8f6609b17b7..6a28d41e4c21 100644 --- a/pkgs/by-name/ll/llama-swap/package.nix +++ b/pkgs/by-name/ll/llama-swap/package.nix @@ -81,8 +81,8 @@ buildGoModule (finalAttrs: { checkFlags = let - skippedTests = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - # Fail only on x86_64-darwin intermittently + skippedTests = lib.optionals (stdenv.isDarwin) [ + # Fail only on *-darwin intermittently # https://github.com/mostlygeek/llama-swap/issues/320 "TestProcess_AutomaticallyStartsUpstream" "TestProcess_WaitOnMultipleStarts" @@ -98,6 +98,7 @@ buildGoModule (finalAttrs: { "TestProcess_ForceStopWithKill" "TestProcess_StopCmd" "TestProcess_EnvironmentSetCorrectly" + "TestProcess_ReverseProxyPanicIsHandled" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];