diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2009-03-06 23:21:24 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2009-03-06 23:21:24 +0000 |
| commit | 51289a41b011209fdf5955f3a9e1d3e69d70c5be (patch) | |
| tree | f158cbd5f3fb13012293cc876c1c0a3792a9c92c /pkgs/servers/squid/squids.nix | |
| parent | f1183f33e3407bf626890484bb88fdd923b675a9 (diff) | |
| download | nixpkgs-51289a41b011209fdf5955f3a9e1d3e69d70c5be.tar nixpkgs-51289a41b011209fdf5955f3a9e1d3e69d70c5be.tar.gz nixpkgs-51289a41b011209fdf5955f3a9e1d3e69d70c5be.tar.bz2 nixpkgs-51289a41b011209fdf5955f3a9e1d3e69d70c5be.tar.lz nixpkgs-51289a41b011209fdf5955f3a9e1d3e69d70c5be.tar.xz nixpkgs-51289a41b011209fdf5955f3a9e1d3e69d70c5be.tar.zst nixpkgs-51289a41b011209fdf5955f3a9e1d3e69d70c5be.zip | |
adjust packages to overridableDelayableArgs
svn path=/nixpkgs/trunk/; revision=14427
Diffstat (limited to 'pkgs/servers/squid/squids.nix')
| -rw-r--r-- | pkgs/servers/squid/squids.nix | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index beffef17336..6d1fa34e822 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -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]; + 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"]; + src = args.fetchurl { + url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2; + sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w"; + }; - meta = { - description = "http-proxy"; - homepage = "http://www.squid-cache.org"; - license = "GPL2"; - }; + 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; |