From 5c27b454aeb4005af5e98879ca815d3bf613dba9 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 22 Apr 2023 18:35:18 -0700 Subject: [PATCH 01/18] chromium: (cross) strip aarch64-linux-gnu- toolprefix only for native builds Our existing chromium expression strips the `aarch64-linux-gnu-` prefix off of toolchain names (like `aarch64-linux-gnu-gcc`) for all `Aarch64` builds. But when we are doing a cross compile *to* an `Aarch64` hostPlatform we need to leave those prefixes in place. This commit makes the prefix-stripping conditional on the build being a native build. (cherry picked from commit 954e7dc3d1bd11001d4edc995f8980adf33d85db) --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 115e984bbaaa..1fcd488de8d0 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -250,7 +250,7 @@ let # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch64) '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' '' + lib.optionalString ungoogled '' From 0fd0be3e123ecfb2647fbbd932c7c24a3bb836aa Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 22 Apr 2023 18:30:40 -0700 Subject: [PATCH 02/18] chromium: (cross): use cc-wrapper-clang instead of bare clang Prior to this commit chromium was writing the bare, unwrapped `clang` path into `gnFlags`. When called without the wrapper, clang doesn't know that the linker for cross compilation isn't called `lld` anymore -- it is called `${targetPrefix}-lld`. This commit fixes that problem by referencing the cc-wrapper-ified clang which is part of `llvmPackages.stdenv`. (cherry picked from commit 10706a026b481344a17e45d44ef01f8e65076744) --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1fcd488de8d0..36e25939962a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -304,7 +304,7 @@ let rtc_use_pipewire = true; # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): chrome_pgo_phase = 0; - clang_base_path = "${llvmPackages.clang}"; + clang_base_path = "${llvmPackages.stdenv.cc}"; use_qt = false; # To fix the build as we don't provide libffi_pic.a # (ld.lld: error: unable to find library -l:libffi_pic.a): From 5ea62313fe641eb779202233d4122caaba4c2b60 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 22 Apr 2023 16:36:37 -0700 Subject: [PATCH 03/18] chromium: take gnChromium from buildPackages ${gnChromium}/bin/gn needs to be compiled for the buildPlatform since it is run at build time. (cherry picked from commit 58c67d2bdb911fb62f8efa142ef0b2a670a54c5c) --- pkgs/applications/networking/browsers/chromium/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 77f4def41f33..3b4826930ec0 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper +, buildPackages , llvmPackages_16 , ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit @@ -47,7 +48,7 @@ let inherit channel chromiumVersionAtLeast versionRange; inherit proprietaryCodecs cupsSupport pulseSupport ungoogled; - gnChromium = gn.overrideAttrs (oldAttrs: { + gnChromium = buildPackages.gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; src = fetchgit { inherit (upstream-info.deps.gn) url rev sha256; From 688826eade3720f2fda480259773171c238fdaef Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 23 Jul 2023 22:50:34 +0200 Subject: [PATCH 04/18] chromium: use optionalString instead of 'then ""' This is a backport of f3719756b550113c1acbbab00c89a56fb77256f2 for Chromium (optional but useful to keep the diff small/manageable). --- pkgs/applications/networking/browsers/chromium/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3b4826930ec0..70b1de5253b8 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -135,9 +135,7 @@ let }; }; - suffix = if (channel == "stable" || channel == "ungoogled-chromium") - then "" - else "-" + channel; + suffix = lib.optionalString (channel != "stable" && channel != "ungoogled-chromium") ("-" + channel); sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; From c4b7e5e581028509e87209b5f79eff3e6a08de80 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Jun 2023 19:27:49 +0200 Subject: [PATCH 05/18] chromiumBeta: 114.0.5735.45 -> 115.0.5790.13 (cherry picked from commit 8d83062b048c05a30a86dffa4a746a575cfd0349) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a1ca2023e1e9..e5ad8121b9d9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,15 +19,15 @@ } }, "beta": { - "version": "114.0.5735.45", - "sha256": "1z7z4mq3yw9i17xprza3v33wx28zpk7s3g8xcgapdydw0rgxz30v", - "sha256bin64": "1387x7mab2sh3wg39z48gl8fjhq39jllbcgzic8rdzpbhlcgs7br", + "version": "115.0.5790.13", + "sha256": "0ias5jn8lwpds3gsmjps0rlks58ln5znwx52h767f8mc9y24fagx", + "sha256bin64": "11v374p82k8xbak37c377km9y2hvy8avw6mjl9az5kzb2am3g566", "deps": { "gn": { - "version": "2023-04-19", + "version": "2023-05-19", "url": "https://gn.googlesource.com/gn", - "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa", - "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk" + "rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7", + "sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a" } } }, From 63a3793f68c9a6acccd549a62dfb4ba88437fed0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Jun 2023 19:27:50 +0200 Subject: [PATCH 06/18] chromiumDev: 115.0.5790.3 -> 116.0.5803.2 (cherry picked from commit 3e24038fba7edfa12dd42d13f3167a3304b5841a) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index e5ad8121b9d9..6d2d0b9691fa 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "115.0.5790.3", - "sha256": "1haai0jabghwl37k929138s4l6izmifssdvn2wgsig9jhiihxz29", - "sha256bin64": "12avl8ilvhmlvbag045yhnx0bbbsyx5d3jqh5af07pmbcxksgf96", + "version": "116.0.5803.2", + "sha256": "0s3l0wvbvy0wcwxipbl9vlbp1441yfj8ylrwhlh7gy898ajl9q0j", + "sha256bin64": "0qgp0m67bpaali7w6bxy1jzw0aig4iiqqgg023k1q32712s192cs", "deps": { "gn": { - "version": "2023-05-19", + "version": "2023-05-26", "url": "https://gn.googlesource.com/gn", - "rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7", - "sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a" + "rev": "e3978de3e8dafb50a2b11efa784e08699a43faf8", + "sha256": "17hwbcxmqsq3yfnafl4bbysdkk957mvqsn34iipzb61gyjbj7i6j" } } }, From 45044f04b741d8ac504dce4f11df93db49845912 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 14 Jun 2023 01:19:55 +0200 Subject: [PATCH 07/18] chromiumBeta: 115.0.5790.13 -> 115.0.5790.24 (cherry picked from commit df795e15856007bd4e627fc50b3331715f747a11) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 6d2d0b9691fa..f5ad4155d513 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.13", - "sha256": "0ias5jn8lwpds3gsmjps0rlks58ln5znwx52h767f8mc9y24fagx", - "sha256bin64": "11v374p82k8xbak37c377km9y2hvy8avw6mjl9az5kzb2am3g566", + "version": "115.0.5790.24", + "sha256": "1lrq9v5lsnq4cawc8fk396c5r12ckb8isknri49qrr2vkrbhqq1k", + "sha256bin64": "02l1in8jz3xwjxhk45y802p9dnk4czx8cyv22f2h8839gzfafmgl", "deps": { "gn": { "version": "2023-05-19", From eb4cb92be83153710670670f634b57077bef6847 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 14 Jun 2023 01:19:55 +0200 Subject: [PATCH 08/18] chromiumDev: 116.0.5803.2 -> 116.0.5817.0 (cherry picked from commit bbd0efed7457463264991cfc622909dcd5d0bbf0) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index f5ad4155d513..109acefcd97d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "116.0.5803.2", - "sha256": "0s3l0wvbvy0wcwxipbl9vlbp1441yfj8ylrwhlh7gy898ajl9q0j", - "sha256bin64": "0qgp0m67bpaali7w6bxy1jzw0aig4iiqqgg023k1q32712s192cs", + "version": "116.0.5817.0", + "sha256": "0256ffzf21f2i0isxpir0pb4xxafmq2abw4jikgyzxjy0xhswp9z", + "sha256bin64": "0lqbranc7gp9xjnins4xicidk0wxdhryji47wmr4hvkg2nq72y4z", "deps": { "gn": { "version": "2023-05-26", From c096fc77cf289a7464528b94f3df5df007763ca8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 19 Jun 2023 20:09:17 +0200 Subject: [PATCH 09/18] chromiumBeta: 115.0.5790.24 -> 115.0.5790.32 (cherry picked from commit 1d6e72dd7b27cd7194a98c071579505aa8a2e1af) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 109acefcd97d..4463ec61f919 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.24", - "sha256": "1lrq9v5lsnq4cawc8fk396c5r12ckb8isknri49qrr2vkrbhqq1k", - "sha256bin64": "02l1in8jz3xwjxhk45y802p9dnk4czx8cyv22f2h8839gzfafmgl", + "version": "115.0.5790.32", + "sha256": "1zy4f57j047aw164s4x0904yazq6nvyy2wjjk9amiav9qyrfxzr6", + "sha256bin64": "0qgciqrjnsb9vxnvvcaqn728x9l0s72v78a6f7zffjxps87rbaz5", "deps": { "gn": { "version": "2023-05-19", From dc5ba18376bc5eba434bd33844eb16e3739985a6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 19 Jun 2023 20:09:17 +0200 Subject: [PATCH 10/18] chromiumDev: 116.0.5817.0 -> 116.0.5829.0 (cherry picked from commit f2affe590b11f744f8aae1063b04d8cffd60becd) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 4463ec61f919..68f468887894 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "116.0.5817.0", - "sha256": "0256ffzf21f2i0isxpir0pb4xxafmq2abw4jikgyzxjy0xhswp9z", - "sha256bin64": "0lqbranc7gp9xjnins4xicidk0wxdhryji47wmr4hvkg2nq72y4z", + "version": "116.0.5829.0", + "sha256": "0ip0wha705nr7yr4fn25psb6r41a703b9n87v6q8k8vzax5492y6", + "sha256bin64": "1fa2l7n8vdcnf6p0m7qqh05fimbwdh7p8a142l0vi8l9kx4n9z54", "deps": { "gn": { - "version": "2023-05-26", + "version": "2023-06-08", "url": "https://gn.googlesource.com/gn", - "rev": "e3978de3e8dafb50a2b11efa784e08699a43faf8", - "sha256": "17hwbcxmqsq3yfnafl4bbysdkk957mvqsn34iipzb61gyjbj7i6j" + "rev": "1cd35c1b722472e714c30d12031af81443bb20ae", + "sha256": "09y8jkxzkz87zp2js1j7yvqnck9n0182lm7c3x330d8agwrmdkrj" } } }, From f46a3ffaf7a30cc72540973d6a239d73cf1bdeeb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 27 Jun 2023 02:29:52 +0200 Subject: [PATCH 11/18] chromiumBeta: 115.0.5790.32 -> 115.0.5790.40 (cherry picked from commit 2c303eb58dbedb428e83765213d59c471e37f1fe) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 68f468887894..8f1267126f53 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.32", - "sha256": "1zy4f57j047aw164s4x0904yazq6nvyy2wjjk9amiav9qyrfxzr6", - "sha256bin64": "0qgciqrjnsb9vxnvvcaqn728x9l0s72v78a6f7zffjxps87rbaz5", + "version": "115.0.5790.40", + "sha256": "1ab034zrgyz0gwi0caz6y1nyr0p5yhbly50chnhvsr3k6gmidl58", + "sha256bin64": "02vzlz5z87n9lwdhxnzdzr5w85l3b828j0y1z6fzq7br90yr0pcw", "deps": { "gn": { "version": "2023-05-19", From 20e8abbf98e98dc3532c56fdad2f078de3a27d3f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 27 Jun 2023 02:29:52 +0200 Subject: [PATCH 12/18] chromiumDev: 116.0.5829.0 -> 116.0.5845.4 (cherry picked from commit 1be324a14692a2c55d9847ca53643bf57d1b02ac) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 8f1267126f53..d66e5b87e423 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "116.0.5829.0", - "sha256": "0ip0wha705nr7yr4fn25psb6r41a703b9n87v6q8k8vzax5492y6", - "sha256bin64": "1fa2l7n8vdcnf6p0m7qqh05fimbwdh7p8a142l0vi8l9kx4n9z54", + "version": "116.0.5845.4", + "sha256": "0p3v4dzyrj1fn97s2grkc2x8lgfm14rgwalrnb3gx9syi8gdwkpw", + "sha256bin64": "1wim32q9sq501wrnz1xx4s1r0gywz4pgf3r9d0zga3g86jp385ax", "deps": { "gn": { - "version": "2023-06-08", + "version": "2023-06-09", "url": "https://gn.googlesource.com/gn", - "rev": "1cd35c1b722472e714c30d12031af81443bb20ae", - "sha256": "09y8jkxzkz87zp2js1j7yvqnck9n0182lm7c3x330d8agwrmdkrj" + "rev": "4bd1a77e67958fb7f6739bd4542641646f264e5d", + "sha256": "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw" } } }, From 8f9151512093dd38d6176b6c63ba077f75d0e24d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 6 Jul 2023 21:55:42 +0200 Subject: [PATCH 13/18] chromiumDev: 116.0.5845.4 -> 116.0.5845.14 (cherry picked from commit 38e60b74ce84ebcc27c7405f084449a7f0a9cd52) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d66e5b87e423..beb0c1503791 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "116.0.5845.4", - "sha256": "0p3v4dzyrj1fn97s2grkc2x8lgfm14rgwalrnb3gx9syi8gdwkpw", - "sha256bin64": "1wim32q9sq501wrnz1xx4s1r0gywz4pgf3r9d0zga3g86jp385ax", + "version": "116.0.5845.14", + "sha256": "1b8ak0yg7ymz0siw81g47fdl12bj7f7gdw2nd5wlgj3h0g0b0675", + "sha256bin64": "1hnis5m5l6ygihmwsy6qk12lz6gjcndfdnssb3l9pd7v3qwfpkp2", "deps": { "gn": { "version": "2023-06-09", From 3089c94aa23fa22391cfb7f8d0ad927ad91980e4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 15 Jul 2023 00:18:19 +0200 Subject: [PATCH 14/18] chromiumDev: 116.0.5845.14 -> 116.0.5845.32 (cherry picked from commit d3fa477a6f8218ea288100e378e3ec569d0ef2df) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index beb0c1503791..bb93eb1c9771 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "116.0.5845.14", - "sha256": "1b8ak0yg7ymz0siw81g47fdl12bj7f7gdw2nd5wlgj3h0g0b0675", - "sha256bin64": "1hnis5m5l6ygihmwsy6qk12lz6gjcndfdnssb3l9pd7v3qwfpkp2", + "version": "116.0.5845.32", + "sha256": "0migfx1snbsa9a42cv37x6bkpa9j7y3n6h6hs0w79ss1hxmmj2mi", + "sha256bin64": "1zdr2340lbkvwyw303954ba8cay44p9a5d6b9l693kcrgkf4z8bz", "deps": { "gn": { "version": "2023-06-09", From 80acf136f111d0a3b3a5638bf9dccbf31bf8f547 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 29 Jun 2023 23:03:39 +0200 Subject: [PATCH 15/18] chromiumBeta: 115.0.5790.40 -> 115.0.5790.56 (cherry picked from commit 90ed2c1dfa762ba2b87d609141fb52d9fa623f2e) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index bb93eb1c9771..d6cd373d0a23 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.40", - "sha256": "1ab034zrgyz0gwi0caz6y1nyr0p5yhbly50chnhvsr3k6gmidl58", - "sha256bin64": "02vzlz5z87n9lwdhxnzdzr5w85l3b828j0y1z6fzq7br90yr0pcw", + "version": "115.0.5790.56", + "sha256": "10z2599cckfm9pzh9jk0nnsvj0yqp82ch3243wmf994vayix3zf8", + "sha256bin64": "1qk439mzx5amd8iqk7sn4g2as2ybqmj66mchyzkkpakcik6da6ji", "deps": { "gn": { "version": "2023-05-19", From 9e7d83de69389f556784166405105614dd7d7ce1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 15 Jul 2023 00:18:19 +0200 Subject: [PATCH 16/18] chromiumBeta: 115.0.5790.56 -> 115.0.5790.90 (cherry picked from commit 27ec2e384f2f8312ad2f9646c6703869fa86e086) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d6cd373d0a23..e6bcdb556ebe 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.56", - "sha256": "10z2599cckfm9pzh9jk0nnsvj0yqp82ch3243wmf994vayix3zf8", - "sha256bin64": "1qk439mzx5amd8iqk7sn4g2as2ybqmj66mchyzkkpakcik6da6ji", + "version": "115.0.5790.90", + "sha256": "156k5cijkxj44r4cn14k7r2xa11xp0nwi7nsgxfmg3dfsay05s42", + "sha256bin64": "1b573bd19ywwy0k8570501az1cw3xnp6iy53zk1a1gawsn8f4pv5", "deps": { "gn": { "version": "2023-05-19", From 9a0cef2571bd188af993cd62d88d5df0efb3f93d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 19 Jul 2023 22:53:53 +0200 Subject: [PATCH 17/18] chromiumDev: 116.0.5845.32 -> 116.0.5845.42 (cherry picked from commit e5afd98eb5f5a875e14bbbeca442a75357df6b1d) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index e6bcdb556ebe..ad823d05b253 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "116.0.5845.32", - "sha256": "0migfx1snbsa9a42cv37x6bkpa9j7y3n6h6hs0w79ss1hxmmj2mi", - "sha256bin64": "1zdr2340lbkvwyw303954ba8cay44p9a5d6b9l693kcrgkf4z8bz", + "version": "116.0.5845.42", + "sha256": "1fvhh8fvm0rkb41mhsh4p3bahf4fk3gixan2x1bappm3hdcixffb", + "sha256bin64": "1zq4vyvm0vij03rc0zwzknm17108ka8bl1lsayp1133y2fgbl9f8", "deps": { "gn": { "version": "2023-06-09", From 4ec70a99196bd69935ef35b25c895ef1f58b47a2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 19 Jul 2023 22:53:52 +0200 Subject: [PATCH 18/18] chromiumBeta: 115.0.5790.90 -> 115.0.5790.98 (cherry picked from commit 66552d656c154a1031280cfaede34f9a73d0b0e1) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index ad823d05b253..f7cce23755e5 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.90", - "sha256": "156k5cijkxj44r4cn14k7r2xa11xp0nwi7nsgxfmg3dfsay05s42", - "sha256bin64": "1b573bd19ywwy0k8570501az1cw3xnp6iy53zk1a1gawsn8f4pv5", + "version": "115.0.5790.98", + "sha256": "1wbasmwdqkg5jcmzpidvzjsq2n2dr73bxz85pr8a5j4grw767gpz", + "sha256bin64": "0xbizb3d539h1cw1kj9ahd8azmkcdfjdmqb5bpp8cr21bh2qbqp5", "deps": { "gn": { "version": "2023-05-19",