* 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

2 files changed, 17 insertions, 25 deletions

diff --git a/pkgs/tools/networking/socat/1.6.0.1.nix b/pkgs/tools/networking/socat/1.6.0.1.nix
deleted file mode 100644
index 8840d134773..00000000000
--- a/pkgs/tools/networking/socat/1.6.0.1.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-args : with args; 
-rec {
-  src = /* Here a fetchurl expression goes */
-  fetchurl {
-    url = http://www.dest-unreach.org/socat/download/socat-1.6.0.1.tar.bz2;
-    sha256 = "1cl7kf0rnbvjxz8vdkmdh1crd069qmz1jjw40r8bydgpn0nsh6qd";
-  };
-
-  buildInputs = [openssl];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
-      
-  name = "socat-" + version;
-  meta = {
-    description = "Socat - a different replacement for netcat";
-    longDesc = "
-        Socat, one more analogue of netcat, but not mimicking it.
-	'netcat++' (extended design, new implementation)
-";
-        homepage = "http://www.dest-unreach.org/socat/";
-	srcs = patches;
-  };
-}
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
new file mode 100644
index 00000000000..7669a9b2d32
--- /dev/null
+++ b/pkgs/tools/networking/socat/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "socat-1.6.0.1";
+  
+  src = fetchurl {
+    url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
+    sha256 = "1cl7kf0rnbvjxz8vdkmdh1crd069qmz1jjw40r8bydgpn0nsh6qd";
+  };
+
+  buildInputs = [openssl];
+      
+  meta = {
+    description = "Socat - a different replacement for netcat";
+    homepage = "http://www.dest-unreach.org/socat/";
+  };
+}