From cc04d1ce175afd8cfa8da8a0a62edc94a3965758 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 2 Jul 2025 10:02:19 +0100 Subject: [PATCH] apko: fix tests on darwin and use writableTmpDirAsHomeHook Skip tests on darwin due to some local networking failures `__darwinAllowLocalNetworking = true;` wasn't sufficient for aarch64 or x86_64 --- pkgs/by-name/ap/apko/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index e75c0f61b665..d3a01f51b2df 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -1,7 +1,9 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, + writableTmpDirAsHomeHook, installShellFiles, }: @@ -42,14 +44,17 @@ buildGoModule (finalAttrs: { ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; - preCheck = '' - # some tests require a writable HOME - export HOME=$(mktemp -d) + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + # skip tests on darwin due to some local networking failures + # `__darwinAllowLocalNetworking = true;` wasn't sufficient for + # aarch64 or x86_64 + doCheck = !stdenv.isDarwin; + preCheck = '' # some test data include SOURCE_DATE_EPOCH (which is different from our default) # and the default version info which we get by unsetting our ldflags export SOURCE_DATE_EPOCH=0 - ldflags= + unset ldflags ''; checkFlags = [