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

python: support ncurses, replace composedArgsAndFun by makeOverridable

Browse Source 
because composedArgsAndFun didn't pass values to the builder

svn path=/nixpkgs/trunk/; revision=21686
This commit is contained in:
Marc Weber 2010-05-09 14:33:50 +00:00
parent 258d886a17
commit 3303106e97
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/interpreters/python/2.5/default.nix
View File

@ -8,6 +8,7 @@
, tcl ? null , tcl ? null
, libX11 ? null , libX11 ? null
, xproto ? null , xproto ? null
, ncurses ? null
}: }:
assert zlibSupport -> zlib != null; assert zlibSupport -> zlib != null;
@ -30,6 +31,8 @@ let
++ optional (tcl != null) tcl ++ optional (tcl != null) tcl
++ optional (libX11 != null) libX11 ++ optional (libX11 != null) libX11
++ optional (xproto != null) xproto ++ optional (xproto != null) xproto
++ optional (xproto != null) xproto
++ optional (ncurses != null) ncurses
; ;
in in

2
pkgs/development/interpreters/python/2.6/default.nix
View File

@ -10,6 +10,7 @@
, xproto ? null , xproto ? null
, arch ? null , arch ? null
, sw_vers ? null , sw_vers ? null
, ncurses ? null
}: }:
assert zlibSupport -> zlib != null; assert zlibSupport -> zlib != null;
@ -39,6 +40,7 @@ let
++ optional (xproto != null) xproto ++ optional (xproto != null) xproto
++ optional (arch != null) arch ++ optional (arch != null) arch
++ optional (sw_vers != null) sw_vers ++ optional (sw_vers != null) sw_vers
++ optional (ncurses != null) ncurses
; ;
in in

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

@ -2768,11 +2768,11 @@ let
inherit fetchurl stdenv zlib bzip2; 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; 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'. # 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;
@ -2782,15 +2782,16 @@ 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;
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; 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;
}; };
python26Full = lowPrio (python26Base.passthru.function { python26Full = lowPrio (python26Base.override {
# 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;
@ -2800,9 +2801,10 @@ 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;
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; 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;