Unverified Commit 1cddc94d authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #243437 from malt3/dnf5-5.0.15 

dnf5: init at 5.0.15
parents 0ccfe603 ea14b7d4

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -10047,6 +10047,11 @@ 
    githubId = 2914269;

    name = "Malo Bourgon";

  };

  malt3 = {

    github = "malt3";

    githubId = 1780588;

    name = "Malte Poll";

  };

  malte-v = {

    email = "nixpkgs@mal.tc";

    github = "malte-v";

pkgs/development/libraries/libsolv/default.nix

+21 −11
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config

, zlib, xz, bzip2, zchunk, zstd

{ lib

, stdenv

, fetchFromGitHub

, cmake

, ninja

, pkg-config

, zlib

, xz

, bzip2

, zchunk

, zstd

, expat

, withRpm ? !stdenv.isDarwin, rpm

, withRpm ? !stdenv.isDarwin

, rpm

, db

}:
@@ -24,6 +34,7 @@ stdenv.mkDerivation rec { 
    "-DENABLE_ZCHUNK_COMPRESSION=true"

    "-DWITH_SYSTEM_ZCHUNK=true"

  ] ++ lib.optionals withRpm [

    "-DENABLE_COMPS=true"

    "-DENABLE_PUBKEY=true"

    "-DENABLE_RPMDB=true"

    "-DENABLE_RPMDB_BYRPMHEADER=true"
@@ -42,4 +53,3 @@ stdenv.mkDerivation rec { 
    maintainers = with maintainers; [ copumpkin ];

  };

}

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

0 → 100644
+94 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, cmake

, createrepo_c

, gettext

, help2man

, pkg-config

, cppunit

, fmt

, glib

, json_c

, libmodulemd

, libpeas

, librepo

, libsmartcols

, libsolv

, libxml2

, rpm

, sdbus-cpp

, sqlite

, systemd

, toml11

, zchunk

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "dnf5";

  version = "5.0.15";



  src = fetchFromGitHub {

    owner = "rpm-software-management";

    repo = "dnf5";

    rev = finalAttrs.version;

    hash = "sha256-0MR9CJDFL1vbuO7FZyyn3PNb0p27oaho6I2eminTyYU=";

  };



  nativeBuildInputs = [ cmake createrepo_c gettext help2man pkg-config ];

  buildInputs = [

    cppunit

    fmt

    glib

    json_c

    libmodulemd

    libpeas

    librepo

    libsmartcols

    libsolv

    libxml2

    rpm

    sdbus-cpp

    sqlite

    systemd

    toml11

    zchunk

  ];



  # workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105329

  NIX_CFLAGS_COMPILE = "-Wno-restrict -Wno-maybe-uninitialized";



  cmakeFlags = [

    "-DWITH_PERL5=OFF"

    "-DWITH_PYTHON3=OFF"

    "-DWITH_RUBY=OFF"

    "-DWITH_TESTS=OFF"

    # TODO: fix man installation paths

    "-DWITH_MAN=OFF"

    # 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"

  ];



  prePatch = ''

    substituteInPlace dnf5daemon-server/dbus/CMakeLists.txt \

      --replace '/etc' "$out/etc" \

      --replace '/usr' "$out"

    substituteInPlace dnf5daemon-server/polkit/CMakeLists.txt \

      --replace '/usr' "$out"

    substituteInPlace dnf5/CMakeLists.txt \

      --replace '/etc/bash_completion.d' "$out/etc/bash_completion.d"

  '';



  dontFixCmake = true;



  meta = with lib; {

    description = "Next-generation RPM package management system";

    homepage = "https://github.com/rpm-software-management/dnf5";

    license = licenses.gpl2Plus;

    maintainers = with lib.maintainers; [ malt3 ];

    platforms = platforms.linux ++ platforms.darwin;

  };

})

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -553,6 +553,8 @@ with pkgs; 














  dec-decode = callPackage ../development/tools/dec-decode { };



























  dnf5 = callPackage ../tools/package-management/dnf5 { };



























  dsq = callPackage ../tools/misc/dsq { };





























  dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { };