{,ungoogled-}chromium,chromedriver: 144.0.7559.132 -> 145.0.7632.45 (#489228)

pkgs/applications/networking/browsers/chromium/browser.nix

@@ -6,6 +6,11 @@
   ungoogled,
 }:
 
+let
+  # https://chromium-review.googlesource.com/c/chromium/src/+/7253206
+  ifElseM145 = new: old: if chromiumVersionAtLeast "145" then new else old;
+in
+
 mkChromiumDerivation (base: rec {
   name = "chromium-browser";
   packageName = "chromium";
@@ -62,11 +67,11 @@ mkChromiumDerivation (base: rec {
       $out/share/applications/chromium-browser.desktop
 
     substituteInPlace $out/share/applications/chromium-browser.desktop \
-      --replace-fail "@@MENUNAME@@" "Chromium" \
-      --replace-fail "@@PACKAGE@@" "chromium" \
-      --replace-fail "/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "chromium" \
-      --replace-fail "@@URI_SCHEME@@" "x-scheme-handler/chromium;" \
-      --replace-fail "@@EXTRA_DESKTOP_ENTRIES@@" ""
+      --replace-fail "${ifElseM145 "@@MENUNAME" "@@MENUNAME@@"}" "Chromium" \
+      --replace-fail "${ifElseM145 "@@PACKAGE" "@@PACKAGE@@"}" "chromium" \
+      --replace-fail "${ifElseM145 "/usr/bin/@@usr_bin_symlink_name" "/usr/bin/@@USR_BIN_SYMLINK_NAME@@"}" "chromium" \
+      --replace-fail "${ifElseM145 "@@uri_scheme" "@@URI_SCHEME@@"}" "x-scheme-handler/chromium;" \
+      --replace-fail "${ifElseM145 "@@extra_desktop_entries" "@@EXTRA_DESKTOP_ENTRIES@@"}" ""
 
     # See https://github.com/NixOS/nixpkgs/issues/12433
     substituteInPlace $out/share/applications/chromium-browser.desktop \

pkgs/applications/networking/browsers/chromium/common.nix

@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchpatch,
+  fetchurl,
   zstd,
   fetchFromGitiles,
   fetchNpmDeps,
@@ -507,11 +508,12 @@ let
       # https://chromium-review.googlesource.com/c/chromium/src/+/6897026
       ./patches/chromium-141-rust.patch
     ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    ++ lib.optionals (!chromiumVersionAtLeast "145" && stdenv.hostPlatform.isAarch64) [
       # Reverts decommit pooled pages which causes random crashes of tabs on systems
       # with page sizes different than 4k. It 'supports' runtime page sizes, but has
       # a hardcode for aarch64 systems.
       # https://issues.chromium.org/issues/378017037
+      # Started failing to apply with M145, but this is no longer needed anyway.
       (fetchpatch {
         name = "reverted-v8-decommit-pooled-paged-by-default.patch";
         # https://chromium-review.googlesource.com/c/v8/v8/+/5864909
@@ -558,7 +560,7 @@ let
       # https://chromium-review.googlesource.com/c/chromium/src/+/7022369
       ./patches/chromium-144-rustc_nightly_capability.patch
     ]
-    ++ lib.optionals (chromiumVersionAtLeast "144.0.7559.132" && !ungoogled) [
+    ++ lib.optionals (versionRange "144.0.7559.132" "145" && !ungoogled) [
       # Rollup was swapped with esbuild because of compile failures on Windows,
       # which is not compatible with our build yet. So let's revert it for now.
       # Ungoogled ships its own variant of this patch upstream.
@@ -573,6 +575,29 @@ let
         revert = true;
         hash = "sha256-k+xCfhDuHxtuGhY7LVE8HvbDJt8SEFkslBcJe7t5CAg=";
       })
+    ]
+    ++ lib.optionals (chromiumVersionAtLeast "145" && !ungoogled) [
+      # Non-backported variant of the patch above for M145
+      (fetchpatch {
+        name = "revert-devtools-frontend-esbuild-instead-of-rollup.patch";
+        # https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7485622
+        url = "https://chromium.googlesource.com/devtools/devtools-frontend/+/72846d78927b90a77b51b12d13009320a74067e0^!?format=TEXT";
+        decode = "base64 -d";
+        stripLen = 1;
+        extraPrefix = "third_party/devtools-frontend/src/";
+        revert = true;
+        hash = "sha256-vu60z6PuWavNoEoxW0thSy89WxztOEG50V1ZSfJRRug=";
+      })
+      (fetchpatch {
+        name = "revert-devtools-frontend-reland-use-native-rollup.patch";
+        # https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7368549
+        url = "https://chromium.googlesource.com/devtools/devtools-frontend/+/7c2d912b52f18fff4a9ef7bd64608f2feefc0d83^!?format=TEXT";
+        decode = "base64 -d";
+        stripLen = 1;
+        extraPrefix = "third_party/devtools-frontend/src/";
+        revert = true;
+        hash = "sha256-Qa4GvamZ//0WTAZmDXOQJVz9dnYNzBkD8lYcWOHdVIY=";
+      })
     ];
 
     postPatch =
@@ -672,6 +697,20 @@ let
             '${glibc}/share/locale/'
 
       ''
+      # Workaround (crimes) for our rollup/esbuild revert in M145.
+      # https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7414812
+      # We cannot use fetchpatch{,2} because it silently drops blobs and messes up symlinks.
+      # We cannot use GNU patch (patchPhase) because it does not support git binary diffs.
+      # We cannot use Gerrit/Gitiles because the git sha lengths may change as the repo grows.
+      + lib.optionalString (chromiumVersionAtLeast "145" && !ungoogled) ''
+        ${lib.getExe buildPackages.git} apply --reverse --directory=third_party/devtools-frontend/src/ ${
+          fetchurl {
+            name = "revert-devtools-frontend-remove-rollup-wasm.patch";
+            url = "https://github.com/ChromeDevTools/devtools-frontend/commit/a377a8c570a370e1bfccaf82f128e3b977dbf866.patch?full_index=1";
+            hash = "sha256-83T37ts54iotGYQAAyVv5CF8fMVrh/tfVRhfWaOlUkI=";
+          }
+        }
+      ''
       + ''
         # Allow to put extensions into the system-path.
         sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc