ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-24 06:08:16 +03:00
Code Issues Projects Releases Wiki Activity

* Give Python 3.1 a lower priority so that it isn't installed by

Browse Source 
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
This commit is contained in:
Eelco Dolstra 2010-04-22 13:09:02 +00:00
parent 5acee5db82
commit a745097710
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/top-level/all-packages.nix
View File

@ -2678,7 +2678,7 @@ let
inherit fetchurl stdenv zlib bzip2 gdbm; 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'. # FIXME: We lack ncurses support, needed, e.g., for `gpsd'.
db4 = if getConfig ["python" "db4Support"] true then db4 else null; db4 = if getConfig ["python" "db4Support"] true then db4 else null;
sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite 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; tcl = if getConfig ["python" "tkSupport"] true then tcl else null;
libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null; libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null;
xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null; xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null;
}; });
python26Base = composedArgsAndFun (import ../development/interpreters/python/2.6) { python26Base = composedArgsAndFun (import ../development/interpreters/python/2.6) {
inherit fetchurl stdenv zlib bzip2 gdbm; inherit fetchurl stdenv zlib bzip2 gdbm;
@ -2696,7 +2696,7 @@ let
sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null; 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'. # FIXME: We lack ncurses support, needed, e.g., for `gpsd'.
db4 = if getConfig ["python" "db4Support"] true then db4 else null; db4 = if getConfig ["python" "db4Support"] true then db4 else null;
sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite 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; tcl = if getConfig ["python" "tkSupport"] true then tcl else null;
libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null; libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null;
xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto 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; inherit fetchurl stdenv zlib bzip2 gdbm;
arch = if stdenv.isDarwin then darwinArchUtility else null; arch = if stdenv.isDarwin then darwinArchUtility else null;
sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null; sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
}; });
pyrex = pyrex095; pyrex = pyrex095;