* Remove Python 2.6, since the only remaining package that used it
(Calibre) also works with 2.7. svn path=/nixpkgs/branches/modular-python/; revision=26561
This commit is contained in:
Eelco Dolstra
parent
8ca5d5d8b6
commit
d449c4db98
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
|
||||
, imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil
|
||||
, pil, cssutils, beautifulsoap, makeWrapper, unrar, chmlib
|
||||
, imagemagick, libjpeg, fontconfig, podofo, qt4
|
||||
, pil, makeWrapper, unrar, chmlib, pythonPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg
|
||||
fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper
|
||||
cssutils beautifulsoap chmlib
|
||||
fontconfig podofo qt4 pil makeWrapper chmlib
|
||||
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
|
||||
pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,97 +0,0 @@
|
||||
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
|
||||
, gdbmSupport ? true, gdbm ? null
|
||||
, sqlite ? null
|
||||
, db4 ? null
|
||||
, readline ? null
|
||||
, openssl ? null
|
||||
, tk ? null
|
||||
, tcl ? null
|
||||
, libX11 ? null
|
||||
, xproto ? null
|
||||
, arch ? null
|
||||
, sw_vers ? null
|
||||
, ncurses ? null
|
||||
}:
|
||||
|
||||
assert zlibSupport -> zlib != null;
|
||||
assert gdbmSupport -> gdbm != null;
|
||||
assert stdenv.isDarwin -> arch != null;
|
||||
assert stdenv.isDarwin -> sw_vers != null;
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
majorVersion = "2.6";
|
||||
version = "${majorVersion}.5";
|
||||
|
||||
buildInputs =
|
||||
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
|
||||
[bzip2]
|
||||
++ optional zlibSupport zlib
|
||||
++ optional gdbmSupport gdbm
|
||||
++ optional (sqlite != null) sqlite
|
||||
++ optional (db4 != null) db4
|
||||
++ optional (readline != null) readline
|
||||
++ optional (openssl != null) openssl
|
||||
++ optional (tk != null) tk
|
||||
++ optional (tcl != null) tcl
|
||||
++ optional (libX11 != null) libX11
|
||||
++ optional (xproto != null) xproto
|
||||
++ optional (arch != null) arch
|
||||
++ optional (sw_vers != null) sw_vers
|
||||
++ optional (ncurses != null) ncurses
|
||||
;
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation ( {
|
||||
name = "python-${version}";
|
||||
inherit majorVersion version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
|
||||
sha256 = "62da62eb685621ede2be1275f11b89fa0e0be578db8daa5320d0a7855c0a9ebc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
|
||||
./search-path.patch
|
||||
];
|
||||
|
||||
inherit buildInputs;
|
||||
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
|
||||
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
|
||||
configureFlags = "--enable-shared --with-threads --enable-unicode --with-wctype-functions";
|
||||
|
||||
preConfigure = ''
|
||||
# Purity.
|
||||
for i in /usr /sw /opt /pkg; do
|
||||
substituteInPlace ./setup.py --replace $i /no-such-path
|
||||
done
|
||||
'' + (if readline != null then ''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"
|
||||
'' else "");
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
postInstall = ''
|
||||
rm -rf "$out/lib/python${majorVersion}/test"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit zlibSupport;
|
||||
sqliteSupport = sqlite != null;
|
||||
db4Support = db4 != null;
|
||||
readlineSupport = readline != null;
|
||||
opensslSupport = openssl != null;
|
||||
tkSupport = (tk != null) && (tcl != null);
|
||||
libPrefix = "python${majorVersion}";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) )
|
||||
@ -1,27 +0,0 @@
|
||||
diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py
|
||||
*** Python-2.4.4-orig/setup.py 2006-10-08 19:41:25.000000000 +0200
|
||||
--- Python-2.4.4/setup.py 2007-05-27 16:04:54.000000000 +0200
|
||||
***************
|
||||
*** 279,288 ****
|
||||
# Check for AtheOS which has libraries in non-standard locations
|
||||
if platform == 'atheos':
|
||||
lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
|
||||
- lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
|
||||
inc_dirs += ['/system/include', '/atheos/autolnk/include']
|
||||
- inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
|
||||
|
||||
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
|
||||
if platform in ['osf1', 'unixware7', 'openunix8']:
|
||||
lib_dirs += ['/usr/ccs/lib']
|
||||
--- 279,289 ----
|
||||
# Check for AtheOS which has libraries in non-standard locations
|
||||
if platform == 'atheos':
|
||||
lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
|
||||
inc_dirs += ['/system/include', '/atheos/autolnk/include']
|
||||
|
||||
+ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
|
||||
+ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
|
||||
+
|
||||
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
|
||||
if platform in ['osf1', 'unixware7', 'openunix8']:
|
||||
lib_dirs += ['/usr/ccs/lib']
|
||||
@ -1,15 +0,0 @@
|
||||
addPythonPath() {
|
||||
addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.6/site-packages
|
||||
}
|
||||
|
||||
toPythonPath() {
|
||||
local paths="$1"
|
||||
local result=
|
||||
for i in $paths; do
|
||||
p="$i/lib/python2.6/site-packages"
|
||||
result="${result}${result:+:}$p"
|
||||
done
|
||||
echo $result
|
||||
}
|
||||
|
||||
envHooks=(${envHooks[@]} addPythonPath)
|
||||
@ -2266,30 +2266,6 @@ let
|
||||
|
||||
python = python27;
|
||||
|
||||
python26 = if getConfig ["python" "full"] false then python26Full else python26Base;
|
||||
pythonFull = python26Full;
|
||||
|
||||
pythonWrapper = callPackage ../development/interpreters/python/wrapper.nix { };
|
||||
|
||||
python26Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.6) {
|
||||
inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
|
||||
arch = if stdenv.isDarwin then darwinArchUtility else null;
|
||||
sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
|
||||
});
|
||||
|
||||
python26Full = lowPrio (python26Base.override {
|
||||
# FIXME: We lack ncurses support, needed, e.g., for `gpsd'.
|
||||
db4 = if getConfig ["python" "db4Support"] true then db4 else null;
|
||||
sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null;
|
||||
readline = if getConfig ["python" "readlineSupport"] true then readline else null;
|
||||
openssl = if getConfig ["python" "opensslSupport"] true then openssl else null;
|
||||
tk = if getConfig ["python" "tkSupport"] true then tk else null;
|
||||
tcl = if getConfig ["python" "tkSupport"] true then tcl else null;
|
||||
libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null;
|
||||
xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null;
|
||||
ncurses = if getConfig ["python" "curses"] true then ncurses else null;
|
||||
});
|
||||
|
||||
python27 = callPackage ../development/interpreters/python/2.7 { };
|
||||
|
||||
python3 = callPackage ../development/interpreters/python/3.1 {
|
||||
@ -2297,6 +2273,8 @@ let
|
||||
sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
|
||||
};
|
||||
|
||||
pythonWrapper = callPackage ../development/interpreters/python/wrapper.nix { };
|
||||
|
||||
pyrex = pyrex095;
|
||||
|
||||
pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { };
|
||||
@ -4297,12 +4275,6 @@ let
|
||||
|
||||
buildPythonPackage = buildPython27Package;
|
||||
|
||||
buildPython26Package = import ../development/python-modules/generic {
|
||||
inherit makeWrapper lib;
|
||||
python = python26;
|
||||
setuptools = setuptools.override { python = python26; };
|
||||
};
|
||||
|
||||
buildPython27Package = import ../development/python-modules/generic {
|
||||
inherit makeWrapper lib;
|
||||
python = python27;
|
||||
@ -4311,12 +4283,6 @@ let
|
||||
|
||||
pythonPackages = python27Packages;
|
||||
|
||||
python26Packages = recurseIntoAttrs (import ./python-packages.nix {
|
||||
inherit pkgs;
|
||||
python = python26;
|
||||
buildPythonPackage = buildPython26Package;
|
||||
});
|
||||
|
||||
python27Packages = recurseIntoAttrs (import ./python-packages.nix {
|
||||
inherit pkgs;
|
||||
python = python27;
|
||||
@ -5620,10 +5586,7 @@ let
|
||||
|
||||
bvi = callPackage ../applications/editors/bvi { };
|
||||
|
||||
calibre = callPackage ../applications/misc/calibre {
|
||||
python = python26Full;
|
||||
inherit (python26Packages) mechanize lxml dateutil cssutils beautifulsoap;
|
||||
};
|
||||
calibre = callPackage ../applications/misc/calibre { };
|
||||
|
||||
carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
|
||||
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
|
||||
|
||||
Loading…
Reference in New Issue
Block a user