diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-01-31 14:05:37 -0600 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-02-15 12:03:02 +0100 |
| commit | bdb842d5ebb8fd5aea400312373eaeb0126b726c (patch) | |
| tree | 55f34718f08b778f60095d6faaa8671e7582405a /pkgs/development/interpreters | |
| parent | 99f5d2edb423194540a2bf83365e7b78b1ffccc9 (diff) | |
| download | nixlib-bdb842d5ebb8fd5aea400312373eaeb0126b726c.tar nixlib-bdb842d5ebb8fd5aea400312373eaeb0126b726c.tar.gz nixlib-bdb842d5ebb8fd5aea400312373eaeb0126b726c.tar.bz2 nixlib-bdb842d5ebb8fd5aea400312373eaeb0126b726c.tar.lz nixlib-bdb842d5ebb8fd5aea400312373eaeb0126b726c.tar.xz nixlib-bdb842d5ebb8fd5aea400312373eaeb0126b726c.tar.zst nixlib-bdb842d5ebb8fd5aea400312373eaeb0126b726c.zip | |
Move all db4 packages to the default db5
Diffstat (limited to 'pkgs/development/interpreters')
4 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 7c6516fe668c..0302513e6fc5 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 043094c03036..4897c0a5141e 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 e09602e7381e..03f2d392bd11 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 84cb9dd141ab..18af6487e558 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); |