pkgs/top-level/all-packages.nix: switch to Python 2.6 (except on Darwin)

MacOS X can build Python 2.6 just fine, but for some reason a lot of modules
don't work, so the resulting binary isn't very useful.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19598
This commit is contained in:
Peter Simons 2010-01-21 15:39:11 +00:00
parent a2a51f2ae3
commit 8b4f33ac76

View File

@ -2516,8 +2516,8 @@ let
python = if getConfig ["python" "full"] false then pythonFull else pythonBase; python = if getConfig ["python" "full"] false then pythonFull else pythonBase;
python25 = if getConfig ["python" "full"] false then python25Full else python25Base; python25 = if getConfig ["python" "full"] false then python25Full else python25Base;
python26 = if getConfig ["python" "full"] false then python26Full else python26Base; python26 = if getConfig ["python" "full"] false then python26Full else python26Base;
pythonBase = python25Base; pythonBase = if stdenv.isDarwin then python25Base else python26Base;
pythonFull = python25Full; pythonFull = if stdenv.isDarwin then python25Full else python26Full;
python24 = import ../development/interpreters/python/2.4 { python24 = import ../development/interpreters/python/2.4 {
inherit fetchurl stdenv zlib bzip2; inherit fetchurl stdenv zlib bzip2;