* 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

1 files changed, 14 insertions, 19 deletions

diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix
index 1b9bbb995ac..7402209960d 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/;
+  };
 }