From dff7016c5474cc831d2cd3fc5e7959f64be7a862 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 16 Apr 2020 22:46:54 +0200
Subject: [PATCH 1/3] chromium{Beta,Dev}: M81 -> M83 -> M84

(cherry picked from commit cb5c0a4bbcdb4f3eb23e0d9dc81fa9c7b8f761d8)
Note: Only M81 is supported on 19.09. This is mainly to cherry-pick
stable channel updates and avoid an insecure chromiumBeta.
---
 .../networking/browsers/chromium/upstream-info.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 50e3abb5ec3f..cf542faa8a1e 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 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17";
-    sha256bin64 = "1iwn0yyhk0jn47pn7rx9kadli47xyvz3xilfl4faifmasin2fq8v";
-    version = "81.0.4044.113";
+    sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf";
+    sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax";
+    version = "83.0.4103.14";
   };
   dev = {
-    sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf";
-    sha256bin64 = "1hn2hjni5k370jhc0nikmx5ypwzcqnmr02h185a5ry697643abdd";
-    version = "83.0.4103.14";
+    sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny";
+    sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf";
+    version = "84.0.4115.5";
   };
   stable = {
     sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17";

From c0439bad93900f42806872edf09ad3dcfd691773 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 22 Apr 2020 12:56:28 +0200
Subject: [PATCH 2/3] chromiumBeta: Mark as broken

---
 pkgs/applications/networking/browsers/chromium/browser.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 554086e5e3e5..cc3962db87b0 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -80,6 +80,11 @@ mkChromiumDerivation (base: rec {
     platforms = platforms.linux;
     hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
     timeout = 172800; # 48 hours
-    broken = channel == "dev";
+    broken = channel != "stable"; # M81 is the last supported version for 19.09
+    # Reason: The build of Chromium 83 requires a lot of additional changes
+    # (LLVM 10, a newer gn version, some patches, etc.) which are unlikely to be
+    # backported to 19.09. Therefore we'll only maintain M81 for NixOS 19.09
+    # which will give us approx. one month of security updates / time for users
+    # to transition to 20.03 (as per our policy).
   };
 })

From e45440a81e39d410c37888dea3d0970001ec3c4e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 22 Apr 2020 01:16:07 +0200
Subject: [PATCH 3/3] chromium: 81.0.4044.113 -> 81.0.4044.122

https://chromereleases.googleblog.com/2020/04/stable-channel-update-for-desktop_21.html

This update includes 8 security fixes.

CVEs: CVE-2020-6459 CVE-2020-6460 CVE-2020-645
(cherry picked from commit a2df9776f0eec102b67330047e4ed97ce806065d)
---
 .../networking/browsers/chromium/upstream-info.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index cf542faa8a1e..77505b47d857 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -11,8 +11,8 @@
     version = "84.0.4115.5";
   };
   stable = {
-    sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17";
-    sha256bin64 = "0ap7flrw3h885454fa2r7psa4sh8567ql7v7x96q11gh9gjrdvp3";
-    version = "81.0.4044.113";
+    sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg";
+    sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w";
+    version = "81.0.4044.122";
   };
 }