public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move all db4 packages to the default db5

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/python/2.6/default.nix
View File

@@ -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 {

4
pkgs/development/interpreters/python/2.7/default.nix
View File

@@ -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 {

6
pkgs/development/interpreters/python/3.2/default.nix
View File

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

6
pkgs/development/interpreters/python/3.3/default.nix
View File

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