Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.

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

11 files changed, 47 insertions, 21 deletions

diff --git a/pkgs/development/compilers/qi/9.1.nix b/pkgs/development/compilers/qi/9.1.nix
index 4bfca07d20f0..73aaabf9227d 100644
--- a/pkgs/development/compilers/qi/9.1.nix
+++ b/pkgs/development/compilers/qi/9.1.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = http://www.lambdassociates.org/Download/Qi9.1.zip;
@@ -7,7 +7,7 @@ args : with args;
 		};
 		buildInputs = [ unzip clisp];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 let 
 	shell=stdenv.shell;
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index d494b5a15394..0b57d690e01f 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -2,7 +2,7 @@ args: with args;
 
 let
 
-  localDefs = builderDefs {
+  localDefs = builderDefs.meta.function {
 
     src = fetchurl {
       url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.5.1.1.tar.gz;
@@ -11,7 +11,7 @@ let
 
     buildInputs = [python];
 
-  } null; /* null is a terminator for sumArgs */
+  }; 
 
 in with localDefs;
         
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
index 02c1d532abb3..7125a2aff20e 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -2,7 +2,7 @@ args: with args;
 
 let
 
-  localDefs = builderDefs {
+  localDefs = builderDefs.meta.function {
 
     src = fetchurl {
       url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.4.tar.gz;
@@ -11,7 +11,7 @@ let
 
     buildInputs = [python];
 
-  } null; /* null is a terminator for sumArgs */
+  };
 
 in with localDefs;
         
diff --git a/pkgs/development/libraries/cl-ppcre/default.nix b/pkgs/development/libraries/cl-ppcre/default.nix
new file mode 100644
index 000000000000..172b654d4e07
--- /dev/null
+++ b/pkgs/development/libraries/cl-ppcre/default.nix
@@ -0,0 +1,26 @@
+args :  
+let 
+  lib = args.lib;
+  fetchurl = args.fetchurl;
+  simplyShare = args.simplyShare;
+
+  version = lib.getAttr ["version"] "2.0.0" args; 
+  buildInputs = with args; [ ];
+in
+rec {
+  src = fetchurl {
+    url = http://weitz.de/files/cl-ppcre.tar.gz;
+    sha256 = "14zxrmc4b4q9kg505y9lb0nqp80fpmpwn51xwkqiwkm361n6h23p";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be specified separately */
+  phaseNames = [(simplyShare "cl-ppcre")];
+      
+  name = "cl-ppcre-" + version;
+  meta = {
+    description = "Common Lisp Portable Perl Compatible RegExp library";
+  };
+}
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 5c5c7d933104..ec8cff5f32d7 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs { 
+	let localDefs = builderDefs.meta.function { 
 		src = 
 			fetchurl {
 				url = ftp://ftp.fftw.org/pub/fftw/fftw-3.1.2.tar.gz;
@@ -7,7 +7,7 @@ args : with args;
 			};
 		buildInputs = [];
 		configureFlags = ["--enable-float --enable-shared"];
-	} null;
+	};
 	in with localDefs;
 stdenv.mkDerivation {
 	name = "fftw-3.1.2";
diff --git a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
index ec386a92e534..2dd008c73488 100644
--- a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
+++ b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 			fetchurl {
 				url = mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.2-1.tar.gz;
@@ -26,7 +26,7 @@ args : with args;
 			" --with-sqlite-libdir=${args.sqlite}/lib/sqlite " 
 		] else [])
 		;
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "libdbi"+version;
diff --git a/pkgs/development/libraries/libdbi/0.8.2.nix b/pkgs/development/libraries/libdbi/0.8.2.nix
index f605fe70a49d..06c764386049 100644
--- a/pkgs/development/libraries/libdbi/0.8.2.nix
+++ b/pkgs/development/libraries/libdbi/0.8.2.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 			fetchurl {
 				url = mirror://sourceforge/libdbi/libdbi-0.8.2.tar.gz;
@@ -8,7 +8,7 @@ args : with args;
 
 		buildInputs = [];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "libdbi"+version;
diff --git a/pkgs/development/libraries/libextractor/0.5.18.nix b/pkgs/development/libraries/libextractor/0.5.18.nix
index 0ee405e5822d..5d854115b041 100644
--- a/pkgs/development/libraries/libextractor/0.5.18.nix
+++ b/pkgs/development/libraries/libextractor/0.5.18.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = http://gnunet.org/libextractor/download/libextractor-0.5.18.tar.gz;
@@ -8,7 +8,7 @@ args : with args;
 
 		buildInputs = [ zlib];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "libextractor"+version;
diff --git a/pkgs/development/tools/misc/indent/2.2.9.nix b/pkgs/development/tools/misc/indent/2.2.9.nix
index a31c940dcb78..6dc28ea0c30d 100644
--- a/pkgs/development/tools/misc/indent/2.2.9.nix
+++ b/pkgs/development/tools/misc/indent/2.2.9.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = ftp://ftp.gnu.org/gnu/indent/indent-2.2.9.tar.gz;
@@ -8,7 +8,7 @@ args : with args;
 
 		buildInputs = [];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 let 
 	preBuild = FullDepEntry ("
diff --git a/pkgs/development/tools/misc/intltool/0.36.2.nix b/pkgs/development/tools/misc/intltool/0.36.2.nix
index 0ed8bfd74be5..14e62bbc7d7d 100644
--- a/pkgs/development/tools/misc/intltool/0.36.2.nix
+++ b/pkgs/development/tools/misc/intltool/0.36.2.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.bz2;
@@ -8,7 +8,7 @@ args : with args;
 
 		propagatedBuildInputs = [perl perlXMLParser];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "intltool-0.36.2";
diff --git a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix
index 3385f8975718..2c9349bf6a3c 100644
--- a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix
+++ b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix
@@ -1,7 +1,7 @@
 args : with args;	let 
         patch = ./ltrace_0.5-3.diff.gz;
-	localDefs = with (builderDefs {src="";} null);
-	 builderDefs {
+	localDefs = with builderDefs;
+	 builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.orig.tar.gz;
@@ -17,7 +17,7 @@ args : with args;	let
 		  gunzip < ${patch} | patch -Np1
 		  sed -e s@-Werror@@ -i Makefile.in
 		'')["minInit" "doUnpack"];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 let
 	preConfigure = FullDepEntry ("