Merge pull request #331228 from katexochen/dnf5/up

pkgs/tools/package-management/dnf5/default.nix

@@ -1,59 +1,66 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, createrepo_c
-, doxygen
-, gettext
-, help2man
-, pkg-config
-, python3Packages
-, cppunit
-, fmt
-, json_c
-, libmodulemd
-, librepo
-, libsmartcols
-, libsolv
-, libxml2
-, libyaml
-, pcre2
-, rpm
-, sdbus-cpp
-, sphinx
-, sqlite
-, systemd
-, testers
-, toml11
-, zchunk
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  createrepo_c,
+  doxygen,
+  gettext,
+  help2man,
+  pkg-config,
+  python3Packages,
+  cppunit,
+  fmt,
+  json_c,
+  libmodulemd,
+  librepo,
+  libsmartcols,
+  libsolv,
+  libxml2,
+  libyaml,
+  pcre2,
+  rpm,
+  sdbus-cpp,
+  sphinx,
+  sqlite,
+  systemd,
+  testers,
+  toml11,
+  zchunk,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dnf5";
-  version = "5.1.15";
+  version = "5.2.5.0";
 
-  outputs = [ "out" "man" ];
+  outputs = [
+    "out"
+    "man"
+  ];
 
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "dnf5";
     rev = finalAttrs.version;
-    hash = "sha256-IDF/jRnPpGbHk5bY7plkCO1x/i10H+HCcU88JI4EHvs=";
+    hash = "sha256-zH+TDtVMEsgKZR0EA+G8SB1PZyiTfhnG7n6lupeoWyI=";
   };
 
-  nativeBuildInputs = [
-    cmake
-    createrepo_c
-    doxygen
-    gettext
-    help2man
-    pkg-config
-    sphinx
-  ] ++ (with python3Packages; [
-    breathe
-    sphinx-autoapi
-    sphinx-rtd-theme
-  ]);
+  nativeBuildInputs =
+    [
+      cmake
+      createrepo_c
+      doxygen
+      gettext
+      help2man
+      pkg-config
+      sphinx
+    ]
+    ++ (with python3Packages; [
+      breathe
+      sphinx-autoapi
+      sphinx-rtd-theme
+    ]);
 
   buildInputs = [
     cppunit
@@ -81,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-DWITH_PERL5=OFF"
     "-DWITH_PYTHON3=OFF"
     "-DWITH_RUBY=OFF"
+    "-DWITH_SYSTEMD=OFF"
     "-DWITH_PLUGIN_RHSM=OFF" # 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,
@@ -105,8 +113,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontFixCmake = true;
 
-  passthru.tests = {
-    version = testers.testVersion { package = finalAttrs.finalPackage; };
+  passthru = {
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {
@@ -114,7 +123,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/rpm-software-management/dnf5";
     changelog = "https://github.com/rpm-software-management/dnf5/releases/tag/${finalAttrs.version}";
     license = licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ malt3 katexochen ];
+    maintainers = with lib.maintainers; [
+      malt3
+      katexochen
+    ];
     mainProgram = "dnf5";
     platforms = platforms.linux ++ platforms.darwin;
   };

pkgs/tools/package-management/librepo/default.nix

@@ -1,33 +1,43 @@
-{ lib, stdenv
-, fetchFromGitHub
-, cmake
-, python
-, pkg-config
-, libxml2
-, glib
-, openssl
-, zchunk
-, curl
-, check
-, gpgme
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  python,
+  pkg-config,
+  libxml2,
+  glib,
+  openssl,
+  zchunk,
+  curl,
+  check,
+  gpgme,
+  libselinux,
+  nix-update-script,
+  doxygen,
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.15.1";
+  version = "1.18.0";
   pname = "librepo";
 
-  outputs = [ "out" "dev" "py" ];
+  outputs = [
+    "out"
+    "dev"
+    "py"
+  ];
 
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "librepo";
     rev = version;
-    sha256 = "sha256-XVjVu+UTIDbrKHmfJ2zZBLp/h0cLCZFxv/XZ0Iy8VPI=";
+    sha256 = "sha256-u9dE1TqqZp/cHIgqnRDgOT4gU7XNLnSnmAFJxLKnDSQ=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    doxygen
   ];
 
   buildInputs = [
@@ -39,6 +49,7 @@ stdenv.mkDerivation rec {
     check
     gpgme
     zchunk
+    libselinux
   ];
 
   # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
@@ -54,6 +65,8 @@ stdenv.mkDerivation rec {
     moveToOutput "lib/${python.libPrefix}" "$py"
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages";
     homepage = "https://rpm-software-management.github.io/librepo/";