From 70a603c4bbf664a18705fbeee1c1fb7e75a0c81c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Aug 2010 12:53:26 +0000 Subject: [PATCH] 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. svn path=/nixpkgs/trunk/; revision=23143 --- pkgs/top-level/all-packages.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e98212f86bd..e4cd4f6acb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2125,15 +2125,8 @@ let 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) {