summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2017-02-08 22:42:42 +0300
committerNikolay Amiantov <ab@fmap.me>2017-02-08 22:52:40 +0300
commit748e7b287b6a086f289dae9a2acf890168673b2d (patch)
treee692fd08ddf1c8bb8465c9b79350366a9902627f
parentc5b07975d8926a65b433679e00f80e1db8f59fb3 (diff)
downloadnixlib-748e7b287b6a086f289dae9a2acf890168673b2d.tar
nixlib-748e7b287b6a086f289dae9a2acf890168673b2d.tar.gz
nixlib-748e7b287b6a086f289dae9a2acf890168673b2d.tar.bz2
nixlib-748e7b287b6a086f289dae9a2acf890168673b2d.tar.lz
nixlib-748e7b287b6a086f289dae9a2acf890168673b2d.tar.xz
nixlib-748e7b287b6a086f289dae9a2acf890168673b2d.tar.zst
nixlib-748e7b287b6a086f289dae9a2acf890168673b2d.zip
chromium: update dev and beta
chromiumBeta: 56.0.2924.76 -> 57.0.2987.21
chromiumDev: 57.0.2987.19 -> 58.0.3000.4
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix4
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.nix12
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 8b852d4b6d3c..dac821a4898f 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -104,9 +104,9 @@ let
       ++ optional (versionAtLeast version "56.0.0.0") gtk3;
 
     patches = [
-      ./patches/glibc-2.24.patch
       ./patches/nix_plugin_paths_52.patch
-    ] ++ optional enableWideVine ./patches/widevine.patch;
+    ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch
+      ++ optional enableWideVine ./patches/widevine.patch;
 
     postPatch = ''
       # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 899f66cb2b0c..32a3713682e7 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,14 +1,14 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "0f1w9cba99s9hy6fdqkr39yhkay4kid72vdrgs4as5lwdci8xc6g";
-    sha256bin64 = "13hfkkgqywjapz01q3cy0i3ick1s24qhpl40by21c38nwbqplivw";
-    version = "56.0.2924.76";
+    sha256 = "0mwwscybips1kazl0rva3jdswfzfb7yp90ggqgk27z2ndp0qj8b3";
+    sha256bin64 = "17n0jcysxi99v8hwlg7f69nrs2y5z87644145a8r53l809hkvkrk";
+    version = "57.0.2987.21";
   };
   dev = {
-    sha256 = "0vw9l66412b9zd8v5l0i518mvfwf313gvh1ywxkf48lpjpi03qwh";
-    sha256bin64 = "1iagza9qjlr61149g6cmiak82898xrrhvk516xrssap2qkb6kyzp";
-    version = "57.0.2987.19";
+    sha256 = "18gsj415cdlllp95q8pv1s3hhjg8cmjb6kwrvbr5mjdvsvj0ianf";
+    sha256bin64 = "0z58rwz00bq61d24h8jynhzxanbh0m9wi04jbczci3681b4zyiyh";
+    version = "58.0.3000.4";
   };
   stable = {
     sha256 = "1q2kg85pd6lv036w7lsss5mhiiva9rx4f0410sbn9bnazhghib4s";