* RPM updated to 4.7.2.

* nspr updated to 4.8.2.
* nss updated to 3.12.4.
* elfutils updated to 0.143.

svn path=/nixpkgs/trunk/; revision=18867
This commit is contained in:
Eelco Dolstra 2009-12-09 22:34:51 +00:00
parent 06b135ebf8
commit d869913b27
6 changed files with 24 additions and 43 deletions

View file

@ -1,13 +1,13 @@
{stdenv, fetchurl}:
let version = "4.8"; in
let version = "4.8.2"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha256 = "1znvc7fb4f6318kbn1w86p134r4cslij25sg7kcspfx746m89pm2";
sha256 = "1klv656ha97ysm4d0863sq2f1xyr5rijrh7k07gvdi7f88m1iv13";
};
preConfigure = "cd mozilla/nsprpub";

View file

@ -10,11 +10,11 @@ let
in
stdenv.mkDerivation {
name = "nss-3.12.3";
name = "nss-3.12.4";
src = fetchurl {
url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_3_RTM/src/nss-3.12.3.tar.bz2;
sha1 = "eeca14a37629287baa10eb7562a5fb927e9dd171";
url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/nss-3.12.4.tar.gz;
sha1 = "a152bf980f3a3dcf575c2d149fb279058ef2e757";
};
buildInputs = [nspr perl zlib];

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, m4}:
stdenv.mkDerivation rec {
name = "elfutils-0.140";
name = "elfutils-0.143";
src = fetchurl {
url = "https://fedorahosted.org/releases/e/l/elfutils/${name}.tar.bz2";
sha256 = "5479c0a0b50b4a370a2baa0f8e906e7e51c403ce3afe3a4cbc6aea7c34eebffd";
sha256 = "1zrqs93m6frg7j70a96xdhdb4mnzmqgh91f9bbm39jnmgs50qp23";
};
buildInputs = [m4];

View file

@ -1,31 +1,26 @@
{stdenv, fetchurl, cpio, zlib, bzip2, file, sqlite, beecrypt, neon, elfutils}:
{ stdenv, fetchurl, cpio, zlib, bzip2, xz, file, elfutils, nspr, nss, popt, db4 }:
stdenv.mkDerivation {
name = "rpm-4.4.8";
stdenv.mkDerivation rec {
name = "rpm-4.7.2";
src = fetchurl {
url = http://wraptastic.org/pub/rpm-4.4.x/rpm-4.4.8.tar.gz;
sha256 = "02ddf076bwcpxzxq9i0ii1fzw2r69fk0gjkk2yrzgzsmb01na230";
url = "http://rpm.org/releases/rpm-4.7.x/${name}.tar.bz2";
sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0";
};
buildInputs = [ cpio zlib bzip2 xz file nspr nss popt db4 ];
# Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff.
buildInputs = [cpio zlib bzip2 file sqlite beecrypt neon];
NIX_CFLAGS_COMPILE = "-I${beecrypt}/include/beecrypt -I${neon}/include/neon -I${elfutils}/include";
NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${elfutils}/include";
NIX_CFLAGS_LINK = "-L${elfutils}/lib";
configureFlags = "--with-external-db --without-lua";
preConfigure = ''
rm -rf zlib file sqlite
substituteInPlace ./installplatform --replace /usr/bin/env $(type -tp env)
substituteInPlace Makefile.in --replace /var/tmp $(pwd)/dummy
'';
dontDisableStatic = true;
configureFlags = "--without-selinux --without-lua --without-python --without-perl";
patches = [./no-lua.patch];
meta = {
homepage = http://www.rpm.org/;
license = "GPLv2";
description = "The RPM Package Manager";
};
}

View file

@ -1,15 +0,0 @@
diff -rc rpm-4.4.8-orig/lib/poptALL.c rpm-4.4.8/lib/poptALL.c
*** rpm-4.4.8-orig/lib/poptALL.c 2007-03-21 19:46:31.000000000 +0100
--- rpm-4.4.8/lib/poptALL.c 2007-03-21 19:44:45.000000000 +0100
***************
*** 483,489 ****
--- 483,491 ----
rpmFreeMacros(NULL);
/*@i@*/ rpmFreeMacros(rpmCLIMacroContext);
rpmFreeRpmrc();
+ #ifdef WITH_LUA
(void) rpmluaFree(NULL);
+ #endif
rpmFreeFilesystems();
/*@i@*/ urlFreeCache();
rpmlogClose();

View file

@ -1339,7 +1339,8 @@ let
};
rpm = import ../tools/package-management/rpm {
inherit fetchurl stdenv cpio zlib bzip2 file sqlite beecrypt neon elfutils;
inherit fetchurl stdenv cpio zlib bzip2 xz file elfutils nspr nss popt;
db4 = db45;
};
rrdtool = import ../tools/misc/rrdtool {