public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Make Python 2.7 the default Python.

Browse Source 
svn path=/nixpkgs/branches/modular-python/; revision=25394
This commit is contained in:
Eelco Dolstra 2011-01-04 16:30:54 +00:00
parent dc1ac3c5d9
commit e4bfdb2da9
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2265,7 +2265,8 @@ let
polyml = callPackage ../development/compilers/polyml { }; polyml = callPackage ../development/compilers/polyml { };
python = if getConfig ["python" "full"] false then pythonFull else pythonBase; python = python27;
python26 = if getConfig ["python" "full"] false then python26Full else python26Base; python26 = if getConfig ["python" "full"] false then python26Full else python26Base;
pythonBase = python26Base; pythonBase = python26Base;
pythonFull = python26Full; pythonFull = python26Full;
@ -4484,17 +4485,11 @@ let
inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa libxslt expat libdrm libpng zlib perl mesa
xkeyboard_config dbus hal libuuid openssl gperf m4 xkeyboard_config dbus hal libuuid openssl gperf m4
autoconf libtool xmlto asciidoc udev; autoconf libtool xmlto asciidoc udev python;
# XXX: Update to newer Automake on the next big rebuild; better yet: # XXX: Update to newer Automake on the next big rebuild; better yet:
# remove the dependency on Automake. # remove the dependency on Automake.
automake = automake110x; automake = automake110x;
# !!! pythonBase is used instead of python because this causes an
# infinite recursion when the flag python.full is set to true.
# Packages contained in the loop are python, tk, xlibs-wrapper,
# libX11, libxcd (and xcb-proto).
python = pythonBase;
}); });
xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };