diff options
-rw-r--r-- | pkgs/development/interpreters/python/2.5/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/2.6/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
3 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix index 97a307be1223..33aa66d765d2 100644 --- a/pkgs/development/interpreters/python/2.5/default.nix +++ b/pkgs/development/interpreters/python/2.5/default.nix @@ -8,6 +8,7 @@ , tcl ? null , libX11 ? null , xproto ? null +, ncurses ? null }: assert zlibSupport -> zlib != null; @@ -30,6 +31,8 @@ let ++ optional (tcl != null) tcl ++ optional (libX11 != null) libX11 ++ optional (xproto != null) xproto + ++ optional (xproto != null) xproto + ++ optional (ncurses != null) ncurses ; in diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 88e9c32a808f..8865738b0d75 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -10,6 +10,7 @@ , xproto ? null , arch ? null , sw_vers ? null +, ncurses ? null }: assert zlibSupport -> zlib != null; @@ -39,6 +40,7 @@ let ++ optional (xproto != null) xproto ++ optional (arch != null) arch ++ optional (sw_vers != null) sw_vers + ++ optional (ncurses != null) ncurses ; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e94adea7bfa6..1cba0fc33fe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2768,11 +2768,11 @@ let inherit fetchurl stdenv zlib bzip2; }; - python25Base = composedArgsAndFun (import ../development/interpreters/python/2.5) { + python25Base = makeOverridable (import ../development/interpreters/python/2.5) { inherit fetchurl stdenv zlib bzip2 gdbm; }; - python25Full = lowPrio (python25Base.passthru.function { + python25Full = lowPrio (python25Base.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; @@ -2782,15 +2782,16 @@ 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; + ncurses = if getConfig ["python" "curses"] true then ncurses else null; }); - python26Base = composedArgsAndFun (import ../development/interpreters/python/2.6) { + python26Base = makeOverridable (import ../development/interpreters/python/2.6) { inherit fetchurl stdenv zlib bzip2 gdbm; arch = if stdenv.isDarwin then darwinArchUtility else null; sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null; }; - python26Full = lowPrio (python26Base.passthru.function { + python26Full = lowPrio (python26Base.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; @@ -2800,9 +2801,10 @@ 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; + ncurses = if getConfig ["python" "curses"] true then ncurses else null; }); - python31Base = lowPrio (composedArgsAndFun (import ../development/interpreters/python/3.1) { + python31Base = lowPrio (makeOverridable (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; |