apko: 0.14.1 -> 0.19.1, fix go tests (#346667)

authored by

Emily and committed by
GitHub
659f95ed 0b4d07d7

+19 -7
+16 -6
pkgs/development/tools/apko/default.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "apko"; 9 - version = "0.14.1"; 9 + version = "0.19.1"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "chainguard-dev"; 13 13 repo = pname; 14 14 rev = "v${version}"; 15 - hash = "sha256-O1lU3b3dNmFcV0Dfkpw63Eu6AgLSLBi7MbF47OsjgL4="; 15 + hash = "sha256-uUsNYQPW2MtXxohdenXbNWfikp8TW0chJ5SDYU8ayV4="; 16 16 # populate values that require us to use git. By doing this in postFetch we 17 17 # can delete .git afterwards and maintain better reproducibility of the src. 18 18 leaveDotGit = true; ··· 24 24 find "$out" -name .git -print0 | xargs -0 rm -rf 25 25 ''; 26 26 }; 27 - vendorHash = "sha256-shnVJ6TcqWxUu1Ib2ewaz2VK4mi1Rt3R0Cmof9ilDJ4="; 27 + vendorHash = "sha256-2Tuhya70R++Nv5KEd+4vjxiTTansraSXQtGm/FqRktk="; 28 28 29 29 nativeBuildInputs = [ installShellFiles ]; 30 30 ··· 41 41 ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" 42 42 ''; 43 43 44 + preCheck = '' 45 + # some tests require a writable HOME 46 + export HOME=$(mktemp -d) 47 + 48 + # some test data include SOURCE_DATE_EPOCH (which is different from our default) 49 + # and the default version info which we get by unsetting our ldflags 50 + export SOURCE_DATE_EPOCH=0 51 + ldflags= 52 + ''; 53 + 44 54 checkFlags = [ 45 - # fails to run on read-only filesystem 46 - "-skip=(TestPublish|TestBuild|TestTarFS)" 55 + # requires networking (apk.chainreg.biz) 56 + "-skip=TestInitDB_ChainguardDiscovery" 47 57 ]; 48 58 49 59 postInstall = '' ··· 69 79 description = "Build OCI images using APK directly without Dockerfile"; 70 80 mainProgram = "apko"; 71 81 license = licenses.asl20; 72 - maintainers = with maintainers; [ jk developer-guy ]; 82 + maintainers = with maintainers; [ jk developer-guy emilylange ]; 73 83 }; 74 84 }
+3 -1
pkgs/top-level/all-packages.nix
··· 281 281 282 282 fission = callPackage ../development/tools/fission { }; 283 283 284 - apko = callPackage ../development/tools/apko { }; 284 + apko = callPackage ../development/tools/apko { 285 + buildGoModule = buildGo123Module; 286 + }; 285 287 286 288 melange = callPackage ../development/tools/melange { }; 287 289