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

python-2.6-bsddb: build this module with Berkeley DB 4.5

Browse Source 
The current 'db' attribute refers to DB 4.8, which Python 2.6 does
recognize: <http://hydra.nixos.org/build/7320517/nixlog/1/raw>.
This commit is contained in:
Peter Simons 2013-12-23 21:45:46 +01:00
parent 6bc4007e60
commit 4e917cdc35
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm , sqlite, tcl, tk, x11, openssl, readline, db45, ncurses, gdbm
}: }:
assert zlibSupport -> zlib != null; assert zlibSupport -> zlib != null;
@ -17,7 +17,7 @@ let
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
md5 = "c6e0420a21d8b23dee8b0195c9b9a125"; md5 = "c6e0420a21d8b23dee8b0195c9b9a125";
}; };
patches = patches =
[ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff. [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
./search-path.patch ./search-path.patch
@ -34,12 +34,12 @@ let
[ bzip2 ] [ bzip2 ]
++ optional zlibSupport zlib; ++ optional zlibSupport zlib;
# Build the basic Python interpreter without modules that have # Build the basic Python interpreter without modules that have
# external dependencies. # external dependencies.
python = stdenv.mkDerivation { python = stdenv.mkDerivation {
name = "python-${version}"; name = "python-${version}";
inherit majorVersion version src patches buildInputs; inherit majorVersion version src patches buildInputs;
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
@ -146,7 +146,7 @@ let
bsddb = buildInternalPythonModule { bsddb = buildInternalPythonModule {
moduleName = "bsddb"; moduleName = "bsddb";
deps = [ db4 ]; deps = [ db45 ];
}; };
crypt = buildInternalPythonModule { crypt = buildInternalPythonModule {
@ -193,5 +193,5 @@ let
}; };
}; };
in python // { inherit modules; } in python // { inherit modules; }