* Removed selectVersion. There's no good reason to write

`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

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

pkgs/tools/system/ddrescue/1.8.nix

@@ -1,20 +0,0 @@
-
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://ftp.gnu.org/gnu/ddrescue/ddrescue-1.8.tar.bz2;
-    sha256 = "080k1s4knh9baw3dxr5vqjjph6dqzkfpk0kpld0a3qc07vsxmhbz";
-  };
-
-  buildInputs = [];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "ddrescue-" + version;
-  meta = {
-    description = "GNU ddrescue - advanced dd for corrupted media";
-  };
-}
-  

pkgs/tools/system/ddrescue/default.nix

@@ -0,0 +1,15 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "ddrescue-1.8";
+  
+  src = fetchurl {
+    url = "http://ftp.gnu.org/gnu/ddrescue/${name}.tar.bz2";
+    sha256 = "080k1s4knh9baw3dxr5vqjjph6dqzkfpk0kpld0a3qc07vsxmhbz";
+  };
+
+  meta = {
+    description = "GNU ddrescue - advanced dd for corrupted media";
+  };
+}
+  

pkgs/tools/system/gdmap/0.8.1.nix

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