Skip to content
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

[Backport release-24.05] chromium,chromedriver: 129.0.6668.100 -> 130.0.6723.58 #349538

Merged
merged 1 commit into from
Oct 19, 2024
Merged

[Backport release-24.05] chromium,chromedriver: 129.0.6668.100 -> 130.0.6723.58 #349538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 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 @@ -72,9 +72,9 @@ let
# source tree.
extraAttrs = buildFun base;

githubPatch = { commit, hash, revert ? false }: fetchpatch {
githubPatch = { commit, hash, revert ? false, excludes ? [] }: fetchpatch {
url = "https://github.com/chromium/chromium/commit/${commit}.patch";
inherit hash revert;
inherit hash revert excludes;
};

mkGnFlags =
Expand Down Expand Up @@ -283,6 +283,22 @@ let
] ++ lib.optionals (chromiumVersionAtLeast "129") [
# Rebased variant of patch right above to build M129+ with our rust and our clang.
./patches/chromium-129-rust.patch
] ++ lib.optionals (chromiumVersionAtLeast "130") [
# Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size
# and std::hardware_constructive_interference_size.
# So let's revert the change for now and hope that our rustc.llvmPackages and
# nixpkgs-stable catch up sooner than later.
# https://groups.google.com/a/chromium.org/g/cxx/c/cwktrFxxUY4
# https://chromium-review.googlesource.com/c/chromium/src/+/5767325
# Note: We exclude the changes made to the partition_allocator (PA), as the revert
# would otherwise not apply because upstream reverted those changes to PA already
# in https://chromium-review.googlesource.com/c/chromium/src/+/5841144
(githubPatch {
commit = "fc838e8cc887adbe95110045d146b9d5885bf2a9";
hash = "sha256-NNKzIp6NYdeZaqBLWDW/qNxiDB1VFRz7msjMXuMOrZ8=";
excludes = [ "base/allocator/partition_allocator/src/partition_alloc/*" ];
revert = true;
})
];

postPatch = ''
Expand Down
18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
stable = {
chromedriver = {
hash_darwin = "sha256-/0mBZCSNULvZSQ/irsQSgNPsuOSWiRRnJA/6ogHYeGk=";
hash_darwin = "sha256-YndBzhUNmn5tJdCqLmpUrs2WBXXpTxiKCNczWEz6DU4=";
hash_darwin_aarch64 =
"sha256-JWcYFYaaXM2KN6oSu7wwxztYPbhql2XYZlvL2ymKgwI=";
hash_linux = "sha256-odFoTWjDa9ilyOrQ0T+0xxedRD7YOe/s7xdAyyku74w=";
version = "129.0.6668.91";
"sha256-taG58kMgQUD40aGqnyx9O9e9m4qGsTWX57cjD3NeHm4=";
hash_linux = "sha256-raWGzhjqWdm5bRK+Z7Qga8QM9kQYSXxdL5N+wk1hlXI=";
version = "130.0.6723.58";
};
deps = {
gn = {
hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA=";
rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad";
hash = "sha256-iNXRq3Mr8+wmY1SR4sV7yd2fDiIZ94eReelwFI0UhGU=";
rev = "20806f79c6b4ba295274e3a589d85db41a02fdaa";
url = "https://gn.googlesource.com/gn";
version = "2024-08-19";
version = "2024-09-09";
};
};
hash = "sha256-LOZ9EPw7VgBNEV7Wxb8H5WfSYTTWOL8EDP91uCrZAsA=";
version = "129.0.6668.100";
hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo=";
version = "130.0.6723.58";
};
ungoogled-chromium = {
deps = {
Expand Down
Loading