diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-02 23:49:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 23:49:06 +0000 |
| commit | 66683883ca44513a4a47f74e82b191ad48bf6c5c (patch) | |
| tree | 04d0240252a13ad0a03f0869d8803f8db69f85a6 /pkgs/tools | |
| parent | adcb60e96df7c15ec9ab0d1805f6d2ac30f96ea4 (diff) | |
| parent | 9fa8f3ed0d3cb32c5fdf6fe8e4aff46ee2df842c (diff) | |
| download | nixlib-66683883ca44513a4a47f74e82b191ad48bf6c5c.tar nixlib-66683883ca44513a4a47f74e82b191ad48bf6c5c.tar.gz nixlib-66683883ca44513a4a47f74e82b191ad48bf6c5c.tar.bz2 nixlib-66683883ca44513a4a47f74e82b191ad48bf6c5c.tar.lz nixlib-66683883ca44513a4a47f74e82b191ad48bf6c5c.tar.xz nixlib-66683883ca44513a4a47f74e82b191ad48bf6c5c.tar.zst nixlib-66683883ca44513a4a47f74e82b191ad48bf6c5c.zip | |
Merge pull request #31142 from adisbladis/rpm-4_14_0
rpm: 4.13.0.1 -> 4.14.0
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch | 11 |
2 files changed, 3 insertions, 16 deletions
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 860be0e1f791..0e9ef3876d2b 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rpm-${version}"; - version = "4.13.0.1"; + version = "4.14.0"; src = fetchurl { - url = "http://ftp.rpm.org/releases/rpm-4.13.x/rpm-${version}.tar.bz2"; - sha256 = "27fc7ba7d419622b1ce34d6507aa70b0808bc344021d298072a0c2ec165f9b0d"; + url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; + sha256 = "053396glswgszzg6wizn76vc8zc5m2bicw025vj44g0dc1aav806"; }; outputs = [ "out" "dev" "man" ]; @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; - patches = [ ./rpm-4.13.0.1-bfd-config.patch ]; - postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} diff --git a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch deleted file mode 100644 index b8192b24f134..000000000000 --- a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru rpm-4.13.0.1/tools/sepdebugcrcfix.c rpm-4.13.0.1.new/tools/sepdebugcrcfix.c ---- rpm-4.13.0.1/tools/sepdebugcrcfix.c 2017-02-16 10:40:09.988649399 +0100 -+++ rpm-4.13.0.1.new/tools/sepdebugcrcfix.c 2017-04-15 00:02:21.151359876 +0200 -@@ -28,6 +28,7 @@ - #include <error.h> - #include <libelf.h> - #include <gelf.h> -+#include <config.h> - #include <bfd.h> - - #define _(x) x |