Skip to content

Commit

Permalink
apko: 0.14.1 -> 0.19.1, fix go tests (NixOS#346667)
Browse files Browse the repository at this point in the history
  • Loading branch information
emilylange authored Oct 11, 2024
2 parents 0b4d07d + d4ecdb3 commit 659f95e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
22 changes: 16 additions & 6 deletions pkgs/development/tools/apko/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 ];

Expand All @@ -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 = ''
Expand All @@ -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 ];
};
}
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down

0 comments on commit 659f95e

Please sign in to comment.