diff options
| author | Daniel Schaefer <git@danielschaefer.me> | 2020-06-15 19:55:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 19:55:42 +0200 |
| commit | 5f5caaceb4b6f886e608c11f4a0ffb828e8b0ca0 (patch) | |
| tree | 0f1850e433f9fe44a47e6827a5dd900e91670205 | |
| parent | 92f39f763eaf93eb4da9e310bba8c1a4638215ae (diff) | |
| parent | f56b70378ebcbf551e52598e7c77ad8b8e744161 (diff) | |
| download | nixlib-5f5caaceb4b6f886e608c11f4a0ffb828e8b0ca0.tar nixlib-5f5caaceb4b6f886e608c11f4a0ffb828e8b0ca0.tar.gz nixlib-5f5caaceb4b6f886e608c11f4a0ffb828e8b0ca0.tar.bz2 nixlib-5f5caaceb4b6f886e608c11f4a0ffb828e8b0ca0.tar.lz nixlib-5f5caaceb4b6f886e608c11f4a0ffb828e8b0ca0.tar.xz nixlib-5f5caaceb4b6f886e608c11f4a0ffb828e8b0ca0.tar.zst nixlib-5f5caaceb4b6f886e608c11f4a0ffb828e8b0ca0.zip | |
Merge pull request #72956 from JohnAZoidberg/rpm-415
| -rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index fdcf9832e667..fee282de52fc 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -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" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 240a2ab6d997..a2d8893f2060 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6401,7 +6401,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; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5bc5a54f7a6..5e7e70563526 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5718,7 +5718,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 {}; |