python: support ncurses, replace composedArgsAndFun by makeOverridable

because composedArgsAndFun didn't pass values to the builder

svn path=/nixpkgs/trunk/; revision=21686

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

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