Move all db4 packages to the default db5

This commit is contained in:
William A. Kennington III
2014-01-31 14:05:37 -06:00
committed by Bjørn Forsman
parent 99f5d2edb4
commit bdb842d5eb
37 changed files with 81 additions and 85 deletions

View File

@@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, db4, libgcrypt, avahi, libiconv, pam, openssl }:
{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl }:
stdenv.mkDerivation rec {
name = "netatalk-3.1.0";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";
};
buildInputs = [ pkgconfig db4 libgcrypt avahi libiconv pam openssl ];
buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl ];
configureFlags = [
"--with-bdb=${db4}"
"--with-bdb=${db}"
"--with-openssl=${openssl}"
];

View File

@@ -1,4 +1,4 @@
{fetchurl, stdenv, flex, db4}:
{fetchurl, stdenv, flex, db}:
stdenv.mkDerivation rec {
name = "bogofilter-1.2.4";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
# FIXME: We would need `pax' as a "propagated build input" (for use
# by the `bf_tar' script) but we don't have it currently.
buildInputs = [ flex db4 ];
buildInputs = [ flex db ];
meta = {
homepage = http://bogofilter.sourceforge.net/;

View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, db4, groff}:
{stdenv, fetchurl, db, groff}:
stdenv.mkDerivation {
name = "man-db-2.5.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "178w1fk23ffh8vabj29cn0yyg5ps7bwy1zrrrcsw8aypbh3sfjy3";
};
buildInputs = [db4 groff];
buildInputs = [db groff];
configureFlags = ''
--disable-setuid

View File

@@ -1,4 +1,4 @@
{ fetchurl, stdenv, openssl, pkgconfig, db4 }:
{ fetchurl, stdenv, openssl, pkgconfig, db }:
stdenv.mkDerivation rec {
name = "isync-1.0.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
patches = [ ./isync-recursice-imap.patch ]; # usefull patch to enable subfolders listing
buildInputs = [ openssl pkgconfig db4 ];
buildInputs = [ openssl pkgconfig db ];
meta = {
homepage = http://isync.sourceforge.net/;

View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, zlib, libpng, gd, geoip, db4}:
{stdenv, fetchurl, zlib, libpng, gd, geoip, db}:
stdenv.mkDerivation {
name = "webalizer-2.23-05";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
--replace "--static" ""
'';
buildInputs = [zlib libpng gd geoip db4];
buildInputs = [zlib libpng gd geoip db];
configureFlags = "--enable-dns --enable-geoip --disable-static --enable-shared";
}

View File

@@ -1,4 +1,4 @@
{ 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 {
name = "rpm-4.7.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0";
};
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
# bad `ld' and other stuff.