adjust packages to overridableDelayableArgs
svn path=/nixpkgs/trunk/; revision=14427
This commit is contained in:
@@ -1,29 +1,27 @@
|
||||
args: with args;
|
||||
let edf = composableDerivation.edf; in
|
||||
rec {
|
||||
squid30 = composableDerivation.composableDerivation {
|
||||
initial = {
|
||||
name = "squid-3.0-stable5";
|
||||
squid30 = composableDerivation.composableDerivation {} {
|
||||
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";
|
||||
};
|
||||
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 {
|
||||
squid3Beta = squid30.merge {
|
||||
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;
|
||||
@@ -32,7 +30,7 @@ rec {
|
||||
configureFlags = ["--enable-ipv6"];
|
||||
};
|
||||
|
||||
squid3Head = squid3Beta.passthru.funMerge {
|
||||
squid3Head = squid3Beta.merge {
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user