diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-03-08 12:29:34 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-03-08 12:29:34 +0000 |
| commit | 1dd385c5b9a3588277b721654b6a31968b7b1ce7 (patch) | |
| tree | 9fbff97385ffdf9b57e3e9f895ade9a392f71c38 | |
| parent | 4578b29f2cb7ca0d9a34d7810a46c4215b051ee8 (diff) | |
Updated Squid
svn path=/nixpkgs/trunk/; revision=14451
| -rw-r--r-- | pkgs/servers/squid/squids.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index 6d1fa34e8229a..45d289537ceab 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -24,8 +24,8 @@ rec { 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; - sha256 = "0khc4w9sbdwzxw8285z60ymz15q5qjy7b8yvvfnzfkihdacs735x"; + url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.6.tar.bz2; + sha256 = "0crkfd5kc677baq0v6kfnwh0rc7h2a1083yh0sccy7g02vd7z3q5"; }; configureFlags = ["--enable-ipv6"]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8025096f0712..3711d260be26b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8673,6 +8673,21 @@ let #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 { inherit fetchurl stdenv alsaLib; }; |