diff options
Diffstat (limited to 'pkgs/applications/networking/browsers')
7 files changed, 31 insertions, 17 deletions
diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix index 1e22e263c86a..d812078b6aad 100644 --- a/pkgs/applications/networking/browsers/arora/default.nix +++ b/pkgs/applications/networking/browsers/arora/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "arora-${version}"; - version = "0.10.2"; + version = "0.11.0"; src = fetchurl { url = "http://arora.googlecode.com/files/${name}.tar.gz"; - sha256 = "1np9xiy7vkpz4dar6ka90wxw4nkwapjafyjzqrv7ghnc3nqdnnvv"; + sha256 = "1ffkranxi93lrg5r7a90pix9j8xqmf0z1mb1m8579v9m34cyypvg"; }; buildInputs = [ qt4 ]; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1a74135c1041..5899386e8813 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -34,20 +34,18 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { - name = "chrome-${version}"; # !!! Shouldn't this be "chromium"? - version = "61624"; - - # TODO: Use a stable release that doesn't disappear every few days. + name = "chrome-${version}"; + version = "62263"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip"; - sha256 = "16kv1zbs3ypb2b00dpg2s4nn8zqdnv8jdvgxknp3s0xcq02w2asl"; + sha256 = "0yn52bqxadwnzi04gfg0ginrvwz18wchqgcl701s7n4i5xzdnmv8"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip"; - sha256 = "081pvwzpys98m3arj3qagyhrrphz7rjwn7yy4mk6bcrds6mwdxiz"; + sha256 = "1cbzd4k9m1hf08462him8jqxw13k0wy0q1rpq84niifsqnq4z8nx"; } else throw "Chromium is not supported on this platform."; diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix index fe393c428d18..4776419c8069 100644 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -12,14 +12,14 @@ rec { - firefoxVersion = "3.6.10"; + firefoxVersion = "3.6.11"; - xulVersion = "1.9.2.10"; # this attribute is used by other packages + xulVersion = "1.9.2.11"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "0fa17f4ebd4bafe18c789961bdfe064d1b521ac6"; + sha1 = "d5443a07243a771fb4c69c08cd6a0f5320a888c4"; }; diff --git a/pkgs/applications/networking/browsers/firefox/4.0.nix b/pkgs/applications/networking/browsers/firefox/4.0.nix index 3a441193811a..af6224475555 100644 --- a/pkgs/applications/networking/browsers/firefox/4.0.nix +++ b/pkgs/applications/networking/browsers/firefox/4.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, libvpx, yasm, mesa +, libvpx, yasm, mesa, wirelesstools , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -52,6 +52,8 @@ rec { python dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file alsaLib nspr /* nss */ libnotify xlibs.pixman libvpx yasm mesa + wirelesstools xlibs.libXscrnsaver xlibs.scrnsaverproto + xlibs.libXext xlibs.xextproto ]; configureFlags = @@ -105,7 +107,7 @@ rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman libvpx yasm mesa + xlibs.pixman libvpx yasm mesa wirelesstools ]; propagatedBuildInputs = [xulrunner]; diff --git a/pkgs/applications/networking/browsers/konq-plugins/default.nix b/pkgs/applications/networking/browsers/konq-plugins/default.nix index 7b2a585e4653..815e1a16964c 100644 --- a/pkgs/applications/networking/browsers/konq-plugins/default.nix +++ b/pkgs/applications/networking/browsers/konq-plugins/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake kdelibs qt4 automoc4 phonon kdebase gettext ]; + patches = [ ./qt47.patch ]; + meta = with stdenv.lib; { description = "Various plugins for Konqueror"; license = "GPL"; diff --git a/pkgs/applications/networking/browsers/konq-plugins/qt47.patch b/pkgs/applications/networking/browsers/konq-plugins/qt47.patch new file mode 100644 index 000000000000..2039d293eb32 --- /dev/null +++ b/pkgs/applications/networking/browsers/konq-plugins/qt47.patch @@ -0,0 +1,11 @@ +--- konq-plugins/adblock/adblock.cpp 2010-02-11 22:12:41.000000000 +0000 ++++ konq-plugins/adblock/adblock.cpp 2010-07-26 17:12:20.639786002 +0100 +@@ -300,7 +300,7 @@ + // ---------------------------------------------------------------------------- + + AdElement::AdElement() : +- m_url(0), m_category(0), m_type(0), m_blocked(false) {} ++ m_url(QString()), m_category(QString()), m_type(QString()), m_blocked(false) {} + + AdElement::AdElement(const QString &url, const QString &category, + const QString &type, bool blocked, const DOM::Node&node) : diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index 60f2162a26a3..f9b8061d5ebd 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, perl -, gtk, gettext, pixman}: +, gettext}: stdenv.mkDerivation rec { - name = "rekonq-0.5.0"; + name = "rekonq-0.6.1"; + passthru = { inherit stdenv; }; src = fetchurl { url = "mirror://sf/rekonq/${name}.tar.bz2"; - sha256 = "0qm16ivxlh3pj7v39z3ajf90sgm5q5xq6a8s2x1a0ipsh7fgkp58"; + sha256 = "1hgy8ph4k4ngdy1kr4w3qwkfdylapsj7rjpk8wxn97yc4qnk57by"; }; - buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gtk gettext pixman ]; + buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gettext ]; meta = with stdenv.lib; { platforms = platforms.linux; |