diff options
author | Marc Weber <marco-oweber@gmx.de> | 2008-12-21 16:36:47 +0000 |
---|---|---|
committer | Marc Weber <marco-oweber@gmx.de> | 2008-12-21 16:36:47 +0000 |
commit | 5b4a35536217a214c6d178396f08d981a09e8b94 (patch) | |
tree | 8d337ea835fd8994379f9e73ee3bc31481255457 /pkgs/servers | |
parent | 2e5148a0f84b5537ed84d6ebcd87fda105daf2a8 (diff) |
squid update. Proposal for multiple versions
svn path=/nixpkgs/trunk/; revision=13666
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/squid/default.nix | 19 | ||||
-rw-r--r-- | pkgs/servers/squid/squids.nix | 44 |
2 files changed, 44 insertions, 19 deletions
diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix deleted file mode 100644 index 95e922f5e95ef..0000000000000 --- a/pkgs/servers/squid/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix new file mode 100644 index 0000000000000..beffef1733662 --- /dev/null +++ b/pkgs/servers/squid/squids.nix @@ -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; +} |