diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index 257d6b3c354e..6248c08360df 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "apko"; - version = "0.14.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-O1lU3b3dNmFcV0Dfkpw63Eu6AgLSLBi7MbF47OsjgL4="; + hash = "sha256-uUsNYQPW2MtXxohdenXbNWfikp8TW0chJ5SDYU8ayV4="; # 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 ''; }; - vendorHash = "sha256-shnVJ6TcqWxUu1Ib2ewaz2VK4mi1Rt3R0Cmof9ilDJ4="; + vendorHash = "sha256-2Tuhya70R++Nv5KEd+4vjxiTTansraSXQtGm/FqRktk="; nativeBuildInputs = [ installShellFiles ]; @@ -51,6 +51,11 @@ buildGoModule rec { ldflags= ''; + checkFlags = [ + # requires networking (apk.chainreg.biz) + "-skip=TestInitDB_ChainguardDiscovery" + ]; + postInstall = '' installShellCompletion --cmd apko \ --bash <($out/bin/apko completion bash) \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eef9ab339bd0..c0cea2a24f21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -283,7 +283,9 @@ with pkgs; fission = callPackage ../development/tools/fission { }; - apko = callPackage ../development/tools/apko { }; + apko = callPackage ../development/tools/apko { + buildGoModule = buildGo123Module; + }; melange = callPackage ../development/tools/melange { };