swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #269512 from katexochen/dnf5/5-1-8

Browse source 
dnf5: 5.1.7 -> 5.1.8, re-enable tests, add man pages
This commit is contained in:
Pierre Bourdon 2023-11-26 15:07:03 +01:00 committed by GitHub
parent f64d29996b 6dc8cbd7a3
commit bcbf8ac86a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkgs/tools/package-management/dnf5/default.nix
View file

@ -3,9 +3,11 @@
, fetchFromGitHub
, cmake
, createrepo_c
, doxygen
, gettext
, help2man
, pkg-config
, python3Packages
, cppunit
, fmt
, json_c
@ -14,27 +16,45 @@
, libsmartcols
, libsolv
, libxml2
, libyaml
, pcre2
, rpm
, sdbus-cpp
, sphinx
, sqlite
, systemd
, testers
, toml11
, zchunk
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dnf5";
version = "5.1.7";
version = "5.1.8";
outputs = [ "out" "man" ];
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = "dnf5";
rev = finalAttrs.version;
hash = "sha256-SXgl4YFWl1A3N2/IkDftvBl6Rwhnymxe8AqqaekGHTc=";
hash = "sha256-4ht2KraWKL774QPfZz1OgAuFtPVsMis9WiDS+QFP8JY=";
};
nativeBuildInputs = [ cmake createrepo_c gettext help2man pkg-config ];
nativeBuildInputs = [
cmake
createrepo_c
doxygen
gettext
help2man
pkg-config
sphinx
] ++ (with python3Packages; [
breathe
sphinx-autoapi
sphinx-rtd-theme
]);
buildInputs = [
cppunit
fmt
@ -44,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
libsmartcols
libsolv
libxml2
libyaml
pcre2.dev
rpm
sdbus-cpp
@ -60,9 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
"-DWITH_PERL5=OFF"
"-DWITH_PYTHON3=OFF"
"-DWITH_RUBY=OFF"
"-DWITH_TESTS=OFF"
# TODO: fix man installation paths
"-DWITH_MAN=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,
@ -71,6 +89,10 @@ stdenv.mkDerivation (finalAttrs: {
"-DCMAKE_INSTALL_LIBDIR=lib"
];
postBuild = ''
make doc
'';
prePatch = ''
substituteInPlace dnf5daemon-server/dbus/CMakeLists.txt \
--replace '/etc' "$out/etc" \
@ -83,6 +105,10 @@ stdenv.mkDerivation (finalAttrs: {
dontFixCmake = true;
passthru.tests = {
version = testers.testVersion { package = finalAttrs.finalPackage; };
};
meta = with lib; {
description = "Next-generation RPM package management system";
homepage = "https://github.com/rpm-software-management/dnf5";