From a8334929f10bdebf1f65fed28a866ef5dc6791c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Mar 2011 09:56:19 +0000
Subject: [PATCH] * Delete Python 2.4. It was only used by "zope", which
doesn't even build.
svn path=/nixpkgs/branches/modular-python/; revision=26350
---
.../interpreters/python/2.4/default.nix | 54 -------------------
.../interpreters/python/2.4/search-path.patch | 27 ----------
.../interpreters/python/2.4/setup-hook.sh | 15 ------
pkgs/top-level/all-packages.nix | 4 +-
4 files changed, 2 insertions(+), 98 deletions(-)
delete mode 100644 pkgs/development/interpreters/python/2.4/default.nix
delete mode 100644 pkgs/development/interpreters/python/2.4/search-path.patch
delete mode 100644 pkgs/development/interpreters/python/2.4/setup-hook.sh
diff --git a/pkgs/development/interpreters/python/2.4/default.nix b/pkgs/development/interpreters/python/2.4/default.nix
deleted file mode 100644
index f9673cc68d9..00000000000
--- a/pkgs/development/interpreters/python/2.4/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2}:
-
-assert zlibSupport -> zlib != null;
-
-with stdenv.lib;
-
-let
-
- buildInputs =
- optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
- [bzip2] ++
- optional zlibSupport zlib;
-
-in
-
-stdenv.mkDerivation {
- name = "python-2.4.6";
- majorVersion = "2.4";
- version = "2.4.6";
-
- src = fetchurl {
- url = http://www.python.org/ftp/python/2.4.6/Python-2.4.6.tar.bz2;
- sha256 = "021y88a4ki07dgq19yhg6zfvmncfiz7h5b2255438i9zmlwl246s";
- };
-
- 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";
-
- preConfigure = ''
- # Purity.
- for i in /usr /sw /opt /pkg; do
- substituteInPlace ./setup.py --replace $i /no-such-path
- done
- '';
-
- setupHook = ./setup-hook.sh;
-
- postInstall = ''
- rm -rf $out/lib/python2.4/test
- '';
-
- passthru = {
- inherit zlibSupport;
- libPrefix = "python2.4";
- };
-}
diff --git a/pkgs/development/interpreters/python/2.4/search-path.patch b/pkgs/development/interpreters/python/2.4/search-path.patch
deleted file mode 100644
index 2e7b7526c0c..00000000000
--- a/pkgs/development/interpreters/python/2.4/search-path.patch
+++ /dev/null
@@ -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']
diff --git a/pkgs/development/interpreters/python/2.4/setup-hook.sh b/pkgs/development/interpreters/python/2.4/setup-hook.sh
deleted file mode 100644
index 8334fbc21a8..00000000000
--- a/pkgs/development/interpreters/python/2.4/setup-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-addPythonPath() {
- addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.4/site-packages
-}
-
-toPythonPath() {
- local paths="$1"
- local result=
- for i in $paths; do
- p="$i/lib/python2.4/site-packages"
- result="${result}${result:+:}$p"
- done
- echo $result
-}
-
-envHooks=(${envHooks[@]} addPythonPath)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8c9ca934f3..74e1bfcb727 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2274,8 +2274,6 @@ let
pythonWrapper = callPackage ../development/interpreters/python/wrapper.nix { };
- python24 = callPackage ../development/interpreters/python/2.4 { };
-
python26Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.6) {
inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
arch = if stdenv.isDarwin then darwinArchUtility else null;
@@ -4390,9 +4388,11 @@ let
ZopeInterface = pythonPackages.zopeInterface;
+ /*
zope = callPackage ../development/python-modules/zope {
python = python24;
};
+ */
### SERVERS