diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2022-09-29 13:14:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 13:14:06 +0200 |
| commit | c29b7191418be2878d6e0cdda6c9c52db26d8b92 (patch) | |
| tree | d713177ad4c6282456e4c729837ec75173aff054 | |
| parent | 868fa86f5c5afb6b00b4fa7ea07e7026efcd88a1 (diff) | |
| parent | a089c12aa516f4e172ec060c690c6e96752225c1 (diff) | |
Merge pull request #193474 from LeSuisse/rpm-4.18.0
rpm: 4.17.1 -> 4.18.0
| -rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index d8207bb4b30e..af8032b81a50 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,16 +1,16 @@ { stdenv, lib , pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages -, sqlite, zstd, fetchpatch, libcap +, sqlite, zstd, libcap }: stdenv.mkDerivation rec { pname = "rpm"; - version = "4.17.1"; + version = "4.18.0"; src = fetchurl { url = "https://ftp.osuosl.org/pub/rpm/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; - hash = "sha256-DBG3k0ZucliFH/gr1lyP/Ywtu8cKzIaaXTQVBUmSbl0="; + hash = "sha256-KhcVLXGHqzDt8sL7WGRjvfY4jee1g3SAlVZZ5ekFRVQ="; }; outputs = [ "out" "dev" "man" ]; @@ -38,13 +38,6 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ] ++ lib.optional stdenv.isLinux "--with-cap"; - patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fix build for macOS aarch64 - (fetchpatch { - url = "https://github.com/rpm-software-management/rpm/commit/ad87ced3990c7e14b6b593fa411505e99412e248.patch"; - hash = "sha256-WYlxPGcPB5lGQmkyJ/IpGoqVfAKtMxKzlr5flTqn638="; - }) - ]; - postPatch = '' substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; |