* ltrace: updated to 0.5.3.

* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
  SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.

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

11 files changed, 127 insertions, 162 deletions

diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index b8587ed223f26..bc84631283534 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -1,27 +1,23 @@
-args : with args; with builderDefs;
-  let localDefs = builderDefs.passthru.function (rec {
-    src = /* put a fetchurl here */
-    fetchurl {
-      url = mirror://sourceforge/libvncserver/x11vnc-0.9.3.tar.gz;
-      sha256 = "0sfzkbqd2d94w51czci9w5j5z67amcl1gphgg6x77dyr2h46kc0a";
-    };
+{ stdenv, fetchurl, openssl, zlib, libjpeg, xorg }:
 
-    buildInputs = [libXfixes fixesproto openssl libXdamage damageproto
-      zlib libX11 xproto libjpeg libXtst libXinerama xineramaproto
-      libXrandr randrproto libXext xextproto inputproto recordproto libXi
-      libXrender renderproto];
-    configureFlags = [];
-  });
-  in with localDefs;
 stdenv.mkDerivation rec {
-  name = "x11vnc-0.9.3";
-  builder = writeScript (name + "-builder")
-    (textClosure localDefs 
-      [doConfigure doMakeInstall doForceShare doPropagate]);
+  name = "x11vnc-0.9.10";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libvncserver/${name}.tar.gz";
+    sha256 = "04g0da04g4iw0qwvn43a8vh2im4wx9rwl1w41acsbdi8b0amhlck";
+  };
+
+  buildInputs =
+    [ xorg.libXfixes xorg.fixesproto openssl xorg.libXdamage
+      xorg.damageproto zlib xorg.libX11 xorg.xproto libjpeg
+      xorg.libXtst xorg.libXinerama xorg.xineramaproto xorg.libXrandr
+      xorg.randrproto xorg.libXext xorg.xextproto xorg.inputproto
+      xorg.recordproto xorg.libXi xorg.libXrender xorg.renderproto
+    ];
+
   meta = {
     description = "A VNC server connected to a real X11 screen";
-    homepage = "http://www.karlrunge.com/x11vnc/";
-    inherit src;
+    homepage = http://www.karlrunge.com/x11vnc/;
   };
 }
-
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix
index c65105e479608..a3d21ab1800e9 100644
--- a/pkgs/tools/X11/x2vnc/default.nix
+++ b/pkgs/tools/X11/x2vnc/default.nix
@@ -1,26 +1,22 @@
+{ stdenv, fetchurl, xorg }:
 
-args : with args; with builderDefs.passthru.function {src="";};
-	let localDefs = builderDefs.passthru.function ((rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz;
-			sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
-		};
-
-		buildInputs = [libX11 xproto xextproto libXext libXrandr randrproto];
-		doCreatePrefix = fullDepEntry (''
-			ensureDir $out
-		'') ["defEnsureDir"];
-		configureFlags = [];
-	}) // args); /* null is a terminator for sumArgs */
-	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "x2vnc-1.7.2";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doConfigure doCreatePrefix doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "A program to control a remote VNC server";
-		inherit src;
-	};
+  name = "x2vnc-1.7.2";
+
+  src = fetchurl {
+    url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz;
+    sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
+  };
+
+  buildInputs =
+    [ xorg.libX11 xorg.xproto xorg.xextproto xorg.libXext
+      xorg.libXrandr xorg.randrproto
+    ];
+
+  preInstall = "ensureDir $out";
+
+  meta = {
+    homepahe = http://fredrik.hubbe.net/x2vnc.html;
+    description = "A program to control a remote VNC server";
+  };
 }
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 43691c2271434..7ef741753ba3e 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,4 +1,4 @@
-args : with args; with builderDefs;
+{builderDefs}: with builderDefs;
        let localDefs = builderDefs.passthru.function (rec {
          src = /* put a fetchurl here */
            fetchurl {
diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/pkgs/tools/filesystems/fusesmb/default.nix
new file mode 100644
index 0000000000000..4bc9348adbf63
--- /dev/null
+++ b/pkgs/tools/filesystems/fusesmb/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, samba, fuse }:
+
+stdenv.mkDerivation rec {
+  name = "fusesmb-0.8.7";
+
+  src = fetchurl {
+    url = "http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/${name}.tar.gz";
+    sha256 = "12gz2gn9iqjg27a233dn2wij7snm7q56h97k6gks0yijf6xcnpz1";
+  };
+
+  buildInputs = [ samba fuse ];
+
+  postInstall =
+    ''
+      ensureDir $out/lib
+      ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0
+    '';
+
+  meta = {
+    description = "Samba mounted via FUSE";
+    homepage = http://www.ricardis.tudelft.nl/~vincent/fusesmb/;
+  };
+}
diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix
index 178aa700fa5ea..2eb8e3a0b3ba3 100644
--- a/pkgs/tools/filesystems/relfs/default.nix
+++ b/pkgs/tools/filesystems/relfs/default.nix
@@ -1,8 +1,8 @@
+{ stdenv, fetchcvs, builderDefs, ocaml, fuse, postgresql, pcre
+, libuuid, gnomevfs, pkgconfig, GConf }:
 
-args : with args;
 	let localDefs = builderDefs.passthru.function {
-	src = /* put a fetchurl here */
-	if args ? src then args.src else fetchcvs {
+	src = fetchcvs {
 		cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
 		module = "relfs";
 		date = "2008-03-05";
@@ -40,7 +40,7 @@ args : with args;
 	};
 	in with localDefs;
 
-assert args.libuuid != null;
+assert libuuid != null;
         
 stdenv.mkDerivation rec {
 	name = "relfs-2008.03.05";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 	meta = {
 		description = "A relational filesystem on top of FUSE";
 		inherit src;
-    		maintainers = [args.stdenv.lib.maintainers.raskin];
-		platforms = args.stdenv.lib.platforms.linux;
+    		maintainers = [stdenv.lib.maintainers.raskin];
+		platforms = stdenv.lib.platforms.linux;
 	};
 }
diff --git a/pkgs/tools/filesystems/smbfs-fuse/default.nix b/pkgs/tools/filesystems/smbfs-fuse/default.nix
deleted file mode 100644
index 4b656b70388b1..0000000000000
--- a/pkgs/tools/filesystems/smbfs-fuse/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-0.8.7.tar.gz;
-			sha256 = "12gz2gn9iqjg27a233dn2wij7snm7q56h97k6gks0yijf6xcnpz1";
-		};
-
-		buildInputs = [samba fuse];
-		configureFlags = [];
-		postInstall = fullDepEntry 
-		(''
-		ensureDir $out/lib
-		ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0
-		'')
-		[ "minInit" "defEnsureDir" "doMakeInstall"];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "smbfs-fuse-0.8.7";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doConfigure doMakeInstall postInstall doForceShare doPropagate]);
-  meta = {
-   description = "Samba mounted via FUSE";
-   inherit src;
-  };
-}
diff --git a/pkgs/tools/misc/eProver/default.nix b/pkgs/tools/misc/eProver/default.nix
index 30353e122c12a..ff92b235e0917 100644
--- a/pkgs/tools/misc/eProver/default.nix
+++ b/pkgs/tools/misc/eProver/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, which, texLive }:
 
 stdenv.mkDerivation {
   name = "EProver-0.999";
diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix
index 1b9bbb995acd3..7402209960d58 100644
--- a/pkgs/tools/misc/rlwrap/default.nix
+++ b/pkgs/tools/misc/rlwrap/default.nix
@@ -1,22 +1,17 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = ftp://ftp.chg.ru/mirrors/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/rlwrap-0.28.tar.gz;
-			sha256 = "07jzhcqzb8jsmsscc28dk4md7swnhn3vyai5fpxwdj6a1kbn4y3p";
-		};
+{ stdenv, fetchurl, readline }:
 
-		buildInputs = [readline ];
-		configureFlags = [];
-	};
-	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "rlwrap-0.28";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "Readline wrapper for console programs";
-		inherit src;
-	};
+  name = "rlwrap-0.37";
+
+  src = fetchurl {
+    url = "http://utopia.knoware.nl/~hlub/uck/rlwrap/${name}.tar.gz";
+    sha256 = "1gcb95i839pwn9a3phs2wq7bwz9f6v8sydq6lf9y4gm3hk0s40w4";
+  };
+
+  buildInputs = [ readline ];
+
+  meta = {
+    description = "Readline wrapper for console programs";
+    homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/;
+  };
 }
diff --git a/pkgs/tools/networking/nc6/default.nix b/pkgs/tools/networking/nc6/default.nix
index 5cba3ae017c89..348fc2e26a640 100644
--- a/pkgs/tools/networking/nc6/default.nix
+++ b/pkgs/tools/networking/nc6/default.nix
@@ -1,24 +1,15 @@
-args : with args; with builderDefs;
-let localDefs = builderDefs.passthru.function (rec {
-    src = /* put a fetchurl here */
-    fetchurl {
-      url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2;
-      sha256 = "01l28zv1yal58ilfnz6albdzqqxzsx3a58vmc14r9gv0bahffdgb";
-    };
+{ stdenv, fetchurl }:
 
-    buildInputs = [];
-    configureFlags = [];
-    });
-in with localDefs;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "nc6-1.0";
-  builder = writeScript (name + "-builder")
-    (textClosure localDefs 
-     [doConfigure doMakeInstall doForceShare doPropagate]);
+
+  src = fetchurl {
+    url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2;
+    sha256 = "01l28zv1yal58ilfnz6albdzqqxzsx3a58vmc14r9gv0bahffdgb";
+  };
+
   meta = {
     description = "A netcat implementation with IPv6 support";
-    homepage = "http://www.deepspace6.net/projects/netcat6.html";
-    inherit src;
+    homepage = http://www.deepspace6.net/projects/netcat6.html;
   };
 }
-
diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix
index 15288361baf4f..3816df415c695 100644
--- a/pkgs/tools/security/ssss/default.nix
+++ b/pkgs/tools/security/ssss/default.nix
@@ -1,29 +1,26 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function (rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz;
-			sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx";
-		};
+{ stdenv, fetchurl, gmp }:
 
-		buildInputs = [gmp];
-		configureFlags = [];
-		doPatch = fullDepEntry (''
-			sed -e s@/usr/@$out/@g -i Makefile
-			cp ssss.manpage.xml ssss.1
-			cp ssss.manpage.xml ssss.1.html
-			ensureDir $out/bin $out/share/man/man1
-			echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
-		'') ["minInit" "doUnpack" "defEnsureDir"];
-	});
-	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "ssss-0.5";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			["doPatch" doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "Shamir Secret Sharing Scheme";
-		inherit src;
-	};
+  name = "ssss-0.5";
+
+  src = fetchurl {
+    url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz;
+    sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx";
+  };
+
+  buildInputs = [ gmp ];
+
+  preBuild =
+    ''
+      sed -e s@/usr/@$out/@g -i Makefile
+      cp ssss.manpage.xml ssss.1
+      cp ssss.manpage.xml ssss.1.html
+      ensureDir $out/bin $out/share/man/man1
+      echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
+    '';
+
+  meta = {
+    description = "Shamir Secret Sharing Scheme";
+    homepage = http://point-at-infinity.org/ssss/;
+  };
 }
diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix
index 73d3ff923233f..f361e862b6363 100644
--- a/pkgs/tools/system/gdmap/default.nix
+++ b/pkgs/tools/system/gdmap/default.nix
@@ -1,21 +1,16 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-		    url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz;
-		    sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
-		};
+{ stdenv, fetchurl, gtk, pkgconfig, libxml2, intltool, gettext }:
 
-		buildInputs = [gtk pkgconfig libxml2 intltool gettext];
-		configureFlags = [];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "gdmap-0.8.1";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "Recursive rectangle map of disk usage";
-		inherit src;
-	};
+stdenv.mkDerivation {
+  name = "gdmap-0.8.1";
+  
+  src = fetchurl {
+    url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz;
+    sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
+  };
+
+  buildInputs = [ gtk pkgconfig libxml2 intltool gettext ];
+
+  meta = {
+    description = "Recursive rectangle map of disk usage";
+  };
 }