From c02129778be25270f216bf7efb20b3fad8e0ae93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 19 Dec 2025 18:43:57 +0100
Subject: [PATCH 1/3] apk-tools: 2.14.10 -> 3.0.3

Add zstd to prevent build failure.
---
 pkgs/tools/package-management/apk-tools/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix
index 3823a384c777..2a4ab60ee1a7 100644
--- a/pkgs/tools/package-management/apk-tools/default.nix
+++ b/pkgs/tools/package-management/apk-tools/default.nix
@@ -6,20 +6,21 @@
   scdoc,
   openssl,
   zlib,
+  zstd,
   luaSupport ? stdenv.hostPlatform == stdenv.buildPlatform,
   lua,
 }:
 
 stdenv.mkDerivation rec {
   pname = "apk-tools";
-  version = "2.14.10";
+  version = "3.0.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.alpinelinux.org";
     owner = "alpine";
     repo = "apk-tools";
     rev = "v${version}";
-    sha256 = "sha256-9TSkcJe7FVdTtfcCmwp+IWMYa/OL9OXJwPcKLyj5AAA=";
+    sha256 = "sha256-ydqJiLkz80TQGyf9m/l8HSXfoTAvi0av7LHETk1c0GI=";
   };
 
   nativeBuildInputs = [
@@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     openssl
     zlib
+    zstd
   ]
   ++ lib.optional luaSupport lua;
   strictDeps = true;

From 3656b70ffbdb0b6c8c8edbf4f96b5a66cac9903d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 19 Dec 2025 18:50:37 +0100
Subject: [PATCH 2/3] apk-tools: prepare for pkgs/by-name

---
 pkgs/tools/package-management/apk-tools/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix                     |  4 +---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix
index 2a4ab60ee1a7..8dbd4be4bbe1 100644
--- a/pkgs/tools/package-management/apk-tools/default.nix
+++ b/pkgs/tools/package-management/apk-tools/default.nix
@@ -8,7 +8,7 @@
   zlib,
   zstd,
   luaSupport ? stdenv.hostPlatform == stdenv.buildPlatform,
-  lua,
+  lua5_3,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,15 +28,15 @@ stdenv.mkDerivation rec {
     scdoc
   ]
   ++ lib.optionals luaSupport [
-    lua
-    lua.pkgs.lua-zlib
+    lua5_3
+    lua5_3.pkgs.lua-zlib
   ];
   buildInputs = [
     openssl
     zlib
     zstd
   ]
-  ++ lib.optional luaSupport lua;
+  ++ lib.optional luaSupport lua5_3;
   strictDeps = true;
 
   makeFlags = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     "SBINDIR=$(out)/bin"
     "LIBDIR=$(out)/lib"
     "LUA=${if luaSupport then "lua" else "no"}"
-    "LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua.version}"
+    "LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua5_3.version}"
     "MANDIR=$(out)/share/man"
     "DOCDIR=$(out)/share/doc/apk"
     "INCLUDEDIR=$(out)/include"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75e1b57358ed..15eda1e9f54e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1456,9 +1456,7 @@ with pkgs;
 
   angie-console-light = callPackage ../servers/http/angie/console-light.nix { };
 
-  apk-tools = callPackage ../tools/package-management/apk-tools {
-    lua = lua5_3;
-  };
+  apk-tools = callPackage ../tools/package-management/apk-tools { };
 
   appimage-run = callPackage ../tools/package-management/appimage-run { };
   appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix {

From a30e7e43a1c8d1bb39591ace2935ec1053ebef59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 19 Dec 2025 18:52:35 +0100
Subject: [PATCH 3/3] apk-tools: move to pkgs/by-name

---
 .../apk-tools/default.nix => by-name/ap/apk-tools/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/package-management/apk-tools/default.nix => by-name/ap/apk-tools/package.nix} (100%)

diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/by-name/ap/apk-tools/package.nix
similarity index 100%
rename from pkgs/tools/package-management/apk-tools/default.nix
rename to pkgs/by-name/ap/apk-tools/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15eda1e9f54e..73e476b44640 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1456,8 +1456,6 @@ with pkgs;
 
   angie-console-light = callPackage ../servers/http/angie/console-light.nix { };
 
-  apk-tools = callPackage ../tools/package-management/apk-tools { };
-
   appimage-run = callPackage ../tools/package-management/appimage-run { };
   appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix {
     appimage-run = appimage-run.override {