* 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

pkgs/applications/virtualization/qemu/linux-img/default.nix

@@ -1,27 +1,22 @@
+{ stdenv, fetchurl }:
 
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = [ http://fabrice.bellard.free.fr/qemu/linux-0.2.img.bz2 http://bellard.org/qemu/linux-0.2.img.bz2];
-			sha256 = "08xlwy1908chpc4fsqy2v13zi25dapk0ybrd43fj95v67kdj5hj1";
-		};
-		buildInputs = [];
-		configureFlags = [];
-	};
-	in with localDefs;
-let 
-doCopy = fullDepEntry ("
-  ensureDir \$out/share/qemu-images
-  cp linux-0.2.img \$out/share/qemu-images/
-") [minInit doUnpack defEnsureDir];
-in
 stdenv.mkDerivation rec {
-	name = "QEmu-Linux-Image-0.2";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doCopy doForceShare doPropagate]);
-	meta = {
-		description = "Qemu sample image.";
-		inherit src;
-	};
+  name = "qemu-linux-image-0.2";
+
+  src = fetchurl {
+    url = http://wiki.qemu.org/download/linux-0.2.img.bz2;
+    sha256 = "08xlwy1908chpc4fsqy2v13zi25dapk0ybrd43fj95v67kdj5hj1";
+  };
+
+  unpackPhase = "true";
+
+  installPhase =
+    ''
+      ensureDir $out/share/qemu-images
+      bunzip2 < $src > $out/share/qemu-images/linux-0.2.img
+    '';
+
+  meta = {
+    description = "QEMU sample Linux disk image";
+  };
 }