* Build those Python modules in the Python distribution that require

additional dependencies (e.g. SQLite, X11, or Tcl/Tk) outside the
  main Python package (i.e., pythonBase).  This makes pythonFull
  unnecessary: you can just pass the additional modules as
  buildInputs to packages that require them, e.g.

    buildInputs = [ pythonModules.sqlite3 ];

svn path=/nixpkgs/branches/modular-python/; revision=25364
This commit is contained in:
Eelco Dolstra 2011-01-03 16:25:11 +00:00
parent e1309dee31
commit c1eb464f3c
3 changed files with 79 additions and 15 deletions

View file

@ -0,0 +1,70 @@
{ stdenv, python, sqlite, tcl, tk, x11, openssl, readline }:
with stdenv.lib;
let
buildInternalPythonModule =
{ moduleName
, internalName ? "_" + moduleName
, deps
}:
stdenv.mkDerivation rec {
name = "python-${moduleName}-${python.version}";
src = python.src;
patches = python.patches;
buildInputs = [ python ] ++ deps;
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
configurePhase = "true";
buildPhase =
''
# Fake the build environment that setup.py expects.
ln -s ${python}/include/python*/pyconfig.h .
ln -s ${python}/lib/python*/config/Setup Modules/
ln -s ${python}/lib/python*/config/Setup.local Modules/
substituteInPlace setup.py --replace 'self.extensions = extensions' \
'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]'
python ./setup.py build_ext
'';
installPhase =
''
dest=$out/lib/${python.libPrefix}/site-packages
mkdir -p $dest
cp -p $(find . -name "*.so") $dest/
'';
};
in {
sqlite3 = buildInternalPythonModule {
moduleName = "sqlite3";
deps = [ sqlite ];
};
tkinter = buildInternalPythonModule {
moduleName = "tkinter";
deps = [ tcl tk x11 ];
};
ssl = buildInternalPythonModule {
moduleName = "ssl";
deps = [ openssl ];
};
readline = buildInternalPythonModule {
moduleName = "readline";
internalName = "readline";
deps = [ readline ];
};
}

View file

@ -1,4 +1,4 @@
{fetchurl, buildPythonPackage}:
{ fetchurl, buildPythonPackage, ssl }:
buildPythonPackage {
name = "offlineimap-6.2.0.2";
@ -8,10 +8,9 @@ buildPythonPackage {
sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c";
};
doCheck = false;
propagatedBuildInputs = [ ssl ];
preConfigure = "set -x";
buildInputs = [ ];
doCheck = false;
meta = {
description = "IMAP to local files bridge";

View file

@ -964,17 +964,8 @@ let
offlineimap = import ../tools/networking/offlineimap {
inherit fetchurl;
# I did not find any better way of reusing buildPythonPackage+setuptools
# for a python with openssl support
buildPythonPackage = assert pythonFull.opensslSupport;
import ../development/python-modules/generic {
inherit makeWrapper lib;
python = pythonFull;
setuptools = builderDefsPackage (import ../development/python-modules/setuptools) {
inherit makeWrapper;
python = pythonFull;
};
};
buildPythonPackage = buildPython27Package;
ssl = pythonModules.ssl;
};
opendbx = callPackage ../development/libraries/opendbx { };
@ -2314,6 +2305,10 @@ let
inherit (pkgs.xlibs) libX11 xproto;
});
pythonModules = callPackage ../development/interpreters/python/2.7/modules.nix {
python = python27Base;
};
python31Base = lowPrio (makeOverridable (import ../development/interpreters/python/3.1) {
inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
arch = if stdenv.isDarwin then darwinArchUtility else null;