diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 5e46a033687..910b86e1318 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchpatch +{ stdenv, lib , pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages , sqlite, zstd @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "rpm"; - version = "4.16.1.3"; + version = "4.17.0"; src = fetchurl { url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; - sha256 = "07g2g0adgjm29wqy94iqhpp5dk0hacfw1yf7kzycrrxnfbwwfgai"; + sha256 = "2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a"; }; outputs = [ "out" "dev" "man" ]; @@ -36,22 +36,6 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; - patches = [ - # Small fixes for ndb on darwin - # https://github.com/rpm-software-management/rpm/pull/1465 - (fetchpatch { - name = "darwin-support.patch"; - url = "https://github.com/rpm-software-management/rpm/commit/2d20e371d5e38f4171235e5c64068cad30bda557.patch"; - sha256 = "0p3j5q5a4hl357maf7018k3826jhcpqg6wfrnccrkv30g0ayk171"; - }) - # Fix build on aarch64-darwin - # https://github.com/rpm-software-management/rpm/pull/1775 - (fetchpatch { - url = "https://github.com/emilazy/rpm/commit/45120e756930b4787ea2e06fb8a9e623ea13f2f3.patch"; - sha256 = "0zzblwx9apxyjsri4cxd09y9b2hs57r2fck98939j1qgcwy732ar"; - }) - ]; - postPatch = '' substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2374b9c13c..db2250ae9f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8764,6 +8764,7 @@ with pkgs; rpm = callPackage ../tools/package-management/rpm { python = python3; + lua = lua5_4; }; rpm-ostree = callPackage ../tools/misc/rpm-ostree {