alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #31142 from adisbladis/rpm-4_14_0

Browse source 
rpm: 4.13.0.1 -> 4.14.0
This commit is contained in:
Orivej Desh 2017-11-02 23:49:06 +00:00 committed by GitHub
parent adcb60e96d 9fa8f3ed0d
commit 66683883ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/package-management/rpm/default.nix
View file

@ -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}

11
pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch
View file

@ -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