diff options
Diffstat (limited to 'pkgs/applications/networking/browsers')
6 files changed, 8 insertions, 56 deletions
diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index cf90d2afd000..a910f1d14bdf 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -1,14 +1,14 @@ { stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: let - version = "1.4.10"; + version = "1.4.13"; # TODO: must build the extension instead of downloading it. But since it's # literally an asset that is indifferent regardless of the platform, this # might be just enough. webext = fetchurl { url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi"; - sha256 = "0rgwzv1qahqy52q7zz4dklnwx7w4x3gj92ka8n0ypgf9fjjnmqas"; + sha256 = "11477z7mva8lwfxsrfxckvgqkxrjhc80czra8cqhpakf0fih1a4g"; }; in buildGoPackage rec { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 8b06c35fe005..1c214230e4ed 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ , flashplayer, hal-flash , MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web -, trezor-bridge, bluejeans, djview4, adobe-reader +, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow @@ -55,7 +55,6 @@ let ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell - ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ++ lib.optional (cfg.enableBluejeans or false) bluejeans ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 52a2ccb292bb..0d86e4f8294c 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -71,9 +71,8 @@ in stdenv.mkDerivation rec { src = chromium.upstream-info.binary; + nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ - patchelf makeWrapper - # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gtk diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix deleted file mode 100644 index 5f7f601b3545..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, dpkg }: - -stdenv.mkDerivation { - name = "TREZOR-bridge-1.0.5"; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_amd64.deb; - sha256 = "0097h4v88yca4aayzprrh4pk03xvvj7ncz2mi83chm81gsr2v67z"; - } - else - fetchurl { - url = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_i386.deb; - sha256 = "0xzbq78s3ivg00f0bj6gyjgf47pvjx2l4mm05jjmdar60bf1xr1n"; - }; - - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - - dontStrip = true; - dontPatchELF = true; - - unpackPhase = "${dpkg}/bin/dpkg-deb -x $src ."; - - installPhase = '' - mkdir -p $out/etc/udev/rules.d/ $out/lib/mozilla/plugins - cp ./lib/udev/rules.d/51-trezor-udev.rules $out/etc/udev/rules.d/ - cp ./usr/lib/mozilla/plugins/npBitcoinTrezorPlugin.so $out/lib/mozilla/plugins - ''; - - meta = with stdenv.lib; - { description = "Plugin for browser to TREZOR device communication"; - homepage = https://mytrezor.com; - license = licenses.unfree; - maintainers = with maintainers; [ ehmry ]; - # Download URL, .deb content & hash (yikes) changed, not version. - # New archive doesn't contain any Mozilla plugin at all. - broken = true; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix index d1f50627d905..321980757b9b 100644 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchFromGitHub , qtbase, qtmultimedia, qtwebengine -, version ? "0.9.96" -, sourceSha ? "1xzfy3jjx9sskwwbk7l8hnwnjf8af62p4kjkydp0ld0j50apc39p" +, version ? "0.9.99.3" +, sourceSha ? "0dkismjs3daz5afx6s5arwvynsw5qpvv2rqbzvmpihn6khnhap55" }: stdenv.mkDerivation { name = "otter-browser-${version}"; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 1c45efaddf81..8a21f2f0cc2a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "1.15.1147.64-1"; + version = "2.0.1309.29-2"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "01xbfrrq2kj75cb6grpq9a4y88j1s87h2nnvy1fmyb4a2db6y0ag"; + sha256 = "09vaf191djbrfijvhklivh2ifj8w68car2vz956gsw4lhz07kzck"; }; unpackPhase = '' |