diff options
Diffstat (limited to 'pkgs')
36 files changed, 78 insertions, 82 deletions
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 74ae3dcf22b..5356d4ce298 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db4, libmodplug, timidity, libid3tag, libtool }: +{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }: stdenv.mkDerivation rec { name = "moc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configurePhase = "./configure prefix=$out"; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db4 libmodplug timidity libid3tag libtool ]; + buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ]; meta = { description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use."; diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 9e20be0dcbc..1785526d14a 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }: +{ fetchurl, stdenv, openssl, db, boost, zlib, miniupnpc, qt4 }: stdenv.mkDerivation rec { version = "0.8.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "036xx06gyrfh65rpdapff3viz1f38vzkj7lnhil6fc0s7pjmsjbk"; }; - buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ]; + buildInputs = [ openssl db boost zlib miniupnpc qt4 ]; configurePhase = '' cd src diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix index d5ed057f56b..33d8585bb2d 100644 --- a/pkgs/applications/misc/freicoin/default.nix +++ b/pkgs/applications/misc/freicoin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, db4, boost, gmp, mpfr, miniupnpc, qt4, unzip }: +{ fetchurl, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, unzip }: stdenv.mkDerivation rec { version = "0.8.3-1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # I think that openssl and zlib are required, but come through other # packages - buildInputs = [ db4 boost gmp mpfr miniupnpc qt4 unzip ]; + buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip ]; configurePhase = "qmake"; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index 24edc0e128a..fe4c0287fdd 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, db4, gtk, bzip2 }: +{ stdenv, fetchurl, db, gtk, bzip2 }: stdenv.mkDerivation { name = "jigdo-0.7.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3"; }; - buildInputs = [ db4 gtk bzip2 ]; + buildInputs = [ db gtk bzip2 ]; configureFlags = "--without-libdb"; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 276df1ae7a1..9de14cae6f0 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -2,7 +2,7 @@ x@{builderDefsPackage , cyrus_sasl, gettext, openldap, ptlib, opal, GConf, libXv, rarian, intltool , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake - , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db4, nspr, nss, zlib + , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle , ...}: builderDefsPackage diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 67cbd7996ff..58e657f8b2e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,7 +6,7 @@ { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd -, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon +, libxml2, db, sablotron, curl, libXaw, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler @@ -248,7 +248,7 @@ stdenv.mkDerivation rec { buildInputs = [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig + CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 diff --git a/pkgs/applications/version-management/codeville/0.8.0.nix b/pkgs/applications/version-management/codeville/0.8.0.nix index 5c1910d6c6f..0c0f3c4c19c 100644 --- a/pkgs/applications/version-management/codeville/0.8.0.nix +++ b/pkgs/applications/version-management/codeville/0.8.0.nix @@ -1,6 +1,6 @@ args : with args; -if (! python ? db4Support) || (! python.db4Support) then +if (! python ? dbSupport) || (! python.dbSupport) then throw ''Python DB4 support is required for codeville.'' else diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 6373eb9f7f9..60f5d8bb9e0 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }: +{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db, kdelibs, expat }: # the homepage mentions this is the final release. # from now on, kdesvn will be part of the official kde software distribution @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake ''; - buildInputs = [ apr aprutil subversion db4 kdelibs expat ]; + buildInputs = [ apr aprutil subversion db kdelibs expat ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index cb3db8432b6..d0c15bd96ff 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret -, p11_kit, db4, nspr, nss, libical, gperf }: +, p11_kit, db, nspr, nss, libical, gperf }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret - gcr p11_kit db4 nspr nss libgweather libical libgdata gperf ]; + gcr p11_kit db nspr nss libgweather libical libgdata gperf ]; # uoa irrelevant for now configureFlags = "--disable-uoa --with-nspr-includes=${nspr}/include/nspr --with-nss-includes=${nss}/include/nss"; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 7c6516fe668..0302513e6fc 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 -, sqlite, tcl, tk, x11, openssl, readline, db45, ncurses, gdbm +, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm }: assert zlibSupport -> zlib != null; @@ -146,7 +146,7 @@ let bsddb = buildInternalPythonModule { moduleName = "bsddb"; - deps = [ db45 ]; + deps = [ db ]; }; crypt = buildInternalPythonModule { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 043094c0303..4897c0a5141 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 -, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm, libX11 }: +, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11 }: assert zlibSupport -> zlib != null; @@ -156,7 +156,7 @@ let bsddb = buildInternalPythonModule { moduleName = "bsddb"; - deps = [ db4 ]; + deps = [ db ]; }; curses = buildInternalPythonModule { diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index e09602e7381..03f2d392bd1 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , bzip2 -, db4 +, db , gdbm , libX11, xproto , ncurses @@ -20,7 +20,7 @@ let version = "${majorVersion}.5"; buildInputs = filter (p: p != null) [ - zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto + zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto ]; in stdenv.mkDerivation { @@ -57,7 +57,7 @@ stdenv.mkDerivation { passthru = { zlibSupport = zlib != null; sqliteSupport = sqlite != null; - db4Support = db4 != null; + dbSupport = db != null; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 84cb9dd141a..18af6487e55 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , bzip2 -, db4 +, db , gdbm , libX11, xproto , ncurses @@ -20,7 +20,7 @@ let version = "${majorVersion}.3"; buildInputs = filter (p: p != null) [ - zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto + zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto ]; in stdenv.mkDerivation { @@ -57,7 +57,7 @@ stdenv.mkDerivation { passthru = { zlibSupport = zlib != null; sqliteSupport = sqlite != null; - db4Support = db4 != null; + dbSupport = db != null; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index e2d72fc7d6b..229529f08ce 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl -, bdbSupport ? false, db4 +, bdbSupport ? false, db , ldapSupport ? true, openldap }: assert sslSupport -> openssl != null; -assert bdbSupport -> db4 != null; +assert bdbSupport -> db != null; assert ldapSupport -> openldap != null; let @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { --with-apr=${apr} --with-expat=${expat} --with-crypto ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"} - ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db4}"} + ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"} ${stdenv.lib.optionalString ldapSupport "--with-ldap"} ''; propagatedBuildInputs = [ makeWrapper apr expat ] ++ optional sslSupport openssl - ++ optional bdbSupport db4 + ++ optional bdbSupport db ++ optional ldapSupport openldap; # Give apr1 access to sed for runtime invocations diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index e90ec422661..712f05b8d65 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, db4, gettext, pam }: +{ stdenv, fetchurl, openssl, db, gettext, pam }: stdenv.mkDerivation rec { name = "cyrus-sasl-2.1.26"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g"; }; - buildInputs = [ openssl db4 gettext ] ++ stdenv.lib.optional stdenv.isLinux pam; + buildInputs = [ openssl db gettext ] ++ stdenv.lib.optional stdenv.isLinux pam; patches = [ ./missing-size_t.patch ]; # https://bugzilla.redhat.com/show_bug.cgi?id=906519 patchFlags = "-p0"; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index d4728273d34..8f4138282f0 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} : +{ stdenv, fetchurl, openldap, readline, db, openssl, cyrus_sasl, sqlite} : stdenv.mkDerivation rec { name = "heimdal-1.5.3"; @@ -23,5 +23,5 @@ stdenv.mkDerivation rec { rmdir $out/libexec ''; - propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl sqlite]; + propagatedBuildInputs = [ readline db openssl openldap cyrus_sasl sqlite]; } diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 9a1b4122365..1b16d361c6d 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db4 +{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db , libuuid, lzo, pkgconfig, guile }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 lzo libgcrypt - gdbm db4 tdb + gdbm db tdb gnutls libuuid guile ]; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 26b3de70dcd..4863c928988 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -3,7 +3,7 @@ , mysql, withMysql ? false , postgresql, withPostgresql ? false , sqlite, withSqlite ? true -, db4, withBdb ? false +, db, withBdb ? false }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withMysql mysql ++ stdenv.lib.optional withSqlite sqlite ++ stdenv.lib.optional withPostgresql postgresql - ++ stdenv.lib.optional withBdb db4; + ++ stdenv.lib.optional withBdb db; propagatedBuildInputs = [ librdf_rasqal ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-threads" ] - ++ stdenv.lib.optional withBdb "--with-bdb=${db4}"; + ++ stdenv.lib.optional withBdb "--with-bdb=${db}"; meta = { homepage = http://librdf.org/; diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index e62fa2fa1c5..b2e13a1e9ab 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost -, apr, aprutil, db4, expat +, apr, aprutil, db, expat }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src/main/cpp/socketoutputstream.cpp ''; - buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db4 expat]; + buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat]; meta = { homepage = http://logging.apache.org/log4cxx/index.html; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 8f26f29c377..c4be3358049 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}: +{stdenv, fetchurl, openssl, cyrus_sasl, db, groff}: stdenv.mkDerivation rec { name = "openldap-2.4.38"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1l8zng86alhcmmmw09r1c4dzl7yvk6dy5fq9zia96pgck4srl848"; }; - buildInputs = [ openssl cyrus_sasl db4 groff ]; + buildInputs = [ openssl cyrus_sasl db groff ]; configureFlags = [ "--enable-overlays" diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index 01f698da232..a6af84a6581 100644 --- a/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix @@ -1,4 +1,4 @@ -{buildPerlPackage, fetchurl, db4}: +{buildPerlPackage, fetchurl, db}: buildPerlPackage rec { name = "BerkeleyDB-0.54"; @@ -9,7 +9,7 @@ buildPerlPackage rec { }; preConfigure = '' - echo "LIB = ${db4}/lib" > config.in - echo "INCLUDE = ${db4}/include" >> config.in + echo "LIB = ${db}/lib" > config.in + echo "INCLUDE = ${db}/include" >> config.in ''; } diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index 4017d8f5ca5..4195f8d613e 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -1,4 +1,4 @@ -{fetchurl, buildPerlPackage, db4}: +{fetchurl, buildPerlPackage, db}: buildPerlPackage rec { name = "DB_File-1.831"; @@ -12,8 +12,8 @@ buildPerlPackage rec { cat > config.in <<EOF PREFIX = size_t HASH = u_int32_t - LIB = ${db4}/lib - INCLUDE = ${db4}/include + LIB = ${db}/lib + INCLUDE = ${db}/include EOF ''; diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index c26347c5243..574796e2c68 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, db4}: +{stdenv, fetchurl, python, db}: stdenv.mkDerivation rec { name = "bsddb3-6.0.1"; @@ -8,5 +8,5 @@ stdenv.mkDerivation rec { }; buildInputs = [python]; buildPhase = "true"; - installPhase = "python ./setup.py install --prefix=$out --berkeley-db=${db4}"; + installPhase = "python ./setup.py install --prefix=$out --berkeley-db=${db}"; } diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 9e8faa6a02e..2cfbc2a1df1 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }: +{ fetchurl, stdenv, flex, bison, db, iptables, pkgconfig }: stdenv.mkDerivation rec { name = "iproute2-3.12.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" + " MANDIR=$(out)/share/man"; - buildInputs = [ db4 iptables ]; + buildInputs = [ db iptables ]; nativeBuildInputs = [ bison flex pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index fc518e4f889..49550647921 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, libevent, zlib, openssl, db4, bison, pam }: +{ stdenv, fetchurl, libevent, zlib, openssl, db, bison, pam }: stdenv.mkDerivation rec { name = "opensmtpd-${version}"; version = "201307151923p1"; - buildInputs = [ libevent zlib openssl db4 bison pam ]; + buildInputs = [ libevent zlib openssl db bison pam ]; src = fetchurl { url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index a435eea8663..0bfc31580e1 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, db4, glibc, openssl, cyrus_sasl +{ stdenv, fetchurl, db, glibc, openssl, cyrus_sasl , coreutils, findutils, gnused, gnugrep, bison, perl }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "11z07mjy53l1fnl7k4101yk4ilibgqr1164628mqcbmmr8bh2szl"; }; - buildInputs = [db4 openssl cyrus_sasl bison perl]; + buildInputs = [db openssl cyrus_sasl bison perl]; patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ]; diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index 8a23e480e1f..a398a3ccdf9 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, openssl, db4, zlib, uwimap, htmlTidy, pam}: +{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, htmlTidy, pam}: let ssl = stdenv.lib.optionals uwimap.withSSL @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda"; }; - buildInputs = [ openssl db4 zlib uwimap htmlTidy pam ]; + buildInputs = [ openssl db zlib uwimap htmlTidy pam ]; nativeBuildInputs = [ perl ]; NIX_LDFLAGS = "-lpam"; diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index a41343c0cf9..18778aa80db 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -35,7 +35,7 @@ rec { url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2"; sha256 = "0dafqv00dr3nyrm9k47d6r7gv2r3f9hjd1ykl3kkvjca11r4n54j"; }; - buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2 + buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2 libtool openssl]; }; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 26ffc9d50c2..850e1681248 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -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}" ]; diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 09d8e888837..f7c121d825e 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -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/; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 5374cb74361..121a92b845d 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -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 diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 30ee63f257a..86986ed9b95 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -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/; diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index efa29e81407..99fde387129 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -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"; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 9a96baf5fe0..4b1b8aeb28d 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -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. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b38f408d967..9bc23af3b6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1795,9 +1795,7 @@ let inherit ppp; }; - rpm = callPackage ../tools/package-management/rpm { - db4 = db45; - }; + rpm = callPackage ../tools/package-management/rpm { }; rrdtool = callPackage ../tools/misc/rrdtool { }; @@ -6378,7 +6376,7 @@ let squids = recurseIntoAttrs( import ../servers/squid/squids.nix { inherit fetchurl stdenv perl lib composableDerivation - openldap pam db4 cyrus_sasl kerberos libcap expat libxml2 libtool + openldap pam db cyrus_sasl kerberos libcap expat libxml2 libtool openssl; }); squid = squids.squid31; # has ipv6 support @@ -6956,9 +6954,7 @@ let # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader ) - pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { - db = db4; - }; + pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { }; pam_console = callPackage ../os-specific/linux/pam_console { libtool = libtool_1_5; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6de2d1dd4f3..a42af772046 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -306,7 +306,7 @@ let self = _self // overrides; _self = with self; { BerkeleyDB = import ../development/perl-modules/BerkeleyDB { inherit buildPerlPackage fetchurl; - inherit (pkgs) db4; + inherit (pkgs) db; }; BHooksEndOfScope = buildPerlPackage { @@ -2201,7 +2201,7 @@ let self = _self // overrides; _self = with self; { DBFile = import ../development/perl-modules/DB_File { inherit fetchurl buildPerlPackage; - inherit (pkgs) db4; + inherit (pkgs) db; }; DBI = buildPerlPackage { |