dnf5: 5.2.18.0 -> 5.4.1.0 (#510848)

This commit is contained in:
Paul Meyer
2026-05-13 08:14:38 +00:00
committed by GitHub
3 changed files with 65 additions and 11 deletions
+13 -9
View File
@@ -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 = ''
@@ -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;
};
})
+2 -2
View File
@@ -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 = [