diff --git a/pkgs/tools/package-management/microdnf/default.nix b/pkgs/by-name/mi/microdnf/package.nix similarity index 51% rename from pkgs/tools/package-management/microdnf/default.nix rename to pkgs/by-name/mi/microdnf/package.nix index 79fcdf0300c2..ec9a1daf5945 100644 --- a/pkgs/tools/package-management/microdnf/default.nix +++ b/pkgs/by-name/mi/microdnf/package.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gettext, libdnf, pkg-config, glib, libpeas, libsmartcols, help2man }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gettext, + libdnf, + pkg-config, + glib, + libpeas, + libsmartcols, + help2man, + zchunk, + pcre2, +}: stdenv.mkDerivation rec { pname = "microdnf"; @@ -11,15 +25,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-R7jOeH6pw/THLXxLezp2AmE8lUBagKMRJ0XfXgdLi2E="; }; - nativeBuildInputs = [ pkg-config cmake gettext help2man ]; - buildInputs = [ libdnf glib libpeas libsmartcols ]; + nativeBuildInputs = [ + pkg-config + cmake + gettext + help2man + ]; - meta = with lib; { + buildInputs = [ + libdnf + glib + libpeas + libsmartcols + zchunk + pcre2.dev + ]; + + meta = { description = "Lightweight implementation of dnf in C"; homepage = "https://github.com/rpm-software-management/microdnf"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ rb2k ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "microdnf"; }; } diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index dc5e95f7f3d9..ac510b954fee 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -1,38 +1,43 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gettext -, pkg-config -, libsolv -, openssl -, check -, json_c -, libmodulemd -, libsmartcols -, sqlite -, librepo -, libyaml -, rpm -, zchunk -, cppunit -, python -, swig -, glib -, sphinx +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gettext, + pkg-config, + libsolv, + openssl, + check, + json_c, + libmodulemd, + libsmartcols, + sqlite, + librepo, + libyaml, + rpm, + zchunk, + cppunit, + python, + swig, + pcre2, + sphinx, }: stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.73.2"; + version = "0.73.3"; - outputs = [ "out" "dev" "py" ]; + outputs = [ + "out" + "dev" + "py" + ]; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tdAbkIb3BAhNKFbjIGHEdVNwh3E1sKFLP+L4MhifsQM="; + hash = "sha256-XzPpjnmL2wwLZnLAJLuOQGWXAoCJnij14P6qSXglMhY="; }; nativeBuildInputs = [ @@ -53,6 +58,7 @@ stdenv.mkDerivation rec { python swig sphinx + pcre2.dev ]; propagatedBuildInputs = [ @@ -67,9 +73,7 @@ stdenv.mkDerivation rec { cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake cmake/modules/ ''; - patches = [ - ./fix-python-install-dir.patch - ]; + patches = [ ./fix-python-install-dir.patch ]; postPatch = '' # https://github.com/rpm-software-management/libdnf/issues/1518 @@ -82,7 +86,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_GTKDOC=OFF" "-DWITH_HTML=OFF" - "-DPYTHON_DESIRED=${lib.head (lib.splitString ["."] python.version)}" + "-DPYTHON_DESIRED=${lib.head (lib.splitString [ "." ] python.version)}" ]; postInstall = '' @@ -93,12 +97,15 @@ stdenv.mkDerivation rec { moveToOutput "lib/${python.libPrefix}" "$py" ''; - meta = with lib; { + meta = { description = "Package management library"; homepage = "https://github.com/rpm-software-management/libdnf"; changelog = "https://github.com/rpm-software-management/libdnf/releases/tag/${version}"; - license = licenses.gpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ rb2k katexochen ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ + rb2k + katexochen + ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f36bfcb38e1..ee6ef32d5949 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10324,8 +10324,6 @@ with pkgs; microbin = callPackage ../servers/microbin { }; - microdnf = callPackage ../tools/package-management/microdnf { }; - microplane = callPackage ../tools/misc/microplane { }; microserver = callPackage ../servers/microserver { };