Author: simons
Date: Thu Aug 12 12:53:26 2010
New Revision: 23143
URL: https://svn.nixos.org/websvn/nix/?rev=23143&sc=1
Log:
pkgs/top-level/all-packages.nix: dropped getConfig support for Python 2.7
Python 2.7 can no longer be configured using the obsolete "getConfig"
mechanism. Instead, use "override" to fine-tune the installation.
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 12 11:54:55
2010 (r23142)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 12 12:53:26
2010 (r23143)
@@ -2125,15 +2125,8 @@
python27Full = python27Base.override {
# 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;
- readline = if getConfig ["python" "readlineSupport"] true then readline
else null;
- openssl = if getConfig ["python" "opensslSupport"] true then openssl else
null;
- tk = if getConfig ["python" "tkSupport"] true then tk else null;
- 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;
- ncurses = if getConfig ["python" "curses"] true then ncurses else null;
+ inherit db4 sqlite readline openssl tcl tk ncurses;
+ inherit (xlibs) libX11 xproto;
};
python31Base = lowPrio (makeOverridable (import
../development/interpreters/python/3.1) {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
