diff options
Diffstat (limited to 'pkgs/applications/networking/browsers')
8 files changed, 19 insertions, 40 deletions
diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix deleted file mode 100644 index 88ad2c609bfab..0000000000000 --- a/pkgs/applications/networking/browsers/arora/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, qt4, qmake4Hook }: - -stdenv.mkDerivation rec { - pname = "arora"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "Arora"; - repo = "arora"; - rev = version; - sha256 = "0wmivgx3mw51rghi6q8fgivpkqc98z2mqmllf7c98ln0wd8rkf3c"; - }; - - buildInputs = [ qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - platforms = qt4.meta.platforms; - maintainers = [ maintainers.phreedom ]; - description = "A cross-platform Qt4 Webkit browser"; - homepage = "https://github.com/Arora/arora"; - license = with licenses; [ gpl2 gpl3 ]; - }; -} diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 239a6282a6756..530a4c8a4aeae 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -44,11 +44,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.414"; + version = "32.0.0.433"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0wzf5i6qf5wgjm905kd3qh97rj47fybl9g7z72vasilbx8q5wfwk"; + sha256 = "1wfwnmai6wnwi6cfxwqix6n471jjyl6nc7p67sa7cfqwg16b53kx"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 37b36e5e62953..a438c37ac2bfc 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -26,6 +26,7 @@ rec { broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; + timeout = 28800; # eight hours }; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index bec18edea3700..247b2457b5a02 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.414"; + version = "32.0.0.433"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "184qy9zxk9ynp6avz1j0ca5mxqqqlhrc0m7d1cjxv39jfdiyz51i" + "18hr026743swpdjjk7cg3hnpw2ws3q246xnkb326lyvv90wqlfni" else - "1m8fay452zps5yw1qpsc6irxxdvqjhkwxg066ckxkjf68gln7cmn" + "1yhyirii6rmnk420imaa160r9akarb3jrrlyas5a8d2y65gya71g" else if arch == "x86_64" then - "0ng04yig7msq4mv01ngfsh7mkxia18j3k9clnp0y0sbpr60z8s83" + "0k80i98zkpf6r46y1aw2zg1dsgbirg6rc8q21vycpvln395jq0pf" else - "0fndnhznqz28wfmm32fafx30pi517vvkxy1isp4krsfvyl7fmzhn"; + "1qw6hjwv9y7qr333k4nlpd7fwyzbsk833sx2slfgjfhsbipr7p3r"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 7a5c676ccb041..996d298df5817 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.414"; + version = "32.0.0.433"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1sfvxi0ngk1ny912hw1zp0l3v6md6qqpvnyab3h45562m2fm6vqz" + "1ys523wwhvj96jph435lnyp07qzg9f70j349l7ggwgg96rflalpf" else - "0pxb3fhwvajvb28w11iylx5rp0h1f4s2aiii53gz28sq082w9br4"; + "1ycw2amis7yvidc6q87gls6rb305p89pr7mhzknc10v0nh34781m"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix index 8039c5492408a..316913be000c1 100644 --- a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix +++ b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix @@ -27,8 +27,12 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 webkitgtk - gst_all_1.gst-plugins-base gst_all_1.gstreamer + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index c59d23ecdba11..ef28e9234ed67 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -11,7 +11,7 @@ let - libPath = lib.makeLibraryPath [ ffmpeg_3 ]; + libPath = lib.makeLibraryPath [ ffmpeg_3 libpulseaudio ]; gtkVersion = if withGTK3 then "3" else "2"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix index 239a6282a6756..530a4c8a4aeae 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -44,11 +44,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.414"; + version = "32.0.0.433"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0wzf5i6qf5wgjm905kd3qh97rj47fybl9g7z72vasilbx8q5wfwk"; + sha256 = "1wfwnmai6wnwi6cfxwqix6n471jjyl6nc7p67sa7cfqwg16b53kx"; stripRoot = false; }; |