diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/by-name/ap/apk-tools/package.nix similarity index 82% rename from pkgs/tools/package-management/apk-tools/default.nix rename to pkgs/by-name/ap/apk-tools/package.nix index 3823a384c777..8dbd4be4bbe1 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/by-name/ap/apk-tools/package.nix @@ -6,20 +6,21 @@ scdoc, openssl, zlib, + zstd, luaSupport ? stdenv.hostPlatform == stdenv.buildPlatform, - lua, + lua5_3, }: 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 = [ @@ -27,14 +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 = [ @@ -42,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 7b9898c6666f..02ee980f3aab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1456,10 +1456,6 @@ with pkgs; angie-console-light = callPackage ../servers/http/angie/console-light.nix { }; - apk-tools = callPackage ../tools/package-management/apk-tools { - lua = lua5_3; - }; - appimage-run = callPackage ../tools/package-management/appimage-run { }; appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix { appimage-run = appimage-run.override {