Move all db4 packages to the default db5

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 {

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 {

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);

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);

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

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";

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];
 }

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
     ];

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/;

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;

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"

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
   '';
 }

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
   '';
 

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}";
 }