Merge branch 'master.rpm' of git://github.com/wkennington/nixpkgs
rpm: Upgrade from 4.7.2 -> 4.11.2
This commit is contained in:
commit
3c4be425db
|
@ -1,14 +1,14 @@
|
||||||
{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz, python }:
|
{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db, xz, python }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "rpm-4.7.2";
|
name = "rpm-4.11.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://rpm.org/releases/rpm-4.7.x/${name}.tar.bz2";
|
url = "http://rpm.org/releases/rpm-4.11.x/${name}.tar.bz2";
|
||||||
sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0";
|
sha256 = "1m2859js0dwg26sg2mnbkpzhvx303b12kx26az74cf5k6bk8sgs0";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz python ];
|
buildInputs = [ cpio zlib bzip2 file nspr nss popt db xz python ];
|
||||||
|
|
||||||
# Note: we don't add elfutils to buildInputs, since it provides a
|
# Note: we don't add elfutils to buildInputs, since it provides a
|
||||||
# bad `ld' and other stuff.
|
# bad `ld' and other stuff.
|
||||||
|
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
configureFlags = "--with-external-db --without-lua --enable-python";
|
configureFlags = "--with-external-db --without-lua --enable-python";
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
homepage = http://www.rpm.org/;
|
homepage = http://www.rpm.org/;
|
||||||
license = "GPLv2";
|
license = licenses.gpl2;
|
||||||
description = "The RPM Package Manager";
|
description = "The RPM Package Manager";
|
||||||
maintainers = stdenv.lib.maintainers.mornfall;
|
maintainers = with maintainers; [ mornfall ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue