Merge pull request #138566 from LeSuisse/rpm-4.17.0
rpm: 4.16.1.3 -> 4.17.0
This commit is contained in:
commit
1d019e6a27
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, lib, fetchpatch
|
{ stdenv, lib
|
||||||
, pkg-config, autoreconfHook
|
, pkg-config, autoreconfHook
|
||||||
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
|
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
|
||||||
, sqlite, zstd
|
, sqlite, zstd
|
||||||
|
@ -6,11 +6,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "rpm";
|
pname = "rpm";
|
||||||
version = "4.16.1.3";
|
version = "4.17.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2";
|
url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2";
|
||||||
sha256 = "07g2g0adgjm29wqy94iqhpp5dk0hacfw1yf7kzycrrxnfbwwfgai";
|
sha256 = "2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" "man" ];
|
outputs = [ "out" "dev" "man" ];
|
||||||
|
@ -36,22 +36,6 @@ stdenv.mkDerivation rec {
|
||||||
"--sharedstatedir=/com"
|
"--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 = ''
|
postPatch = ''
|
||||||
substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' ""
|
substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' ""
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -8764,6 +8764,7 @@ with pkgs;
|
||||||
|
|
||||||
rpm = callPackage ../tools/package-management/rpm {
|
rpm = callPackage ../tools/package-management/rpm {
|
||||||
python = python3;
|
python = python3;
|
||||||
|
lua = lua5_4;
|
||||||
};
|
};
|
||||||
|
|
||||||
rpm-ostree = callPackage ../tools/misc/rpm-ostree {
|
rpm-ostree = callPackage ../tools/misc/rpm-ostree {
|
||||||
|
|
Loading…
Reference in a new issue