From 855780b11d252447d8eed7b6ecea387f226ac115 Mon Sep 17 00:00:00 2001 From: networkException Date: Sun, 20 Oct 2024 20:04:44 +0200 Subject: [PATCH] ungoogled-chromium: 129.0.6668.100-1 -> 130.0.6723.58-1 https://chromereleases.googleblog.com/2024/10/stable-channel-update-for-desktop_15.html This update includes 17 security fixes. CVEs: CVE-2024-9954 CVE-2024-9955 CVE-2024-9956 CVE-2024-9957 CVE-2024-9958 CVE-2024-9959 CVE-2024-9960 CVE-2024-9961 CVE-2024-9962 CVE-2024-9963 CVE-2024-9964 CVE-2024-9965 CVE-2024-9966 Co-authored-by: emilylange --- .../networking/browsers/chromium/common.nix | 3 ++- .../networking/browsers/chromium/upstream-info.nix | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 70ebecaa63ded..11bf657d24da4 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -314,7 +314,7 @@ 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") [ + ] ++ lib.optionals (chromiumVersionAtLeast "130" && !ungoogled) [ # 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 @@ -324,6 +324,7 @@ let # 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 + # Note: ungoogled-chromium already reverts this as part of its patchset. (githubPatch { commit = "fc838e8cc887adbe95110045d146b9d5885bf2a9"; hash = "sha256-NNKzIp6NYdeZaqBLWDW/qNxiDB1VFRz7msjMXuMOrZ8="; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 1e13bee43289d..448a50432448d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -21,17 +21,17 @@ ungoogled-chromium = { 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"; }; ungoogled-patches = { - hash = "sha256-kvpLE6SbXFur5xi1C8Ukvm4OoU5YB8PQCJdiakhFSAM="; - rev = "129.0.6668.100-1"; + hash = "sha256-M+aJ1hhFV88lBBPl9xBYpYRut7yHa/HJYXoclckaZVM="; + rev = "130.0.6723.58-1"; }; }; - hash = "sha256-LOZ9EPw7VgBNEV7Wxb8H5WfSYTTWOL8EDP91uCrZAsA="; - version = "129.0.6668.100"; + hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo="; + version = "130.0.6723.58"; }; }