public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging from trunk. I resolved some conflicts; I hope that well.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
This commit is contained in:
Lluís Batlle i Rossell
2010-10-23 14:52:21 +00:00
parent 4309788df0 327a2eae30
commit 6dc839d344
221 changed files with 3452 additions and 1129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/altermime/default.nix
+50
View File
@@ -0,0 +1,50 @@
x@{builderDefsPackage
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="altermime";
version="0.3.10";
name="${baseName}-${version}";
url="http://www.pldaniels.com/${baseName}/${name}.tar.gz";
hash="0vn3vmbcimv0n14khxr1782m76983zz9sf4j2kz5v86lammxld43";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
phaseNames = ["fixTarget" "doMakeInstall"];
fixTarget = a.fullDepEntry (''
sed -i Makefile -e "s@/usr/local@$out@"
ensureDir "$out/bin"
'') ["doUnpack" "minInit" "defEnsureDir"];
meta = {
description = "MIME alteration tool";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
};
passthru = {
updateInfo = {
downloadPage = "http://www.pldaniels.com/altermime/";
};
};
}) x
pkgs/tools/networking/dnsmasq/default.nix
+6 -6
View File
@@ -1,17 +1,17 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "dnsmasq-2.40";
stdenv.mkDerivation rec {
name = "dnsmasq-2.55";
src = fetchurl {
url = http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.40.tar.gz;
sha256 = "1q346l403rvvmvr14fk2l201p8fl3p5417vkp95zlx00jdb7hl8n";
url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz";
sha256 = "0agrz7lvqdvh7ps173nr5yl00dblv2lpd0x9pm64f03zjzsyqqyg";
};
installPhase = "ensureDir \$out/bin; make DESTDIR= BINDIR=\$out/bin MANDIR=\$out/man LOCALEDIR=\$out/share/locale install";
makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale";
meta = {
description = "DNS forwarder and DHCP server";
description = "An integrated DNS, DHCP and TFTP server for small networks";
homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html;
license = "GPL";
};
pkgs/tools/networking/fdm/default.nix
+53
View File
@@ -0,0 +1,53 @@
x@{builderDefsPackage
, openssl, tdb, zlib, flex, bison
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="fdm";
version="1.6";
name="${baseName}-${version}";
url="http://downloads.sourceforge.net/${baseName}/${name}.tar.gz";
hash="01ipxay4rv52ra2zzybf92x6n1hyklib94ncsg04k3rp4w5a8sbj";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
phaseNames = ["fixInstall" "doMakeInstall"];
makeFlags = ["PREFIX=$out"];
fixInstall = a.fullDepEntry (''
sed -i */Makefile -i Makefile -e 's@ -g bin @ @'
sed -i */Makefile -i Makefile -e 's@ -o root @ @'
sed -i GNUmakefile -e 's@ -g $(BIN_OWNER) @ @'
sed -i GNUmakefile -e 's@ -o $(BIN_GROUP) @ @'
'') ["minInit" "doUnpack"];
meta = {
description = "Mail fetching and delivery tool - should do the job of getmail and procmail";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
};
passthru = {
updateInfo = {
downloadPage = "http://fdm.sourceforge.net/";
};
};
}) x
pkgs/tools/networking/getmail/default.nix
+48
View File
@@ -0,0 +1,48 @@
x@{builderDefsPackage
, python, makeWrapper
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="getmail";
version="4.20.0";
name="${baseName}-${version}";
url="http://pyropus.ca/software/${baseName}/old-versions/${name}.tar.gz";
hash="17cpyra61virk1d223w8pdwhv2qzhbwdbnrr1ab1znf4cv9m3knn";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["installPythonPackage" "patchShebangs" "wrapBinContentsPython"];
patchShebangs = (a.doPatchShebangs "$out/bin");
meta = {
description = "A program for retrieval of mail";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
};
passthru = {
updateInfo = {
downloadPage = "http://pyropus.ca/software/getmail/";
};
};
}) x
pkgs/tools/networking/philter/default.nix
+57
View File
@@ -0,0 +1,57 @@
x@{builderDefsPackage
, python, makeWrapper
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="philter";
version="1.1";
name="${baseName}-${version}";
url="http://prdownloads.sourceforge.net/${baseName}/${name}.tar.gz";
hash="177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["installProgram" "patchShebangs" "wrapBinContentsPython"];
patchShebangs = (a.doPatchShebangs "$out/bin");
installProgram = a.fullDepEntry(''
mv "$out/share/philter/".*rc "$out/share/philter/philterrc"
ensureDir "$out/bin"
cp "$out/share/philter/src/philter.py" "$out/bin/philter"
chmod a+x "$out/bin/philter"
'') ["addInputs" "copyToShare" "minInit"];
copyToShare = (a.simplyShare "philter");
meta = {
description = "Mail sorter for Maildirs";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
};
passthru = {
updateInfo = {
downloadPage = "http://philter.sourceforge.net/";
};
};
}) x
pkgs/tools/networking/ripmime/default.nix
+51
View File
@@ -0,0 +1,51 @@
x@{builderDefsPackage
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="ripmime";
version="1.4.0.9";
name="${baseName}-${version}";
url="http://www.pldaniels.com/${baseName}/${name}.tar.gz";
hash="15c48n8n8qavdigw5qycnwp6gys9dv3mgk18ylf5hd4491nnnrhz";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["fixTarget" "doMakeInstall"];
fixTarget = a.fullDepEntry (''
sed -i Makefile -e "s@LOCATION=.*@LOCATION=$out@"
ensureDir "$out/bin" "$out/man/man1"
'') ["doUnpack" "minInit" "defEnsureDir"];
meta = {
description = "Attachment extractor for MIME messages";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
};
passthru = {
updateInfo = {
downloadPage = "http://www.pldaniels.com/ripmime/";
};
};
}) x