rpm: 4.14.2.1 -> 4.15.1

It's only compatible with Python3 now.
This commit is contained in:
Daniel Schaefer 2019-11-07 00:31:04 +01:00
parent d903f1166b
commit f56b70378e
3 changed files with 8 additions and 6 deletions

@ -1,15 +1,15 @@
{ stdenv
{ stdenv, lib
, pkgconfig, autoreconfHook
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua
}:
stdenv.mkDerivation rec {
pname = "rpm";
version = "4.14.2.1";
version = "4.15.1";
src = fetchurl {
url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2";
sha256 = "1nmck2fq9h85fgs3zhh6w1avlw5y16cbz5khd459ry3jfd5w4f8i";
url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2";
sha256 = "0c6jwail90fhha3bpx70w4a2i8ycxwvnx6zwxm121l8wc3wlbvyx";
};
outputs = [ "out" "dev" "man" ];

@ -6389,7 +6389,9 @@ in
rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { };
rpm = callPackage ../tools/package-management/rpm { };
rpm = callPackage ../tools/package-management/rpm {
python = python3;
};
rpm-ostree = callPackage ../tools/misc/rpm-ostree {
gperf = gperf_3_0;

@ -5693,7 +5693,7 @@ in {
rply = callPackage ../development/python-modules/rply {};
rpm = toPythonModule (pkgs.rpm.override{inherit python;});
rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override{ inherit python; }));
rpmfluff = callPackage ../development/python-modules/rpmfluff {};