Added socat, updated zsh

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

2 files changed, 60 insertions, 0 deletions

diff --git a/pkgs/tools/networking/socat/1.6.0.0.nix b/pkgs/tools/networking/socat/1.6.0.0.nix
new file mode 100644
index 00000000000..80dd1276a10
--- /dev/null
+++ b/pkgs/tools/networking/socat/1.6.0.0.nix
@@ -0,0 +1,35 @@
+args : with args; with builderDefs {src="";} null;
+    let localDefs = builderDefs (rec {
+        src = /* put a fetchurl here */
+        fetchurl {
+            url = http://www.dest-unreach.org/socat/download/socat-1.6.0.0.tar.bz2;
+            sha256 = "1j01iazwfr63q71cfcfzrdz8digqlg3ldhlbb72yl5mn9awr0w0m";
+        };
+        patches = [
+        fetchurl {
+            url = http://www.dest-unreach.org/socat/contrib/socat-servicenames.patch;
+            sha256 = "1r8zd6mk257n01i34i5syxl2k6fr35nlr7bqs9sfc79irjl62z66";
+        };
+        fetchurl {
+            url = http://www.dest-unreach.org/socat/contrib/socat-maxfds.patch.gz;
+            sha256 = "0fsn0k0qsrdbjbhj09a6kxfsxb7yhxs4cad26znd9naginsj7pxa";
+        };
+        
+        ];
+        buildInputs = [openssl];
+        configureFlags = [];
+    }) null; /* null is a terminator for sumArgs */
+    in with localDefs;
+stdenv.mkDerivation rec {
+    name = "socat-"+version;
+    builder = writeScript (name + "-builder")
+        (textClosure localDefs 
+            [doPatch doConfigure doMakeInstall doForceShare doPropagate]);
+    meta = {
+        description = "
+        Socat, one more analogue of netcat, but not mimicking it.
+	'netcat++' (extended design, new implementation)
+";
+        homepage = "http://www.dest-unreach.org/socat/";
+    };
+}
diff --git a/pkgs/tools/networking/socat/2.0.0-b1.nix b/pkgs/tools/networking/socat/2.0.0-b1.nix
new file mode 100644
index 00000000000..5fb3fee7879
--- /dev/null
+++ b/pkgs/tools/networking/socat/2.0.0-b1.nix
@@ -0,0 +1,25 @@
+args : with args; with builderDefs {src="";} null;
+    let localDefs = builderDefs (rec {
+        src = /* put a fetchurl here */
+        fetchurl {
+            url = http://www.dest-unreach.org/socat/download/socat-2.0.0-b1.tar.bz2;
+            sha256 = "0ybd5fw22icl10r33k987rskh9gvysm1jph90a1pfdjj57cy44fk";
+        };
+        
+        buildInputs = [openssl];
+        configureFlags = [];
+    }) null; /* null is a terminator for sumArgs */
+    in with localDefs;
+stdenv.mkDerivation rec {
+    name = "socat-"+version;
+    builder = writeScript (name + "-builder")
+        (textClosure localDefs 
+            [doPatch doConfigure doMakeInstall doForceShare doPropagate]);
+    meta = {
+        description = "
+        Socat, one more analogue of netcat, but not mimicking it.
+	'netcat++' (extended design, new implementation)
+";
+        homepage = "http://www.dest-unreach.org/socat/";
+    };
+}