nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-13 15:43:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #331228 from katexochen/dnf5/up

Browse Source
This commit is contained in:
Sandro 2024-07-31 11:42:18 +02:00 committed by GitHub
commit 75ad444c4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 87 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
pkgs/tools/package-management/dnf5/default.nix
View File

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

43
pkgs/tools/package-management/librepo/default.nix
View File

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