Skip to content

[Backport release-25.05] chromium,chromedriver: 140.0.7339.207 -> 141.0.7390.54 #447800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emilylange merged 2 commits into from
Oct 2, 2025
Merged

[Backport release-25.05] chromium,chromedriver: 140.0.7339.207 -> 141.0.7390.54 #447800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f88bb1c
chromium: remove redundant `run_mksnapshot_default` build target
emilylange Sep 26, 2025
5cec7a4
chromium,chromedriver: 140.0.7339.207 -> 141.0.7390.54
emilylange Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pkgs/applications/networking/browsers/chromium/browser.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ mkChromiumDerivation (base: rec {
name = "chromium-browser";
packageName = "chromium";
buildTargets = [
"run_mksnapshot_default"
"chrome_sandbox"
"chrome"
];
Expand Down
25 changes: 23 additions & 2 deletions pkgs/applications/networking/browsers/chromium/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,11 +484,16 @@ let
# allowing us to use our rustc and our clang.
./patches/chromium-129-rust.patch
]
++ lib.optionals (chromiumVersionAtLeast "140") [
++ lib.optionals (versionRange "140" "141") [
# Rebased variant of the patch above due to
# https://chromium-review.googlesource.com/c/chromium/src/+/6665907
./patches/chromium-140-rust.patch
]
++ lib.optionals (chromiumVersionAtLeast "141") [
# Rebased variant of the patch above due to
# https://chromium-review.googlesource.com/c/chromium/src/+/6897026
./patches/chromium-141-rust.patch
]
++ lib.optionals (!ungoogled && !chromiumVersionAtLeast "136") [
# Note: We since use LLVM v19.1+ on unstable *and* release-24.11 for all version and as such
# no longer need this patch. We opt to arbitrarily limit it to versions prior to M136 just
Expand Down Expand Up @@ -546,6 +551,17 @@ let
revert = true;
hash = "sha256-qDrqZKj8b3F0pAiPREDmcXYIEOaFoSIQOkT+lzKJglg=";
})
]
++ lib.optionals (chromiumVersionAtLeast "141") [
(fetchpatch {
# Fix "invalid application of 'sizeof' to an incomplete type 'blink::CSSStyleSheet'"
# by reverting https://chromium-review.googlesource.com/c/chromium/src/+/6892157
name = "chromium-141-Revert-Remove-unnecessary-include-in-tree_scope.h.patch";
url = "https://chromium.googlesource.com/chromium/src/+/0fc0e71aa1ca0419fae6d14255025543980d2cba^!?format=TEXT";
decode = "base64 -d";
revert = true;
hash = "sha256-pnEus2NHpNWZ6ZSXLgdTn+it7oy1MPZPbD8SOAKLWbw=";
})
];

postPatch =
Expand Down Expand Up @@ -761,7 +777,12 @@ let
# Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):
chrome_pgo_phase = 0;
clang_base_path = "${llvmCcAndBintools}";

}
// lib.optionalAttrs (chromiumVersionAtLeast "141") {
# TODO: remove opt-out of https://chromium.googlesource.com/chromium/src/+/main/docs/modules.md
use_clang_modules = false;
}
// {
use_qt5 = false;
use_qt6 = false;
}
Expand Down
Loading
Loading