From 88bc5dadf1577d56ab1d19064e473e32982ee038 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Fri, 17 Apr 2026 12:36:12 +0200
Subject: [PATCH 1/3] libsolv: 0.7.35 -> 0.7.36

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/li/libsolv/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix
index 8edd4a0832da..32a17dfcf222 100644
--- a/pkgs/by-name/li/libsolv/package.nix
+++ b/pkgs/by-name/li/libsolv/package.nix
@@ -18,14 +18,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "0.7.35";
+  version = "0.7.36";
   pname = "libsolv";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "libsolv";
     rev = finalAttrs.version;
-    hash = "sha256-DHECjda7s12hSysbaXK2+wM/nXpAOpTn+eSf9XGC3z0=";
+    hash = "sha256-7a/vAdgW7ma2GHqv1LaQNFA7w1Hmzm6Q/HriNN6hlpE=";
   };
 
   cmakeFlags = [

From 00533dbc05365e36dff10d8fc73f8b6fc4f2f744 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Fri, 17 Apr 2026 12:36:33 +0200
Subject: [PATCH 2/3] libpkgmanifest: init at 0.5.9

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/li/libpkgmanifest/package.nix | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/li/libpkgmanifest/package.nix

diff --git a/pkgs/by-name/li/libpkgmanifest/package.nix b/pkgs/by-name/li/libpkgmanifest/package.nix
new file mode 100644
index 000000000000..5d81e5fd64b3
--- /dev/null
+++ b/pkgs/by-name/li/libpkgmanifest/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  yaml-cpp,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libpkgmanifest";
+  version = "0.5.9";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "rpm-software-management";
+    repo = "libpkgmanifest";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-NWuUu1By7MORITgqac09cOMYrVB91xqiUgxN+7sDPMw=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    yaml-cpp
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "WITH_DOCS" false)
+    (lib.cmakeBool "WITH_PYTHON" false)
+    (lib.cmakeBool "WITH_TESTS" false)
+    (lib.cmakeBool "WITH_CODE_COVERAGE" false)
+    (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
+    (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+  ];
+
+  meta = {
+    description = "Library for working with RPM manifests";
+    homepage = "https://github.com/rpm-software-management/libpkgmanifest";
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ katexochen ];
+    mainProgram = "libpkgmanifest";
+    platforms = lib.platforms.all;
+  };
+})

From ce0681e47b5acd307234e3fc539b9fd0dcd99bda Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Fri, 17 Apr 2026 12:36:51 +0200
Subject: [PATCH 3/3] dnf5: 5.2.18.0 -> 5.4.1.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/dn/dnf5/package.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix
index 2f6680b7b7e3..af75caef3538 100644
--- a/pkgs/by-name/dn/dnf5/package.nix
+++ b/pkgs/by-name/dn/dnf5/package.nix
@@ -19,6 +19,8 @@
   libsolv,
   libxml2,
   libyaml,
+  libpkgmanifest,
+  acl,
   pcre2,
   rpm,
   sdbus-cpp_2,
@@ -33,7 +35,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dnf5";
-  version = "5.2.18.0";
+  version = "5.4.1.0";
 
   outputs = [
     "out"
@@ -44,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "rpm-software-management";
     repo = "dnf5";
     tag = finalAttrs.version;
-    hash = "sha256-VTuGHHNNdoDfbJ86GOR4a+Fy2s+NSXPH337+AZpLKuo=";
+    hash = "sha256-wvWOQyY7K9fCds2am8gYpjw9mPl7IbOdHT92b8pwonc=";
   };
 
   nativeBuildInputs = [
@@ -71,6 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
     librepo
     util-linux
     libsolv
+    libpkgmanifest
+    acl
     libxml2
     libyaml
     pcre2.dev
@@ -86,16 +90,16 @@ stdenv.mkDerivation (finalAttrs: {
   env.NIX_CFLAGS_COMPILE = "-Wno-restrict -Wno-maybe-uninitialized";
 
   cmakeFlags = [
-    "-DWITH_PERL5=OFF"
-    "-DWITH_PYTHON3=OFF"
-    "-DWITH_RUBY=OFF"
-    "-DWITH_SYSTEMD=OFF"
-    "-DWITH_PLUGIN_RHSM=OFF" # Red Hat Subscription Manager plugin
+    (lib.cmakeBool "WITH_PERL5" false)
+    (lib.cmakeBool "WITH_PYTHON3" false)
+    (lib.cmakeBool "WITH_RUBY" false)
+    (lib.cmakeBool "WITH_SYSTEMD" false)
+    (lib.cmakeBool "WITH_PLUGIN_RHSM" false) # Red Hat Subscription Manager plugin
     # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
     # (setting it to an absolute path causes include files to go to $out/$out/include,
     #  because the absolute path is interpreted with root at $out).
-    "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    "-DCMAKE_INSTALL_LIBDIR=lib"
+    (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
+    (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
   ];
 
   postBuild = ''