From b4e2028211a7de1b3dd2806073e0a706fc96111a Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 5 Oct 2024 15:16:59 +0200
Subject: [PATCH 1/3] apko: fix go tests

---
 pkgs/development/tools/apko/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix
index 879d88cf0a92..ab67eb3e252d 100644
--- a/pkgs/development/tools/apko/default.nix
+++ b/pkgs/development/tools/apko/default.nix
@@ -41,10 +41,15 @@ buildGoModule rec {
     ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)"
   '';
 
-  checkFlags = [
-    # fails to run on read-only filesystem
-    "-skip=(TestPublish|TestBuild|TestTarFS)"
-  ];
+  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=
+  '';
 
   postInstall = ''
     installShellCompletion --cmd apko \

From 8c31c4e46032f81e57dac8b0df8790f9a971d74b Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 5 Oct 2024 15:18:03 +0200
Subject: [PATCH 2/3] apko: add emilylange as maintainer

---
 pkgs/development/tools/apko/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix
index ab67eb3e252d..257d6b3c354e 100644
--- a/pkgs/development/tools/apko/default.nix
+++ b/pkgs/development/tools/apko/default.nix
@@ -74,6 +74,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 ];
   };
 }

From d4ecdb36b525fdddebeb84de270e482476e3acd9 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 5 Oct 2024 15:22:27 +0200
Subject: [PATCH 3/3] apko: 0.14.1 -> 0.19.1

https://github.com/chainguard-dev/apko/releases/tag/v0.19.1

https://github.com/chainguard-dev/apko/releases/tag/v0.19.0

https://github.com/chainguard-dev/apko/releases/tag/v0.18.1

https://github.com/chainguard-dev/apko/releases/tag/v0.18.0

https://github.com/chainguard-dev/apko/releases/tag/v0.17.0

https://github.com/chainguard-dev/apko/releases/tag/v0.16.0

https://github.com/chainguard-dev/apko/releases/tag/v0.15.0

https://github.com/chainguard-dev/apko/releases/tag/v0.14.9

https://github.com/chainguard-dev/apko/releases/tag/v0.14.8

https://github.com/chainguard-dev/apko/releases/tag/v0.14.7

https://github.com/chainguard-dev/apko/releases/tag/v0.14.6

https://github.com/chainguard-dev/apko/releases/tag/v0.14.5

https://github.com/chainguard-dev/apko/releases/tag/v0.14.4

https://github.com/chainguard-dev/apko/releases/tag/v0.14.3

https://github.com/chainguard-dev/apko/releases/tag/v0.14.2

diff: https://github.com/chainguard-dev/apko/compare/v0.14.1...v0.19.1
---
 pkgs/development/tools/apko/default.nix | 11 ++++++++---
 pkgs/top-level/all-packages.nix         |  4 +++-
 2 files changed, 11 insertions(+), 4 deletions(-)

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