Added socat, updated zsh
svn path=/nixpkgs/trunk/; revision=10470
This commit is contained in:
parent
f6ee57b67f
commit
f763d29010
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, coreutils, ncurses}:
|
||||
args: with args;
|
||||
stdenv.mkDerivation {
|
||||
name = "zsh-4.3.4";
|
||||
|
22
pkgs/shells/zsh/4.3.5.nix
Normal file
22
pkgs/shells/zsh/4.3.5.nix
Normal file
@ -0,0 +1,22 @@
|
||||
args: with args;
|
||||
let documentation = fetchurl {
|
||||
url = http://www.math.technion.ac.il/pub/zsh/zsh-4.3.5-doc.tar.bz2;
|
||||
sha256 = "0jf35xibp8wfka7rdk9q8spkwprlhjx1sp7vp6img8wks12cvlkx";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "zsh-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.math.technion.ac.il/pub/zsh/zsh-4.3.5.tar.bz2;
|
||||
sha256 = "0191j3liflkjrj39i2yrs3ab9jcx4zd93rirx3j17dymfgqlvrzb";
|
||||
};
|
||||
configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
|
||||
|
||||
postInstall = ''
|
||||
ensureDir $out/share/
|
||||
tar xf ${documentation} -C $out/share
|
||||
'';
|
||||
|
||||
buildInputs = [ncurses coreutils];
|
||||
}
|
35
pkgs/tools/networking/socat/1.6.0.0.nix
Normal file
35
pkgs/tools/networking/socat/1.6.0.0.nix
Normal file
@ -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/";
|
||||
};
|
||||
}
|
25
pkgs/tools/networking/socat/2.0.0-b1.nix
Normal file
25
pkgs/tools/networking/socat/2.0.0-b1.nix
Normal file
@ -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/";
|
||||
};
|
||||
}
|
@ -774,6 +774,13 @@ rec {
|
||||
|
||||
smbfsFuse = smbfsFuseFun null;
|
||||
|
||||
socatFun = lib.sumArgs (selectVersion ../tools/networking/socat) {
|
||||
version = "1.6.0.0";
|
||||
inherit builderDefs openssl;
|
||||
};
|
||||
|
||||
socat = socatFun null;
|
||||
|
||||
sudo = import ../tools/security/sudo {
|
||||
inherit fetchurl stdenv coreutils pam;
|
||||
};
|
||||
@ -923,10 +930,13 @@ rec {
|
||||
inherit fetchurl stdenv ncurses;
|
||||
};
|
||||
|
||||
zsh = import ../shells/zsh {
|
||||
zshFun = lib.sumArgs (selectVersion ../shells/zsh) {
|
||||
inherit fetchurl stdenv ncurses coreutils;
|
||||
version = "4.3.5";
|
||||
};
|
||||
|
||||
zsh = zshFun null;
|
||||
|
||||
|
||||
### DEVELOPMENT / COMPILERS
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user