From a745097710fe82aaf95144da62229717541e71fe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Apr 2010 13:09:02 +0000
Subject: [PATCH] * Give Python 3.1 a lower priority so that it isn't installed
 by   default when you do "nix-env -i python" and to allow it to be  
 installed in the same profile as Python 2.x. * Disambiguate between the
 variants of Python 2.x.

svn path=/nixpkgs/trunk/; revision=21237
---
 pkgs/top-level/all-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0945d3f80644..607e59f1a5ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2678,7 +2678,7 @@ let
     inherit fetchurl stdenv zlib bzip2 gdbm;
   };
 
-  python25Full = python25Base.passthru.function {
+  python25Full = lowPrio (python25Base.passthru.function {
     # 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;
@@ -2688,7 +2688,7 @@ let
     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;
-  };
+  });
 
   python26Base = composedArgsAndFun (import ../development/interpreters/python/2.6) {
     inherit fetchurl stdenv zlib bzip2 gdbm;
@@ -2696,7 +2696,7 @@ let
     sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
   };
 
-  python26Full = python26Base.passthru.function {
+  python26Full = lowPrio (python26Base.passthru.function {
     # 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;
@@ -2706,13 +2706,13 @@ let
     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;
-  };
+  });
 
-  python31Base = composedArgsAndFun (import ../development/interpreters/python/3.1) {
+  python31Base = lowPrio (composedArgsAndFun (import ../development/interpreters/python/3.1) {
     inherit fetchurl stdenv zlib bzip2 gdbm;
     arch = if stdenv.isDarwin then darwinArchUtility else null;
     sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
-  };
+  });
   
   pyrex = pyrex095;