From 3b94efffe508b8e171b1af2b69a225f74e1c9873 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Aug 2010 12:09:42 +0000 Subject: [PATCH] pkgs/development/interpreters/python/2.5: removed obsolete python version 2.5 Python 2.5 is unused in nixpkgs -- 2.6 has been the default version for quite a while. svn path=/nixpkgs/trunk/; revision=23454 --- .../interpreters/python/2.5/default.nix | 90 ------------------- .../python/2.5/nolongdouble.patch | 20 ----- .../interpreters/python/2.5/search-path.patch | 27 ------ .../interpreters/python/2.5/setup-hook.sh | 15 ---- pkgs/top-level/all-packages.nix | 22 ----- 5 files changed, 174 deletions(-) delete mode 100644 pkgs/development/interpreters/python/2.5/default.nix delete mode 100644 pkgs/development/interpreters/python/2.5/nolongdouble.patch delete mode 100644 pkgs/development/interpreters/python/2.5/search-path.patch delete mode 100644 pkgs/development/interpreters/python/2.5/setup-hook.sh diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix deleted file mode 100644 index d1cb7703b9f..00000000000 --- a/pkgs/development/interpreters/python/2.5/default.nix +++ /dev/null @@ -1,90 +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 -, ncurses ? null -}: - -assert zlibSupport -> zlib != null; -assert gdbmSupport -> gdbm != null; - -with stdenv.lib; - -let - - 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 (xproto != null) xproto - ++ optional (ncurses != null) ncurses - ; - -in - -stdenv.mkDerivation ( { - name = "python-2.5.4"; - majorVersion = "2.5"; - version = "2.5.4"; - - src = fetchurl { - url = http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tar.bz2; - sha256 = "0401g346ixng1im6gp11rgkfhx3v05qrpn5qjfx26mgy5dm8k3dw"; - }; - - 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-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/python2.5/test - ''; - - passthru = { - inherit zlibSupport; - sqliteSupport = sqlite != null; - db4Support = db4 != null; - readlineSupport = readline != null; - opensslSupport = openssl != null; - tkSupport = (tk != null) && (tcl != null); - libPrefix = "python2.5"; - }; - - meta = { - # List of supported platforms. - # - On Darwin, `python.exe' fails with "Bus Error". - platforms = stdenv.lib.platforms.allBut "i686-darwin"; - }; -} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) ) diff --git a/pkgs/development/interpreters/python/2.5/nolongdouble.patch b/pkgs/development/interpreters/python/2.5/nolongdouble.patch deleted file mode 100644 index 8fb53da3d49..00000000000 --- a/pkgs/development/interpreters/python/2.5/nolongdouble.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc Python-2.5.4/configure Python-2.5.4-new/configure -*** Python-2.5.4/configure Sat Dec 13 15:13:52 2008 ---- Python-2.5.4-new/configure Fri Jul 24 16:38:05 2009 -*************** -*** 4534,4540 **** - ;; - # is there any other compiler on Darwin besides gcc? - Darwin*) -! BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd" - if test "${enable_universalsdk}"; then - BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" - fi ---- 4534,4540 ---- - ;; - # is there any other compiler on Darwin besides gcc? - Darwin*) -! BASECFLAGS="$BASECFLAGS -no-cpp-precomp -mno-fused-madd" - if test "${enable_universalsdk}"; then - BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" - fi diff --git a/pkgs/development/interpreters/python/2.5/search-path.patch b/pkgs/development/interpreters/python/2.5/search-path.patch deleted file mode 100644 index 2e7b7526c0c..00000000000 --- a/pkgs/development/interpreters/python/2.5/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.5/setup-hook.sh b/pkgs/development/interpreters/python/2.5/setup-hook.sh deleted file mode 100644 index ffcb862a3de..00000000000 --- a/pkgs/development/interpreters/python/2.5/setup-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.5/site-packages -} - -toPythonPath() { - local paths="$1" - local result= - for i in $paths; do - p="$i/lib/python2.5/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 28a9d1ec828..0b13df521ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2076,7 +2076,6 @@ let polyml = callPackage ../development/compilers/polyml { }; python = if getConfig ["python" "full"] false then pythonFull else pythonBase; - python25 = if getConfig ["python" "full"] false then python25Full else python25Base; python26 = if getConfig ["python" "full"] false then python26Full else python26Base; python27 = if getConfig ["python" "full"] false then python27Full else python27Base; pythonBase = python26Base; @@ -2086,23 +2085,6 @@ let python24 = lowPrio (callPackage ../development/interpreters/python/2.4 { }); - python25Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.5) { - inherit fetchurl stdenv zlib bzip2 gdbm; - }); - - python25Full = lowPrio (python25Base.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; - }); - python26Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.6) { inherit fetchurl stdenv zlib bzip2 gdbm; arch = if stdenv.isDarwin then darwinArchUtility else null; @@ -3979,10 +3961,6 @@ let pythonPackages = python26Packages; - python25Packages = recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs python buildPythonPackage; - }); - python26Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; python = python26;