diff options
| author | Emily <git@emilylange.de> | 2024-10-11 19:09:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-11 19:09:02 +0200 |
| commit | 659f95ed9edc2cf696e21d89abcde80fde979a0f (patch) | |
| tree | f4f007fdb6960709687632ec7a47efd02cb5d9e7 | |
| parent | python312Packages.spark-parser: 1.8.9 -> 1.9.0 (#347365) (diff) | |
| parent | apko: 0.14.1 -> 0.19.1 (diff) | |
| download | nixpkgs-659f95ed9edc2cf696e21d89abcde80fde979a0f.tar.gz | |
apko: 0.14.1 -> 0.19.1, fix go tests (#346667)
| -rw-r--r-- | pkgs/development/tools/apko/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index 879d88cf0a92..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 ]; @@ -41,9 +41,19 @@ buildGoModule rec { ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; + preCheck = '' + # some tests require a writable HOME + export HOME=$(mktemp -d) + + # 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= + ''; + checkFlags = [ - # fails to run on read-only filesystem - "-skip=(TestPublish|TestBuild|TestTarFS)" + # requires networking (apk.chainreg.biz) + "-skip=TestInitDB_ChainguardDiscovery" ]; postInstall = '' @@ -69,6 +79,6 @@ buildGoModule rec { description = "Build OCI images using APK directly without Dockerfile"; mainProgram = "apko"; license = licenses.asl20; - maintainers = with maintainers; [ jk developer-guy ]; + maintainers = with maintainers; [ jk developer-guy emilylange ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcbd8c95df59..199933fa3221 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -281,7 +281,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 { }; |