From 36732c6823d3ab8608a2a298e179c4f5538f748d Mon Sep 17 00:00:00 2001 From: networkException Date: Wed, 11 Jun 2025 22:11:45 +0200 Subject: [PATCH 1/7] ungoogled-chromium: 137.0.7151.68-1 -> 137.0.7151.103-1 https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop_10.html This update includes 2 security fixes. CVEs: CVE-2025-5958 CVE-2025-5959 (cherry picked from commit c43e25ebf3c82fe43844cf8f62d9f572dad1fbf8) --- .../networking/browsers/chromium/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index fdd61d56554e..f8f9d7253c9f 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -797,7 +797,7 @@ } }, "ungoogled-chromium": { - "version": "137.0.7151.68", + "version": "137.0.7151.103", "deps": { "depot_tools": { "rev": "1fcc527019d786502b02f71b8b764ee674a40953", @@ -808,16 +808,16 @@ "hash": "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI=" }, "ungoogled-patches": { - "rev": "137.0.7151.68-1", - "hash": "sha256-oPYNvnBuBKBb1SRNQkQeApmPVDoV+bFVjCh9HKa4A8o=" + "rev": "137.0.7151.103-1", + "hash": "sha256-KMzO25yruwrT7rpqbQ56FMGxkVZOwDSsvFqCZbUUM5Y=" }, "npmHash": "sha256-I6MsfAhrLRmgiRJ13LSejfy2N63C3Oug5tOOXA622j4=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "2989ffee9373ea8b8623bd98b3cb350a8e95cadc", - "hash": "sha256-lPmmXVCNUa9of8d52hUejImPSEfOz7v7PlovZS4cfIE=", + "rev": "3dcc738117a3439068c9773ccd31f9858923fc4a", + "hash": "sha256-MIEjHLpfKIBiTFh+bO+NUf6iDpizTP9yfXQqbHfiDwo=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1037,8 +1037,8 @@ }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "fdc8ca697612f90e7ddf2621dffbc43733d2d238", - "hash": "sha256-jKYldgZJwJeTQavmcM9enTdGN8+zt/EG7K1E9wQYIBA=" + "rev": "e423961606946be24c8c1ec0d1ec91511efbabc5", + "hash": "sha256-MhooXuF6aw+ixPzvVCBl+6T+79cTReCYx86qqXAZ6bg=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1587,8 +1587,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "e398f9bf6d5c8a768ab736f46146d7349cf31547", - "hash": "sha256-cJx8IgUB3UA3jEPvb5aDvHLYmAnHydK1qR11q6Y5PnA=" + "rev": "41f53aba7095888c959932bd8f2ee8b4e16af223", + "hash": "sha256-ICrdvHA6fe2CUphRgPdlofazr0L+NFypWDNOI5e5QIM=" } } } From 33ab9b2571980d82b324e72bde10dab300ab0a43 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Wed, 28 May 2025 09:15:20 +0200 Subject: [PATCH 2/7] microsoft-edge: 136.0.3240.76 -> 137.0.3296.68 (cherry picked from commit 6d2386a54806519a00ac260d0549ad2550a3b25b) --- pkgs/by-name/mi/microsoft-edge/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index c75fcb09e023..5a9d917c7e8d 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -174,11 +174,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "136.0.3240.76"; + version = "137.0.3296.68"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-biNM1exJ/xUcmhZjH7ZcFF9cYVqsPavbbtsJnRVlyFo="; + hash = "sha256-dgmQF6zpd8dAYKoTSiidk8VU6dZ/ZWEDlYD91IPaDEE="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -284,8 +284,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.unfree; mainProgram = "microsoft-edge"; maintainers = with lib.maintainers; [ - kuwii - rhysmdnz + cholli + ulrikstrid ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; From db81965468171c25c1895052d02b18393d5f14e5 Mon Sep 17 00:00:00 2001 From: maeve Date: Fri, 30 May 2025 11:02:07 +0100 Subject: [PATCH 3/7] maintainers: add maeve-oake (cherry picked from commit a43a45351f18d86c89065283ee4da0c40a7e600b) --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fd31ec40c499..27a681a2febd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13389,6 +13389,13 @@ name = "Mæve"; keys = [ { fingerprint = "96C9 D086 CC9D 7BD7 EF24 80E2 9168 796A 1CC3 AEA2"; } ]; }; + maeve-oake = { + email = "maeve@oa.ke"; + matrix = "@maeve:oa.ke"; + github = "maeve-oake"; + githubId = 38541651; + name = "maeve"; + }; mafo = { email = "Marc.Fontaine@gmx.de"; github = "MarcFontaine"; From d4b5b930c5ffc29d3f7a95ce000882cd614087d4 Mon Sep 17 00:00:00 2001 From: maeve Date: Fri, 30 May 2025 11:02:17 +0100 Subject: [PATCH 4/7] microsoft-edge: add maintainer maeve-oake (cherry picked from commit b65bca35bd25210888388b295e9078c217ae3f2f) --- pkgs/by-name/mi/microsoft-edge/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 5a9d917c7e8d..dee3e49cbce9 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -286,6 +286,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ cholli ulrikstrid + maeve-oake ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; From be1c72d05820ae711a293b0495be369a0759f401 Mon Sep 17 00:00:00 2001 From: vinicius Date: Mon, 2 Jun 2025 12:38:01 +0100 Subject: [PATCH 5/7] maintainers: add leleuvilela (cherry picked from commit b4a0df7e4dac0aba2d699aa719cf94f1cbc55a37) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 27a681a2febd..486d4c52d77d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12459,6 +12459,12 @@ githubId = 567634; name = "Daniel Kuehn"; }; + leleuvilela = { + email = "viniciusvilela19@gmail.com"; + github = "leleuvilela"; + githubId = 19839085; + name = "Vinicius Vilela"; + }; lelgenio = { email = "lelgenio@lelgenio.com"; github = "lelgenio"; From cea6432dca8602b89f7c09bac2dd74ec510d353a Mon Sep 17 00:00:00 2001 From: vinicius Date: Mon, 2 Jun 2025 12:38:54 +0100 Subject: [PATCH 6/7] microsoft-edge: add maintainer leleuvilela (cherry picked from commit c02eb62cbf0778db8ab7901cd21f4e8cdafd2f0d) --- pkgs/by-name/mi/microsoft-edge/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index dee3e49cbce9..0a60180a2163 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -287,6 +287,7 @@ stdenv.mkDerivation (finalAttrs: { cholli ulrikstrid maeve-oake + leleuvilela ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; From 99f677574a9b6994ab13df8a6225409d118c07ec Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 12 Jun 2025 20:30:36 +0200 Subject: [PATCH 7/7] ci/nixpkgs-vet.sh: fix passing arguments It currently fails with this: ``` error: lib.fileset.toSource: `root` (/tmp/nix-shell-19054-0/tmp.MB62qzBqsj/base) is a string-like value, but it should be a path instead. Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead. ``` Resolves #416175 (cherry picked from commit 36b76b41414c391e78b63cd3f07377984cd437d7) --- ci/nixpkgs-vet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/nixpkgs-vet.sh b/ci/nixpkgs-vet.sh index 8ad2a35adfa0..7d6cebc6bfd8 100755 --- a/ci/nixpkgs-vet.sh +++ b/ci/nixpkgs-vet.sh @@ -63,4 +63,4 @@ git -C "$tmp/merged" merge -q --no-edit "$baseSha" trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m" trace "Running nixpkgs-vet.." -nix-build ci -A nixpkgs-vet --argstr base "$tmp/base" --argstr head "$tmp/merged" +nix-build ci -A nixpkgs-vet --arg base "$tmp/base" --arg head "$tmp/merged"