From a5cc2cb877203396ea3e2caa70ba3d33c2604b35 Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 4 May 2024 20:26:35 +0200 Subject: [PATCH 1/2] ungoogled-chromium: 124.0.6367.91-1 -> 124.0.6367.118-1 https://chromereleases.googleblog.com/2024/04/stable-channel-update-for-desktop_30.html This update includes 2 security fixes. CVEs: CVE-2024-4331 CVE-2024-4368 --- .../networking/browsers/chromium/upstream-info.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 345370868d71..f6f435d4aba4 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -28,12 +28,12 @@ version = "2024-03-14"; }; ungoogled-patches = { - hash = "sha256-1/J3BhUlef8CH/jZ5P5fWGXnWxTiuB0Ep+AWrMrv9cE="; - rev = "124.0.6367.91-1"; + hash = "sha256-Oo3+LCQYRRLsCQRLF+2+5tw3vMt0XYHlM4jTiapp9E8="; + rev = "124.0.6367.118-1"; }; }; - hash = "sha256-tajZtdiXgs5lRLTmDmgNTM2vD+N+LuWpBS0dYzxUsMA="; - hash_deb_amd64 = "sha256-CyCbZQ5ce8WLTt2JVSqbDkLDboE4BloiZ8pJff3dmSY="; - version = "124.0.6367.91"; + hash = "sha256-+r/48dxipSAo74v1deMuKalW+Hj85hCun63ZcgLYDLk="; + hash_deb_amd64 = "sha256-H3bv6WiVBl4j38ROZ80+SD9UO9ok+xxcKFxDd9yjWNY="; + version = "124.0.6367.118"; }; } From 6a7a561360b5593e70a8f8ab72393b13fb83dc8a Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 4 May 2024 20:47:23 +0200 Subject: [PATCH 2/2] chromium: remove `--ozone-platform-hint` patch ungoogled-chromium, the only remaining consumer of this patch (due to the version range), caught up with chromium. Meaning this patch is no longer needed. Ref: 85dfe83a86658f3fba80c050a774195f08fb378d --- .../applications/networking/browsers/chromium/common.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d78943a5c5c2..20e987facdc3 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -272,15 +272,6 @@ let # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61 # allowing us to use our rustc and our clang. ./patches/chromium-121-rust.patch - ] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "124.0.6367.118") [ - # M124 < 124.0.6367.118 shipped with broken --ozone-platform-hint flag handling, which we rely on - # for our NIXOS_OZONE_WL (wayland) environment variable. - # See . - # This is the commit for the fix that landed in M125, which applies clean on M124. - (githubPatch { - commit = "c7f4c58f896a651eba80ad805ebdb49d19ebdbd4"; - hash = "sha256-6nYWT2zN+j73xAIXLdGYT2eC71vGnGfiLCB0OwT0CAI="; - }) ]; postPatch = ''