* 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

4 files changed, 23 insertions, 24 deletions

diff --git a/pkgs/servers/dict/1.9.15.nix b/pkgs/servers/dict/1.9.15.nix
index 9eb0fe3dff9d..de9c4f7eeae8 100644
--- a/pkgs/servers/dict/1.9.15.nix
+++ b/pkgs/servers/dict/1.9.15.nix
@@ -11,7 +11,7 @@ args : with args; with builderDefs;
         }) // args);
         in with localDefs;
 stdenv.mkDerivation rec {
-        name = "dict-"+version;
+        name = "dict-1.9.15";
         builder = writeScript (name + "-builder")
                 (textClosure localDefs 
                         [doConfigure doMakeInstall doForceShare doPropagate]);
diff --git a/pkgs/servers/dns/bind/9.5.0.nix b/pkgs/servers/dns/bind/9.5.0.nix
index 9e73895d8d91..b6361864d10b 100644
--- a/pkgs/servers/dns/bind/9.5.0.nix
+++ b/pkgs/servers/dns/bind/9.5.0.nix
@@ -12,7 +12,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["doConfigure" "doMakeInstall"];
       
-  name = "bind-" + version;
+  name = "bind-9.5.0";
   meta = {
     description = "ISC BIND: a domain name server";
   };
diff --git a/pkgs/servers/gpm/1.20.6.nix b/pkgs/servers/gpm/1.20.6.nix
deleted file mode 100644
index 6e9e6e64d518..000000000000
--- a/pkgs/servers/gpm/1.20.6.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://linux.schottelius.org/gpm/archives/gpm-1.20.6.tar.lzma;
-    sha256 = "13w61bh9nyjaa0n5a7qq1rvbqxjbxpqz5qmdmqqpqgrd2jlviar7";
-  };
-
-  buildInputs = [lzma flex bison ncurses];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-
-  preConfigure = fullDepEntry (''
-    sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in
-  '') ["addInputs" "doUnpack" "minInit"];
-      
-  name = "gpm-" + version;
-  meta = {
-    description = "Mouse daemon";
-  };
-}
diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
new file mode 100644
index 000000000000..9b6eb2d648b5
--- /dev/null
+++ b/pkgs/servers/gpm/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, lzma, flex, bison, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "gpm-1.20.6";
+  
+  src = fetchurl {
+    url = "http://linux.schottelius.org/gpm/archives/${name}.tar.lzma";
+    sha256 = "13w61bh9nyjaa0n5a7qq1rvbqxjbxpqz5qmdmqqpqgrd2jlviar7";
+  };
+
+  buildInputs = [lzma flex bison ncurses];
+
+  preConfigure =
+    ''
+      sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in
+    '';
+      
+  meta = {
+    description = "Mouse daemon";
+  };
+}