Merging from trunk. I had to do two manual merges, quite trivial I think.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18472

pkgs/tools/misc/mdbtools/default.nix

@@ -1,21 +1,19 @@
-args : with args; 
-rec {
+{ stdenv, fetchurl, glib, readline, bison, flex, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "mdbtools-0.6pre1";
+
   src = fetchurl {
     url = http://prdownloads.sourceforge.net/mdbtools/mdbtools-0.6pre1.tar.gz;
     sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi";
   };
 
   buildInputs = [glib readline bison flex pkgconfig];
-  configureFlags = [];
 
-  preConfigure = fullDepEntry (''
+  preConfigure = ''
     sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
-  '') ["doUnpack" "minInit"];
+  '';
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-      
-  name = "mdbtools-" + version;
   meta = {
     description = ".mdb (MS Access) format tools";
   };

pkgs/tools/misc/minicom/2.3.nix

@@ -1,18 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://alioth.debian.org/frs/download.php/2332/minicom-2.3.tar.gz;
-    sha256 = "1ysn0crdhvwyvdlbw0ms5nq06xy2pd2glwjs53p384byl3ac7jra";
-  };
-
-  buildInputs = [ncurses];
-  configureFlags = [ "--sysconfdir=/etc" ];
-
-  /* doConfigure should be specified separately */
-  phaseNames = [ "doConfigure" "doMakeInstall"];
-      
-  name = "minicom-" + version;
-  meta = {
-    description = "Serial console";
-  };
-}

pkgs/tools/misc/minicom/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "minicom-2.3";
+  
+  src = fetchurl {
+    url = "http://alioth.debian.org/frs/download.php/2332/${name}.tar.gz";
+    sha256 = "1ysn0crdhvwyvdlbw0ms5nq06xy2pd2glwjs53p384byl3ac7jra";
+  };
+
+  buildInputs = [ncurses];
+  
+  configureFlags = [ "--sysconfdir=/etc" ];
+
+  meta = {
+    description = "Serial console";
+  };
+}

pkgs/tools/misc/relfs/cvs.2008.03.05.nix

@@ -43,7 +43,7 @@ args : with args;
 assert args.libuuid != null;
         
 stdenv.mkDerivation rec {
-	name = "relfs-"+version;
+	name = "relfs-2008.03.05";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs ["build" "doMakeInstall" "doForceShare" "doPropagate"]);
 	meta = {

pkgs/tools/misc/rlwrap/0.28.nix

@@ -11,7 +11,7 @@ args : with args; with builderDefs;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "rlwrap-"+version;
+	name = "rlwrap-0.28";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[doConfigure doMakeInstall doForceShare doPropagate]);

pkgs/tools/misc/uucp/default.nix

@@ -1,17 +1,13 @@
-args : with args; 
-rec {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "uucp-1.07";
+
   src = fetchurl {
     url = http://ftp.de.debian.org/debian/pool/main/u/uucp/uucp_1.07.orig.tar.gz;
     sha256 = "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306";
   };
 
-  buildInputs = [];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "uucp-" + version;
   meta = {
     description = "Unix-unix cp over serial line, also includes cu program";
   };