squid update. Proposal for multiple versions

svn path=/nixpkgs/trunk/; revision=13666
This commit is contained in:
Marc Weber 2008-12-21 16:36:47 +00:00
parent 2e5148a0f8
commit 5b4a355362
3 changed files with 48 additions and 22 deletions

View File

@ -1,19 +0,0 @@
args: with args;
stdenv.mkDerivation {
name = "squid-3.0-stable5";
buildInputs = [perl];
src = args.fetchurl {
url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2;
sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w";
};
configureFlags = ["--enable-ipv6"];
meta = {
description = "http-proxy";
homepage = "http://www.squid-cache.org";
license = "GPL2";
};
}

View File

@ -0,0 +1,44 @@
args: with args;
let edf = composableDerivation.edf; in
rec {
squid30 = composableDerivation.composableDerivation {
initial = {
name = "squid-3.0-stable5";
buildInputs = [perl];
src = args.fetchurl {
url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2;
sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w";
};
configureFlags = ["--enable-ipv6"];
meta = {
description = "http-proxy";
homepage = "http://www.squid-cache.org";
license = "GPL2";
};
};
};
squid3Beta = squid30.passthru.funMerge {
name = "squid-3.1-beta";
src = args.fetchurl {
url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.3.tar.bz2;
sha256 = "0khc4w9sbdwzxw8285z60ymz15q5qjy7b8yvvfnzfkihdacs735x";
};
configureFlags = ["--enable-ipv6"];
};
squid3Head = squid3Beta.passthru.funMerge {
name = "squid-3.1-HEAD";
src = args.fetchurl {
url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.3-20081221.tar.bz2;
md5 = "345b50251dcc369e1be992d0a4a4c801";
};
};
latest = squid3Beta;
}

View File

@ -5784,9 +5784,10 @@ let
libunwind acl fam;
};
squid = import ../servers/squid {
inherit fetchurl stdenv perl lib;
};
squids = recurseIntoAttrs( import ../servers/squid/squids.nix {
inherit fetchurl stdenv perl lib composableDerivation;
});
squid = squids.squid3Beta; # has ipv6 support
tomcat5 = import ../servers/http/tomcat {
inherit fetchurl stdenv jdk;