summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-08-12 17:27:59 +0100
committerGitHub <noreply@github.com>2017-08-12 17:27:59 +0100
commitef91bbcd9c1400388661ee53cfccdc2aabba3feb (patch)
tree7472611c767d62516965d152e0a95ae5c9093fdd
parentbd1a78aa34665952fafbfd3ebdec3ed701bc88e0 (diff)
parentfb36d9edb30102a5bd041940fb438241735788fa (diff)
downloadnixlib-ef91bbcd9c1400388661ee53cfccdc2aabba3feb.tar
nixlib-ef91bbcd9c1400388661ee53cfccdc2aabba3feb.tar.gz
nixlib-ef91bbcd9c1400388661ee53cfccdc2aabba3feb.tar.bz2
nixlib-ef91bbcd9c1400388661ee53cfccdc2aabba3feb.tar.lz
nixlib-ef91bbcd9c1400388661ee53cfccdc2aabba3feb.tar.xz
nixlib-ef91bbcd9c1400388661ee53cfccdc2aabba3feb.tar.zst
nixlib-ef91bbcd9c1400388661ee53cfccdc2aabba3feb.zip
Merge pull request #28190 from lluchs/vivaldi-1.11.917.39-1
vivaldi: 1.10.867.48-1 -> 1.11.917.39-1
-rw-r--r--pkgs/applications/networking/browsers/vivaldi/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix8
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index d5006eec3ab1..a1238cb5964f 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.10.867.48-1";
+  version = "1.11.917.39-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "1han45swvv0y2i2kg7xhml1wj5zyrf2c2hc5b07kqsjkfg9iz1lc";
+    sha256 = "0rsggp4ayj462g217zb9y9grhvbrcxa51a77l8l4qzhd9lg7zvx6";
   };
 
   unpackPhase = ''
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index fb10e2b6c832..1a1b7ae142c5 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi-ffmpeg-codecs";
-  version = "59.0.3071.104";
+  version = "60.0.3112.90";
 
   src = fetchurl {
     url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
-    sha512 = "419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf";
+    sha512 = "2p7pjjsxpglxjmh0asyykagqh33ccrjwj4b2aski4h31wkxv9b9najy8aqk6j1bi06n9wd35vis4hz4fr6kvgckllg1pjqrb3bpwmq5";
   };
 
   buildInputs = [ ];
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
     python2 xdg_utils
   ];
 
+  patches = [
+    ../chromium/patches/chromium-gn-bootstrap-r8.patch
+  ];
+
   configurePhase = ''
     runHook preConfigure