mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 17:39:34 +00:00
Updated Squid
svn path=/nixpkgs/trunk/; revision=14451
This commit is contained in:
parent
4578b29f2c
commit
1dd385c5b9
pkgs
|
@ -24,8 +24,8 @@ rec {
|
||||||
squid3Beta = squid30.merge {
|
squid3Beta = squid30.merge {
|
||||||
name = "squid-3.1-beta";
|
name = "squid-3.1-beta";
|
||||||
src = args.fetchurl {
|
src = args.fetchurl {
|
||||||
url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.3.tar.bz2;
|
url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.6.tar.bz2;
|
||||||
sha256 = "0khc4w9sbdwzxw8285z60ymz15q5qjy7b8yvvfnzfkihdacs735x";
|
sha256 = "0crkfd5kc677baq0v6kfnwh0rc7h2a1083yh0sccy7g02vd7z3q5";
|
||||||
};
|
};
|
||||||
configureFlags = ["--enable-ipv6"];
|
configureFlags = ["--enable-ipv6"];
|
||||||
};
|
};
|
||||||
|
|
|
@ -8673,6 +8673,21 @@ let
|
||||||
#enableOfficialBranding = true;
|
#enableOfficialBranding = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
Despaired. Looks like ThunderBird-on-Firefox's-Xulrunner is non-trivial
|
||||||
|
|
||||||
|
thunderbird3 = lowPrio (import ../applications/networking/mailreaders/thunderbird-3.x {
|
||||||
|
inherit fetchurl stdenv pkgconfig perl zip libjpeg zlib cairo
|
||||||
|
python dbus dbus_glib freetype fontconfig bzip2 libpng alsaLib sqlite
|
||||||
|
patchelf;
|
||||||
|
inherit (gtkLibs) gtk pango;
|
||||||
|
inherit (gnome) libIDL;
|
||||||
|
#enableOfficialBranding = true;
|
||||||
|
xulrunner = xulrunner3;
|
||||||
|
autoconf = autoconf213;
|
||||||
|
});*/
|
||||||
|
|
||||||
|
|
||||||
timidity = import ../tools/misc/timidity {
|
timidity = import ../tools/misc/timidity {
|
||||||
inherit fetchurl stdenv alsaLib;
|
inherit fetchurl stdenv alsaLib;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue