diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2008-05-07 07:22:04 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2008-05-07 07:22:04 +0000 |
commit | cfff8a9c1a00e13249e997c8c15fa57bd27fa870 (patch) | |
tree | d1e5958d3e8c643dd0cea44e61c551e964b60a00 /pkgs/tools/networking/socat | |
parent | c3e2c90fb6260148c4baeed8e9b55ce3854ebf00 (diff) |
Converted Socat package to uilderDefsPackage format
svn path=/nixpkgs/trunk/; revision=11765
Diffstat (limited to 'pkgs/tools/networking/socat')
-rw-r--r-- | pkgs/tools/networking/socat/1.6.0.0.nix | 50 | ||||
-rw-r--r-- | pkgs/tools/networking/socat/2.0.0-b1.nix | 33 |
2 files changed, 36 insertions, 47 deletions
diff --git a/pkgs/tools/networking/socat/1.6.0.0.nix b/pkgs/tools/networking/socat/1.6.0.0.nix index 0ec1ac9893b..8840d134773 100644 --- a/pkgs/tools/networking/socat/1.6.0.0.nix +++ b/pkgs/tools/networking/socat/1.6.0.0.nix @@ -1,35 +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-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 = " +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/"; - inherit src; - }; + srcs = patches; + }; } diff --git a/pkgs/tools/networking/socat/2.0.0-b1.nix b/pkgs/tools/networking/socat/2.0.0-b1.nix index b4c712ea9a3..4e4b626e8c3 100644 --- a/pkgs/tools/networking/socat/2.0.0-b1.nix +++ b/pkgs/tools/networking/socat/2.0.0-b1.nix @@ -1,26 +1,25 @@ -args : with args; with builderDefs {src="";} null; - let localDefs = builderDefs (rec { - src = /* put a fetchurl here */ +args : with args; +rec { + src = /* Here a fetchurl expression goes */ 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 = " + + 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/"; - inherit src; - }; + srcs = patches; + }; } |