From 2fc99c5cc0da16121fffc16a2a12b78badcaf1d1 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Mon, 16 Feb 2026 17:52:24 +0100
Subject: [PATCH 1/2] apk-tools: switch to meson build system

---
 pkgs/by-name/ap/apk-tools/package.nix | 37 ++++++++++++---------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ap/apk-tools/package.nix b/pkgs/by-name/ap/apk-tools/package.nix
index 8dbd4be4bbe1..25260a4e9ce7 100644
--- a/pkgs/by-name/ap/apk-tools/package.nix
+++ b/pkgs/by-name/ap/apk-tools/package.nix
@@ -3,6 +3,10 @@
   stdenv,
   fetchFromGitLab,
   pkg-config,
+  meson,
+  ninja,
+  python3,
+  cmocka,
   scdoc,
   openssl,
   zlib,
@@ -11,7 +15,7 @@
   lua5_3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "apk-tools";
   version = "3.0.3";
 
@@ -19,41 +23,35 @@ stdenv.mkDerivation rec {
     domain = "gitlab.alpinelinux.org";
     owner = "alpine";
     repo = "apk-tools";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-ydqJiLkz80TQGyf9m/l8HSXfoTAvi0av7LHETk1c0GI=";
   };
 
   nativeBuildInputs = [
+    meson
+    ninja
     pkg-config
-    scdoc
+    python3
   ]
   ++ lib.optionals luaSupport [
     lua5_3
     lua5_3.pkgs.lua-zlib
   ];
+
   buildInputs = [
     openssl
     zlib
     zstd
+    scdoc
+    cmocka
   ]
   ++ lib.optional luaSupport lua5_3;
+
   strictDeps = true;
 
-  makeFlags = [
-    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-    "SBINDIR=$(out)/bin"
-    "LIBDIR=$(out)/lib"
-    "LUA=${if luaSupport then "lua" else "no"}"
-    "LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua5_3.version}"
-    "MANDIR=$(out)/share/man"
-    "DOCDIR=$(out)/share/doc/apk"
-    "INCLUDEDIR=$(out)/include"
-    "PKGCONFIGDIR=$(out)/lib/pkgconfig"
-  ];
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-Wno-error=unused-result"
-    "-Wno-error=deprecated-declarations"
+  mesonFlags = [
+    (lib.mesonEnable "lua" luaSupport)
+    (lib.mesonOption "lua_bin" "lua")
   ];
 
   enableParallelBuilding = true;
@@ -63,7 +61,6 @@ stdenv.mkDerivation rec {
     description = "Alpine Package Keeper";
     maintainers = [ ];
     license = lib.licenses.gpl2Only;
-    platforms = lib.platforms.linux;
     mainProgram = "apk";
   };
-}
+})

From 6f26f7bd285fa828cb0d9a6220960e23332895a4 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Mon, 16 Feb 2026 19:17:39 +0100
Subject: [PATCH 2/2] apk-tools: 3.0.3 -> 3.0.4

Diff: https://gitlab.alpinelinux.org/alpine/apk-tools/-/compare/v3.0.3...v3.0.4
---
 pkgs/by-name/ap/apk-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ap/apk-tools/package.nix b/pkgs/by-name/ap/apk-tools/package.nix
index 25260a4e9ce7..2a802b5983e4 100644
--- a/pkgs/by-name/ap/apk-tools/package.nix
+++ b/pkgs/by-name/ap/apk-tools/package.nix
@@ -17,14 +17,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "apk-tools";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchFromGitLab {
     domain = "gitlab.alpinelinux.org";
     owner = "alpine";
     repo = "apk-tools";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-ydqJiLkz80TQGyf9m/l8HSXfoTAvi0av7LHETk1c0GI=";
+    sha256 = "sha256-51lBWcUSILCJZNP6LaOGyERCosNWTuEne/+xX8xHLf0=";
   };
 
   nativeBuildInputs = [