nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Emily 2024-10-11 19:09:02 +02:00 committed by GitHub
commit 659f95ed9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/tools/apko/default.nix
View File

@ -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 ];
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };