* 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/security/metasploit/3.1.nix

@@ -22,7 +22,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["doInstall" (doPatchShebangs "$out/share/msf")];
       
-  name = "metasploit-framework" + version;
+  name = "metasploit-framework-3.1";
   meta = {
     description = "Metasploit Framework - a collection of exploits";
     homepage = "http://framework.metasploit.org/";

pkgs/tools/security/ssss/0.5.nix

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