Author: raskin
Date: Tue Aug 30 07:02:01 2011
New Revision: 28915
URL: https://svn.nixos.org/websvn/nix/?rev=28915&sc=1
Log:
Adding TFTP-HPA
Added:
nixpkgs/trunk/pkgs/tools/networking/tftp-hpa/
nixpkgs/trunk/pkgs/tools/networking/tftp-hpa/default.nix
Modified:
nixpkgs/trunk/pkgs/servers/squid/squids.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/servers/squid/squids.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/squid/squids.nix Tue Aug 30 05:51:49 2011
(r28914)
+++ nixpkgs/trunk/pkgs/servers/squid/squids.nix Tue Aug 30 07:02:01 2011
(r28915)
@@ -2,13 +2,13 @@
let edf = composableDerivation.edf; in
rec {
squid30 = composableDerivation.composableDerivation {} {
- name = "squid-3.0-stable5";
+ name = "squid-3.0-stable26";
buildInputs = [perl];
src = args.fetchurl {
- url =
http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2;
- sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w";
+ url =
http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE26.tar.bz2;
+ sha256 =
"3e54ae3ad09870203862f0856c7d0cca16a85f62d5012085009003ee3d5467b4";
};
configureFlags = ["--enable-ipv6"];
@@ -21,22 +21,25 @@
};
- squid3Beta = squid30.merge {
- name = "squid-3.1-beta";
+ squid31 = squid30.merge {
+ name = "squid-3.1.15";
src = args.fetchurl {
- url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.16.tar.bz2;
- sha256 = "0pjz8dj04146hgdlfh0hbwdsdahsicdkafj5z9nkghbjavj1x5ny";
+ url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.15.tar.bz2;
+ sha256 =
"1300f44dd4783697bacc262a7a9b32dbc9f550367fe82b70262864fdff715a35";
};
configureFlags = ["--enable-ipv6"];
};
- squid3Head = squid3Beta.merge {
- name = "squid-3.1-HEAD";
+ squid32Beta = squid30.merge {
+ name = "squid-3.2.0.11";
src = args.fetchurl {
- url =
http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.3-20081221.tar.bz2;
- md5 = "345b50251dcc369e1be992d0a4a4c801";
+ url = http://www.squid-cache.org/Versions/v3/3.2/squid-3.2.0.11.tar.bz2;
+ sha256 =
"aa5b9a85e1a90c4adb591c3e796c3fdfb166d8d2c814165d70692636321f69ae";
};
+ configureFlags = ["--enable-ipv6"];
+ buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2
+ libtool openssl];
};
- latest = squid3Beta;
+ latest = squid32Beta;
}
Added: nixpkgs/trunk/pkgs/tools/networking/tftp-hpa/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/networking/tftp-hpa/default.nix Tue Aug 30
07:02:01 2011 (r28915)
@@ -0,0 +1,48 @@
+x@{builderDefsPackage
+ , tcp_wrappers
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="tftp-hpa";
+ version="5.1";
+ name="${baseName}-${version}";
+ url="mirror://kernel/software/network/tftp/${name}.tar.bz2";
+ hash="0k72s0c7wm4fyb6lqfypdkcy6rimanr49slimx8p0di69w394gzx";
+ };
+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 = ["doConfigure" "doMakeInstall"];
+
+ meta = {
+ description = "TFTP tools - a lot of fixes on top of BSD TFTP";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = a.lib.licenses.bsd3;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://www.kernel.org/pub/software/network/tftp/";;
+ };
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 30 05:51:49
2011 (r28914)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 30 07:02:01
2011 (r28915)
@@ -1422,6 +1422,8 @@
htmlTidy = callPackage ../tools/text/html-tidy { };
+ tftp_hpa = callPackage ../tools/networking/tftp-hpa {};
+
tigervnc = callPackage ../tools/admin/tigervnc {
fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc
xorg.fontcursormisc
xorg.fontbhlucidatypewriter75dpi ];
@@ -1566,6 +1568,8 @@
xsel = callPackage ../tools/misc/xsel { };
+ xtreemfs = callPackage ../tools/filesystems/xtreemfs {};
+
zdelta = callPackage ../tools/compression/zdelta { };
zile = callPackage ../applications/editors/zile { };
@@ -4920,9 +4924,11 @@
sipwitch = callPackage ../servers/sip/sipwitch { };
squids = recurseIntoAttrs( import ../servers/squid/squids.nix {
- inherit fetchurl stdenv perl lib composableDerivation;
+ inherit fetchurl stdenv perl lib composableDerivation
+ openldap pam db4 cyrus_sasl kerberos libcap expat libxml2 libtool
+ openssl;
});
- squid = squids.squid3Beta; # has ipv6 support
+ squid = squids.squid31; # has ipv6 support
tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
