* 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/development/libraries/tk/8.4.16.nix

@@ -1,18 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "tk-${version}";
-  src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk${version}-src.tar.gz";
-    sha256 = "0cciavzd05bpm5yfppid0s0vsf8kabwia9620vgvi26sv1gjgwhb";
-  };
-  postInstall = ''
-    echo -e '#! /bin/sh \n $( readlink -f $( type -tP wish${builtins.substring 0 3 version}) ) "$@"' >$out/bin/wish
-    chmod a+x $out/bin/wish
-  ''; 
-  configureFlags="--with-tcl=${tcl}/lib";
-  preConfigure = "cd unix";
-
-  buildInputs = [tcl x11];
-  inherit tcl;
-}

pkgs/development/libraries/tk/8.4.18.nix

@@ -1,18 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "tk-${version}";
-  src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk${version}-src.tar.gz";
-    sha256 = "065cbs82a8nklmj4867744skb3l3mqv14s8jwribk2wazzdb0mqp";
-  };
-  postInstall = ''
-    echo -e '#! /bin/sh \n $( readlink -f $( type -tP wish${__substring 0 3 version}) ) "$@"' >$out/bin/wish
-    chmod a+x $out/bin/wish
-  '';
-  configureFlags="--with-tcl=${tcl}/lib";
-  preConfigure = "cd unix";
-
-  buildInputs = [tcl x11];
-  inherit tcl;
-}

pkgs/development/libraries/tk/8.5.7.nix

@@ -1,17 +1,22 @@
-args: with args;
+{ stdenv, fetchurl, tcl, x11 }:
 
 stdenv.mkDerivation {
-  name = "tk-${version}";
+  name = "tk-8.5.7";
+  
   src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk${version}-src.tar.gz";
+    url = "mirror://sourceforge/tcl/tk8.5.7-src.tar.gz";
     sha256 = "0c5gsy3nlwl0wn9swz4k4v7phy7nzjl317gca1jykgf4jz9nwdnr";
   };
+  
   postInstall = ''
     ln -s $out/bin/wish* $out/bin/wish
   '';
-  configureFlags="--with-tcl=${tcl}/lib";
+  
+  configureFlags = "--with-tcl=${tcl}/lib";
+  
   preConfigure = "cd unix";
 
   buildInputs = [tcl x11];
+  
   inherit tcl;
 }