From 16486f19ae17c9677d03e6724525518811110612 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 29 Mar 2022 21:35:56 +0200 Subject: [PATCH 01/16] chromiumBeta: 100.0.4896.56 -> 100.0.4896.60 (cherry picked from commit 4b9e65e0664703ce7e0fbb9d256265e799d22f7c) --- .../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 945a677946b7..3afe5bbe8d0a 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": "100.0.4896.56", - "sha256": "0vdyddxhmkw9bqwx5j19h69swx9ysiipsmcc1sjl0qv8bn8f790z", - "sha256bin64": "09h4fxsx0q5b0gn258xnmk11qz7ql8flpn4mq5x201abmv29y856", + "version": "100.0.4896.60", + "sha256": "1p7zggnhsz9gj3zil0nyas4ym5bd94vs0z6mdg7r1l0s0vrsaphf", + "sha256bin64": "059zrf3mm04iyzmgp594m3m7pw4458vym3wpawmdn94h5zi705i7", "deps": { "gn": { "version": "2022-01-21", From 7576dca7745a4e885849daf0cc4efb24c2071c59 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 31 Mar 2022 21:18:47 +0200 Subject: [PATCH 02/16] chromiumDev: 101.0.4951.7 -> 101.0.4951.15 (cherry picked from commit 7cbe3d69a76458f38e61db14aa7849f67e7e24ff) --- .../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 3afe5bbe8d0a..193f6fd14fc9 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": "101.0.4951.7", - "sha256": "0xnvbiqi50hgky35qaivcyzfp05nnwfwqrd50dksqkzycl8avb4z", - "sha256bin64": "19my3zr9d3w2ypl9cm1xa15vhyv9add1f283alb9fmh2qwhl4scg", + "version": "101.0.4951.15", + "sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y", + "sha256bin64": "0m1q85ai9pyam9anh8aiv7hyadam0hjkkhnsa6s05d82k8kz5rvc", "deps": { "gn": { "version": "2022-03-14", From 5f4f88de2c113796174394cadf724c5965c7de74 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 31 Mar 2022 21:18:47 +0200 Subject: [PATCH 03/16] chromiumBeta: 100.0.4896.60 -> 101.0.4951.15 (cherry picked from commit 773cfb08598b87eb08d7874ae58ab1c8923d0c2b) --- .../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 193f6fd14fc9..d19f03179323 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": "100.0.4896.60", - "sha256": "1p7zggnhsz9gj3zil0nyas4ym5bd94vs0z6mdg7r1l0s0vrsaphf", - "sha256bin64": "059zrf3mm04iyzmgp594m3m7pw4458vym3wpawmdn94h5zi705i7", + "version": "101.0.4951.15", + "sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y", + "sha256bin64": "0z2rx7mw9wg5ly8wmxkflk8f9gifq4cxqvi224v9dr11qqj8gwm2", "deps": { "gn": { - "version": "2022-01-21", + "version": "2022-03-14", "url": "https://gn.googlesource.com/gn", - "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", - "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" + "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", + "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" } } }, From ff942c6e13d402fc08614763db9df8795fcda7de Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 31 Mar 2022 23:25:25 +0200 Subject: [PATCH 04/16] chromiumDev: 101.0.4951.15 -> 102.0.4972.0 (cherry picked from commit 2b7d401ee6117182a4b0811d6301547fed12f73b) --- .../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 d19f03179323..5da9b9f7a446 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": "101.0.4951.15", - "sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y", - "sha256bin64": "0m1q85ai9pyam9anh8aiv7hyadam0hjkkhnsa6s05d82k8kz5rvc", + "version": "102.0.4972.0", + "sha256": "1aihdym7h8sd52wiybnrgjrd618f3yby4bpbkc26xyrl8gviz31d", + "sha256bin64": "0mb67cfr397aclkiy0v9xqga07c166qdylq257k2kmhj7df1gcvn", "deps": { "gn": { - "version": "2022-03-14", + "version": "2022-03-29", "url": "https://gn.googlesource.com/gn", - "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", - "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" + "rev": "e39d5251c25155b9dfdb96adeab31b795095fd3b", + "sha256": "1clr0f847rmwwpmsl9zv4q6rw1shn09my775666v480szpahj9pk" } } }, From f66a7ab7b595ea2eb1088f4ab04a7aa02c5f207f Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Fri, 1 Apr 2022 22:38:04 +0200 Subject: [PATCH 05/16] ungoogled-chromium: added myself as maintainer (cherry picked from commit cd16da586740d63c897011e8b6f1ba1028f0d9fc) --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 40a0d7997528..ca52cf94d8c6 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -87,7 +87,7 @@ mkChromiumDerivation (base: rec { then "https://github.com/Eloston/ungoogled-chromium" else "https://www.chromium.org/"; maintainers = with maintainers; if ungoogled - then [ squalus primeos ] + then [ squalus primeos michaeladler ] else [ primeos thefloweringash ]; license = if enableWideVine then licenses.unfree else licenses.bsd3; platforms = platforms.linux; From 7b87f2121dd2f17910ae5987a91bd915145cc3ff Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Mar 2022 15:42:41 +0200 Subject: [PATCH 06/16] chromium: remove deprecated libgnome-keyring dependency libgnome-keyring has been deprecated for a long time. It has been superseded by libsecret, which allows access to not only GNOME Keyring secret manager but any other service implementing the Secret Service D-Bus API. In fact Chromium links against libsecret when use_glib is enabled: https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/BUILD.gn;l=142;drc=35be6215ec8f09e50176f36753c68f26c63d1885 And use_glib is on by default on Linux: https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/BUILD.gn;l=142;drc=35be6215ec8f09e50176f36753c68f26c63d1885 Unfortunately, Chromium is vendoring libsecret: https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/BUILD.gn;l=187;drc=35be6215ec8f09e50176f36753c68f26c63d1885 We need to disable the flag explicitly, since it is enabled by default: https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/features.gni;l=11;drc=35be6215ec8f09e50176f36753c68f26c63d1885 (cherry picked from commit e8c84f90ed0f4f0f880d1217b26d6c026ec43a2f) --- pkgs/applications/networking/browsers/chromium/common.nix | 4 +--- pkgs/applications/networking/browsers/chromium/default.nix | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a309189ba27b..d0d858f1a7fb 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -40,7 +40,6 @@ # Package customization: , gnomeSupport ? false, gnome2 ? null -, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , cupsSupport ? true, cups ? null , proprietaryCodecs ? true , pulseSupport ? false, libpulseaudio ? null @@ -162,7 +161,6 @@ let libepoxy ] ++ optional systemdSupport systemd ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] - ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; @@ -280,7 +278,7 @@ let # Optional features: use_gio = true; - use_gnome_keyring = gnomeKeyringSupport; + use_gnome_keyring = false; # Superseded by libsecret use_cups = cupsSupport; # Feature overrides: diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index de57f0369680..f45dc9c56955 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -9,7 +9,6 @@ # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" , gnomeSupport ? false, gnome2 ? null -, gnomeKeyringSupport ? false , proprietaryCodecs ? true , enableWideVine ? false , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -46,7 +45,7 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit channel chromiumVersionAtLeast versionRange; - inherit gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs + inherit gnome2 gnomeSupport proprietaryCodecs cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; From 54c5d88e4a75567bf702a126df0f92419a3be643 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Mar 2022 16:10:35 +0200 Subject: [PATCH 07/16] chromium: remove unused GConf dependency GConf has been deprecated for ages and support for it removed from Chromium a while ago: - Removal of `use_gconf` gn build system flag: https://chromium.googlesource.com/chromium/src/+/a28f4d062f4c030eeddd085f261988d7958db2ba (cherry picked from commit e3e625ffe4f256440699717bdb8b7f6d52d9084d) --- pkgs/applications/networking/browsers/chromium/common.nix | 4 +--- pkgs/applications/networking/browsers/chromium/default.nix | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d0d858f1a7fb..ebf769e98ca2 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -39,13 +39,12 @@ , glibc # gconv + locale # Package customization: -, gnomeSupport ? false, gnome2 ? null , cupsSupport ? true, cups ? null , proprietaryCodecs ? true , pulseSupport ? false, libpulseaudio ? null , ungoogled ? false, ungoogled-chromium # Optional dependencies: -, libgcrypt ? null # gnomeSupport || cupsSupport +, libgcrypt ? null # cupsSupport , systemdSupport ? stdenv.isLinux , systemd }: @@ -160,7 +159,6 @@ let curl libepoxy ] ++ optional systemdSupport systemd - ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index f45dc9c56955..bb0939fc9491 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -8,7 +8,6 @@ # package customization # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" -, gnomeSupport ? false, gnome2 ? null , proprietaryCodecs ? true , enableWideVine ? false , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -45,7 +44,7 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit channel chromiumVersionAtLeast versionRange; - inherit gnome2 gnomeSupport proprietaryCodecs + inherit proprietaryCodecs cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; From 359d5e14e02a57c398770d4879e225a93334e062 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 21 Mar 2022 20:29:10 +0100 Subject: [PATCH 08/16] chromium: get-commit-message.py: Support releases with 0 security fixes Wow, a Chrome release without any (known!) security fixes: https://chromereleases.googleblog.com/2022/03/stable-channel-update-for-desktop_20.html (cherry picked from commit 688d6d243589cc57e326e2b2eca52329db7997aa) --- .../networking/browsers/chromium/get-commit-message.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 85ebb8a7b935..833b6b8283d0 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -38,9 +38,9 @@ for entry in feed.entries: else: print('chromium: TODO -> ' + version + '\n') print(url) - if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0): - zero_days = re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content) - if zero_days: + if fixes := re.search(r'This update includes .+ security fixes\.', content): + fixes = fixes.group(0) + if zero_days := re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content): fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) if cve_list := re.findall(r'CVE-[^: ]+', content): From 1dd77bb3a7197b6ac9d72ac29d32320e47a93542 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 10 Apr 2022 21:44:08 +0200 Subject: [PATCH 09/16] chromiumBeta: 101.0.4951.15 -> 101.0.4951.26 (cherry picked from commit 073c33c3a6f9283e47f59758ac9155b71ed34f71) --- .../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 5da9b9f7a446..5214ee76e322 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": "101.0.4951.15", - "sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y", - "sha256bin64": "0z2rx7mw9wg5ly8wmxkflk8f9gifq4cxqvi224v9dr11qqj8gwm2", + "version": "101.0.4951.26", + "sha256": "1wpdi5l0bic0z9ydvx5vj35z6fh21b3n8dsxyvcbm0rq4fca5zcg", + "sha256bin64": "13mx2jxq5pjzp6dxvnzkfs83krhvpbw0pim7z4c7hhyphjc4fhzr", "deps": { "gn": { "version": "2022-03-14", From c178cbc0b05c9e9e754e702469106c8cea309c1e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Mar 2022 21:15:36 +0200 Subject: [PATCH 10/16] chromium: get-commit-message.py: Support releases with 1 security fix There was an out-of-band security release with only a single security fix: https://chromereleases.googleblog.com/2022/03/stable-channel-update-for-desktop_25.html (cherry picked from commit 92559b7330a56778dde383225bae47e225de4861) --- .../networking/browsers/chromium/get-commit-message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 833b6b8283d0..45f4282582f5 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -38,7 +38,7 @@ for entry in feed.entries: else: print('chromium: TODO -> ' + version + '\n') print(url) - if fixes := re.search(r'This update includes .+ security fixes\.', content): + if fixes := re.search(r'This update includes .+ security fix(es)?\.', content): fixes = fixes.group(0) if zero_days := re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content): fixes += " " + zero_days.group(0) From dd0b01111842c128217b386f348a26aabcfc1d99 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 10 Apr 2022 21:44:08 +0200 Subject: [PATCH 11/16] chromiumDev: 102.0.4972.0 -> 102.0.4987.0 (cherry picked from commit dbf02e3a52d3e37759328e2c90b38ee8ba95b2f2) --- .../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 5214ee76e322..ff0f059571a3 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": "102.0.4972.0", - "sha256": "1aihdym7h8sd52wiybnrgjrd618f3yby4bpbkc26xyrl8gviz31d", - "sha256bin64": "0mb67cfr397aclkiy0v9xqga07c166qdylq257k2kmhj7df1gcvn", + "version": "102.0.4987.0", + "sha256": "0rs6smmda0wlhwbvmhmyz0vi43rkb9gyfbm49bn2084bd1x3qpzy", + "sha256bin64": "1knrnjhn98bln81qf3646gz9znn848kgjayyjl5ik0x0fimx524x", "deps": { "gn": { - "version": "2022-03-29", + "version": "2022-04-05", "url": "https://gn.googlesource.com/gn", - "rev": "e39d5251c25155b9dfdb96adeab31b795095fd3b", - "sha256": "1clr0f847rmwwpmsl9zv4q6rw1shn09my775666v480szpahj9pk" + "rev": "5eb3845ec2d8296b4f41da4eca85302eb111fe69", + "sha256": "04yy4d77bw3bhb32q1szlqn6lmif6qaah2c0ns6by0cbnkliyaza" } } }, From 253c5a06d4dbcff4a00218070aca22aaff81af7a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 12 Apr 2022 22:10:35 +0200 Subject: [PATCH 12/16] chromiumDev: 102.0.4987.0 -> 102.0.4997.0 (cherry picked from commit 8255068a6336896806245dab54e340c381b3fe86) --- .../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 ff0f059571a3..3d1400f4d3fd 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": "102.0.4987.0", - "sha256": "0rs6smmda0wlhwbvmhmyz0vi43rkb9gyfbm49bn2084bd1x3qpzy", - "sha256bin64": "1knrnjhn98bln81qf3646gz9znn848kgjayyjl5ik0x0fimx524x", + "version": "102.0.4997.0", + "sha256": "05y9b426wcarq18faw5i79qrfqy158dinvba5d7lwrcjnbqyfr1f", + "sha256bin64": "0846y3dbs7vghrb8s2s57a2lk7a0x2dha5q0d915qrn29g5x9c6p", "deps": { "gn": { - "version": "2022-04-05", + "version": "2022-04-07", "url": "https://gn.googlesource.com/gn", - "rev": "5eb3845ec2d8296b4f41da4eca85302eb111fe69", - "sha256": "04yy4d77bw3bhb32q1szlqn6lmif6qaah2c0ns6by0cbnkliyaza" + "rev": "ae110f8b525009255ba1f9ae96982176d3bfad3d", + "sha256": "131y1v2m59hn7s00zc9p7rhfi956p744mp96g2i80f0i020dyl6w" } } }, From 84e28f3e90358fdc98aefcd8d4e61592eb506b2f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 13 Apr 2022 22:37:33 +0200 Subject: [PATCH 13/16] chromium{Beta,Dev}: Fix a build error by disabling PGO This fixes build errors like this: error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-4951-1649181099-528ef6669805f2d3db6f3ad7429cfa57a6078271.profdata: unsupported instrumentation profile format version We already package the most recent stable LLVM version for Chromium but Google relies on unreleased (Git) versions (thanks...). This isn't ideal but I don't have the time to package yet another LLVM version so it'll have to cut it for now. See build/config/compiler/pgo/pgo.gni: - 0 : Means that PGO is turned off. - 1 : Used during the PGI (instrumentation) phase. - 2 : Used during the PGO (optimization) phase. With is_official_build the default is chrome_pgo_phase = 2. (cherry picked from commit 15623bcb654b0c5ef9b455ca1f7b7fb0ffcaea26) --- pkgs/applications/networking/browsers/chromium/common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ebf769e98ca2..167545379211 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -288,6 +288,9 @@ let enable_widevine = true; # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture: rtc_use_pipewire = true; + } // optionalAttrs (chromiumVersionAtLeast "101") { + # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): + chrome_pgo_phase = 0; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; From 1bfaa31adf761fa4820daab5f7cb9b1445bbb5fc Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Fri, 15 Apr 2022 17:39:18 +0200 Subject: [PATCH 14/16] chromium: 100.0.4896.88 -> 100.0.4896.127 (cherry picked from commit a6a25ec43d65f9dbf77ed52d28f582fb6ed03d68) --- .../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 3d1400f4d3fd..3d27f5b2f4cc 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": "101.0.4951.26", - "sha256": "1wpdi5l0bic0z9ydvx5vj35z6fh21b3n8dsxyvcbm0rq4fca5zcg", - "sha256bin64": "13mx2jxq5pjzp6dxvnzkfs83krhvpbw0pim7z4c7hhyphjc4fhzr", + "version": "101.0.4951.34", + "sha256": "1pqglzc8k31a4x06jn9pd6y8m4nmmb7rv5b3zancmh0d3z0nz3v5", + "sha256bin64": "1zhif47j8nqglaj1z3ism3dl6z8n5ilyyr835an32mf6igkfj217", "deps": { "gn": { "version": "2022-03-14", From d91222a9c3ab29cede7f2a05c777e42cfece115c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 20 Apr 2022 23:23:25 +0200 Subject: [PATCH 15/16] chromiumBeta: 101.0.4951.34 -> 101.0.4951.41 (cherry picked from commit 2a60ab110d00fd8824f10661bc04fbba202adeb1) --- .../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 3d27f5b2f4cc..ee0c02d11961 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": "101.0.4951.34", - "sha256": "1pqglzc8k31a4x06jn9pd6y8m4nmmb7rv5b3zancmh0d3z0nz3v5", - "sha256bin64": "1zhif47j8nqglaj1z3ism3dl6z8n5ilyyr835an32mf6igkfj217", + "version": "101.0.4951.41", + "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609", + "sha256bin64": "1jbj5cykxamf32c1s4gsid1wxcsdf4hng2d19q9h7b2ashkvvrbi", "deps": { "gn": { "version": "2022-03-14", From 39aab3280e5890c195b54b8fd6a4bedaa976a93b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 22 Apr 2022 22:49:44 +0200 Subject: [PATCH 16/16] chromiumDev: 102.0.4997.0 -> 102.0.5005.12 (cherry picked from commit da09d908bec3586eadedb3d06271caafee965bbe) --- .../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 ee0c02d11961..8abd8fbdad5a 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": "102.0.4997.0", - "sha256": "05y9b426wcarq18faw5i79qrfqy158dinvba5d7lwrcjnbqyfr1f", - "sha256bin64": "0846y3dbs7vghrb8s2s57a2lk7a0x2dha5q0d915qrn29g5x9c6p", + "version": "102.0.5005.12", + "sha256": "11n03hz3g8h7srywxrjwrdrxybdjvmdjrnigjlrwjkydprg1l7ab", + "sha256bin64": "0hc56a98ikkbgdw36dpz9k6r15jmjmnm7faml8z59vixxlvkrw7y", "deps": { "gn": { - "version": "2022-04-07", + "version": "2022-04-14", "url": "https://gn.googlesource.com/gn", - "rev": "ae110f8b525009255ba1f9ae96982176d3bfad3d", - "sha256": "131y1v2m59hn7s00zc9p7rhfi956p744mp96g2i80f0i020dyl6w" + "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167", + "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h" } } },