diff options
author | 06kellyjac <dev@j-k.io> | 2023-05-26 11:21:15 +0100 |
---|---|---|
committer | 06kellyjac <dev@j-k.io> | 2023-05-26 11:21:15 +0100 |
commit | bc4ec570ec14bb9fe53476f3b78390783212df86 (patch) | |
tree | 6d71a05fab0eb229ada684f2dc323776a0c11249 /pkgs/development | |
parent | 3b99ef458237cc31434adba76ed623d07c488fe2 (diff) |
apko: use checkflags and minor cleanup
Moved some attributes around and moved to skip via checkFlags rather than rm now we're on go 1.20
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/tools/apko/default.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index ecd45791e77be..eb72de76af7b2 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-02W9YOnV/zXopH3C9UNKu5gepNVS2gzoGa10uaKYu94="; + hash = "sha256-02W9YOnV/zXopH3C9UNKu5gepNVS2gzoGa10uaKYu94="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-h1uAAL3FBskx6Qv9E5WY+UPeXK49WW/hFoNN4QyKevU="; + vendorHash = "sha256-h1uAAL3FBskx6Qv9E5WY+UPeXK49WW/hFoNN4QyKevU="; nativeBuildInputs = [ installShellFiles ]; @@ -41,14 +41,11 @@ buildGoModule rec { ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; - preCheck = '' - # disable tests that require network access - rm pkg/apk/impl/implementation_test.go - ''; - - doCheck = true; - - doInstallCheck = true; + checkFlags = [ + # networking required to fetch alpine-keys + # pulled out into a separate library next release + "-skip=TestInitDB" + ]; postInstall = '' installShellCompletion --cmd apko \ @@ -57,6 +54,7 @@ buildGoModule rec { --zsh <($out/bin/apko completion zsh) ''; + doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck |