* 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, 13 insertions, 18 deletions

diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix
index b908c76fa78..11bb4965a4e 100644
--- a/pkgs/development/libraries/libdbi/default.nix
+++ b/pkgs/development/libraries/libdbi/default.nix
@@ -1,21 +1,16 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-			fetchurl {
-				url = mirror://sourceforge/libdbi/libdbi-0.8.2.tar.gz;
-				sha256 = "01zlfv9hd4iv9v1xlh64ajdgx95jb0sjpazavapqc0zwiagwcg4d";
-			};
+{ stdenv, fetchurl }:
 
-		buildInputs = [];
-		configureFlags = [];
-	};
-	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "libdbi-0.8.2";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "DB independent interface to DB";
-		inherit src;
-	};
+  name = "libdbi-0.8.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libdbi/${name}.tar.gz";
+    sha256 = "1qx5d5ikx65k73ir9rf557ri6j99ihsnjqqyznqsf7dvprb1ir3j";
+  };
+
+  configureFlags = "--disable-docs";
+
+  meta = {
+    description = "DB independent interface to DB";
+  };
 }