Unverified Commit 525898dc authored by Alyssa Ross's avatar Alyssa Ross Committed by GitHub
Browse files

apk-tools: update and move to pkgs/by-name (#472471)

parents 45ad0e5c a30e7e43

pkgs/tools/package-management/apk-tools/default.nix→pkgs/by-name/ap/apk-tools/package.nix

+9 −7
Original line number Diff line number Diff line
@@ -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"

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -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 {