Author: eelco
Date: Wed Apr 6 21:57:30 2011
New Revision: 26726
URL: https://svn.nixos.org/websvn/nix/?rev=26726&sc=1
Log:
* By popular demand, restore Python 2.6.
Added:
nixpkgs/trunk/pkgs/development/interpreters/python/2.6/
- copied from r26725,
nixpkgs/trunk/pkgs/development/interpreters/python/2.7/
Modified:
nixpkgs/trunk/pkgs/development/interpreters/python/2.6/default.nix
nixpkgs/trunk/pkgs/development/interpreters/python/2.6/setup-hook.sh
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/interpreters/python/2.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix Wed Apr
6 16:20:07 2011 (r26725)
+++ nixpkgs/trunk/pkgs/development/interpreters/python/2.6/default.nix Wed Apr
6 21:57:30 2011 (r26726)
@@ -11,12 +11,12 @@
let
- majorVersion = "2.7";
- version = "${majorVersion}.1";
+ majorVersion = "2.6";
+ version = "${majorVersion}.6";
src = fetchurl {
url =
"http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";;
- sha256 = "14i2c7yqa7ljmx2i2bb827n61q33zn23ax96czi8rbkyyny8gqw0";
+ md5 = "cf4e6881bb84a7ce6089e4a307f71f14";
};
patches =
@@ -55,12 +55,6 @@
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
- '' + optionalString stdenv.isCygwin ''
- # On Cygwin, `make install' tries to read this Makefile.
- mkdir -p $out/lib/python2.7/config
- touch $out/lib/python2.7/config/Makefile
- mkdir -p $out/include/python2.7
- touch $out/include/python2.7/pyconfig.h
'';
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
Modified: nixpkgs/trunk/pkgs/development/interpreters/python/2.6/setup-hook.sh
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/python/2.7/setup-hook.sh
Wed Apr 6 16:20:07 2011 (r26725)
+++ nixpkgs/trunk/pkgs/development/interpreters/python/2.6/setup-hook.sh
Wed Apr 6 21:57:30 2011 (r26726)
@@ -1,12 +1,12 @@
addPythonPath() {
- addToSearchPathWithCustomDelimiter : PYTHONPATH
$1/lib/python2.7/site-packages
+ addToSearchPathWithCustomDelimiter : PYTHONPATH
$1/lib/python2.6/site-packages
}
toPythonPath() {
local paths="$1"
local result=
for i in $paths; do
- p="$i/lib/python2.7/site-packages"
+ p="$i/lib/python2.6/site-packages"
result="${result}${result:+:}$p"
done
echo $result
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Apr 6 16:20:07
2011 (r26725)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Apr 6 21:57:30
2011 (r26726)
@@ -2371,6 +2371,8 @@
python = python27;
+ python26 = callPackage ../development/interpreters/python/2.6 { };
+
python27 = callPackage ../development/interpreters/python/2.7 { };
python3 = callPackage ../development/interpreters/python/3.1 {
@@ -4418,6 +4420,11 @@
pythonPackages = python27Packages;
+ python26Packages = recurseIntoAttrs (import ./python-packages.nix {
+ inherit pkgs;
+ python = python26;
+ });
+
python27Packages = recurseIntoAttrs (import ./python-packages.nix {
inherit pkgs;
python = python27;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
