From 37c13136ac5d229f9214a7cfad1d8f065f2504be Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 25 Sep 2021 00:21:56 +0200 Subject: [PATCH 01/13] chromiumDev: 95.0.4638.17 -> 96.0.4651.0 (cherry picked from commit eba807d5949801334cf4742423e8a7d5eb161d26) --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 767a3f4483c..4b7fbc38bbc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -181,7 +181,7 @@ let substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi - chmod -x third_party/webgpu-cts/src/tools/deno + chmod -x third_party/webgpu-cts/src/tools/${lib.optionalString (chromiumVersionAtLeast "96") "run_"}deno # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 0b61f1a46d7..a7128bfb4e5 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "95.0.4638.17", - "sha256": "1v5r8m3wlwh6prcj7bd4zprsr4g43869lhxv43m207c5nlnqiriz", - "sha256bin64": "1azn9216jhcdg4yjr6frz8vp98qbcnnhifp9jn9bwvyg69lr0dwb", + "version": "96.0.4651.0", + "sha256": "0da1mhz3cy0k2igdh208i28k8fxca0yjfypvmj7624p7igrp4an6", + "sha256bin64": "1gslpdnpjp7w40lsl748rmbkbs31v22f2x45gahrijkvfrkgdqp9", "deps": { "gn": { "version": "2021-08-11", From a161b1460d2be382979c95e52a6fce4b4c349464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Sat, 25 Sep 2021 11:32:58 +0200 Subject: [PATCH 02/13] google-chrome: add pipewire dependency chromium derivation already depends on pipewire. This is required to share your screen on wayland (cherry picked from commit 29efb76ab6480426ce8c1f7bd8e341f0249a61cc) --- .../networking/browsers/google-chrome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 34cc5bb9160..03bdb84f438 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -6,7 +6,7 @@ , alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , libkrb5, libdrm, mesa -, libxkbcommon, wayland # ozone/wayland +, libxkbcommon, pipewire, wayland # ozone/wayland # Command line programs , coreutils @@ -67,7 +67,7 @@ let flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core libkrb5 libdrm mesa coreutils - libxkbcommon wayland + libxkbcommon pipewire wayland ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva ++ optional vulkanSupport vulkan-loader From d7c4b627a7c3a791c5c58771125fef73b39572cb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 29 Sep 2021 22:30:41 +0200 Subject: [PATCH 03/13] chromiumDev: 96.0.4651.0 -> 96.0.4655.0 (cherry picked from commit 1f7f87396ca180543b997a3a8806212da8a3fd67) --- .../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 a7128bfb4e5..4139f2e81c7 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "96.0.4651.0", - "sha256": "0da1mhz3cy0k2igdh208i28k8fxca0yjfypvmj7624p7igrp4an6", - "sha256bin64": "1gslpdnpjp7w40lsl748rmbkbs31v22f2x45gahrijkvfrkgdqp9", + "version": "96.0.4655.0", + "sha256": "00gax7xqi1n4jiqwpff43c43mpqb5jakckwdfbgwhrp6h35xxdv1", + "sha256bin64": "1xyyz6p4qllzyd6wbdbhs6kp062dz40i03wrlsggb919bgp7ivnw", "deps": { "gn": { - "version": "2021-08-11", + "version": "2021-09-13", "url": "https://gn.googlesource.com/gn", - "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", - "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" + "rev": "de86ec4176235871a7cb335756987e41246dae4a", + "sha256": "0mlnsqcj06azz5cpwlafi5gg6pvf2s6x9qq02zl1sm2h288y152g" } } }, From fc512032a7ee0fda7aa3ae415dd1eeae0980e2a5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 30 Sep 2021 12:23:18 +0200 Subject: [PATCH 04/13] chromiumBeta: 95.0.4638.17 -> 95.0.4638.32 (cherry picked from commit a41e19ca718eeabc2e9205e72608f50a933e9648) --- .../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 4139f2e81c7..26fdcab0881 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "95.0.4638.17", - "sha256": "1v5r8m3wlwh6prcj7bd4zprsr4g43869lhxv43m207c5nlnqiriz", - "sha256bin64": "0h88gd8y4i2jmvhiwadbq6hzqygddym8jy1fhzp8qnwfhc30qm4m", + "version": "95.0.4638.32", + "sha256": "1w904axixagn6gqcb90849q3qy0k3c6lgl0c97cb6m78l9xrrnbr", + "sha256bin64": "1z7xx608sh8agdl98r7xk7s43d3qnfpd1jvgbl7l8fqd85ns11i0", "deps": { "gn": { "version": "2021-08-11", From 05a460398dad7ae19f0df3e5cc7b3d133a545c97 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 8 Oct 2021 23:08:29 +0200 Subject: [PATCH 05/13] chromiumBeta: 95.0.4638.32 -> 95.0.4638.40 (cherry picked from commit a15be1c5f65b15d75a4e30a82340ed34d538e449) --- .../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 26fdcab0881..a58280a27bb 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "95.0.4638.32", - "sha256": "1w904axixagn6gqcb90849q3qy0k3c6lgl0c97cb6m78l9xrrnbr", - "sha256bin64": "1z7xx608sh8agdl98r7xk7s43d3qnfpd1jvgbl7l8fqd85ns11i0", + "version": "95.0.4638.40", + "sha256": "1v1n113rh5nzfbk5xaq4kp7fdg5n9rca978a9700nmrd0gqpd2hn", + "sha256bin64": "0xadlal8fb7hqjcq6d931if555spw72wa4d23m0fqcan31sky3i0", "deps": { "gn": { "version": "2021-08-11", From 6011e236a54d6e96cab75d6f18362774baf92b31 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 9 Oct 2021 22:09:53 +0200 Subject: [PATCH 06/13] chromiumDev: 96.0.4655.0 -> 96.0.4662.6 (cherry picked from commit 35a26a5b210eb0ac5656f21adee96281339a1b36) --- .../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 a58280a27bb..a7ef9e495b1 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "96.0.4655.0", - "sha256": "00gax7xqi1n4jiqwpff43c43mpqb5jakckwdfbgwhrp6h35xxdv1", - "sha256bin64": "1xyyz6p4qllzyd6wbdbhs6kp062dz40i03wrlsggb919bgp7ivnw", + "version": "96.0.4662.6", + "sha256": "14vr0nlp195h0hwfsd43fifl9r3qr875fw2da3gi9l5yi0pxns2q", + "sha256bin64": "1lq114rsgxqrdh18f2x3i0iwdn5ijxw3jb6nrxjxx0c3bvlzhsw8", "deps": { "gn": { - "version": "2021-09-13", + "version": "2021-09-24", "url": "https://gn.googlesource.com/gn", - "rev": "de86ec4176235871a7cb335756987e41246dae4a", - "sha256": "0mlnsqcj06azz5cpwlafi5gg6pvf2s6x9qq02zl1sm2h288y152g" + "rev": "0153d369bbccc908f4da4993b1ba82728055926a", + "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" } } }, From 101abfd618157ee2f91b9d994e34f670941f29c0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 11 Oct 2021 23:13:09 +0200 Subject: [PATCH 07/13] chromium: Start dropping Python 2 (cherry picked from commit 7e6d80740d01dd42f1684cbb64d0f236e69dd3c8) --- pkgs/applications/networking/browsers/chromium/common.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4b7fbc38bbc..e269d6313ae 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -53,9 +53,6 @@ buildFun: with lib; let - python2WithPackages = python2.withPackages(ps: with ps; [ - ply jinja2 setuptools - ]); python3WithPackages = python3.withPackages(ps: with ps; [ ply jinja2 setuptools ]); @@ -125,7 +122,7 @@ let nativeBuildInputs = [ ninja pkg-config - python2WithPackages python3WithPackages perl + python2 python3WithPackages perl gnutar which llvmPackages.bintools ]; @@ -308,7 +305,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" - ${python2}/bin/python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} + ${python3}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. From 2bf603406b3d0be95ba4b9e2dec4e8d40e125a48 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 14 Oct 2021 19:56:11 +0200 Subject: [PATCH 08/13] chromiumBeta: 95.0.4638.40 -> 95.0.4638.49 (cherry picked from commit d7e522e8032c1774cf65f0cb07ab935340971d7f) --- .../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 a7ef9e495b1..d7fcd453b6d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "95.0.4638.40", - "sha256": "1v1n113rh5nzfbk5xaq4kp7fdg5n9rca978a9700nmrd0gqpd2hn", - "sha256bin64": "0xadlal8fb7hqjcq6d931if555spw72wa4d23m0fqcan31sky3i0", + "version": "95.0.4638.49", + "sha256": "11fiq6p2d99hl166pf39g83pk7m7ibi1zz19wj7qmcc7ql7006jz", + "sha256bin64": "04s81fnr01jq74fpl5n6jg8iw5iw6sdwyz40zja68h1crxh5d6d6", "deps": { "gn": { "version": "2021-08-11", From 10828b560b92f86410f1ad7056e49ed25dd9cec1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 13 Oct 2021 20:55:01 +0200 Subject: [PATCH 09/13] chromium: Drop Python 2 Yay, finally!... \o/ :) Upstream issue: https://crbug.com/942720 (cherry picked from commit ae522fb7f98cb92f8ac92df91ac0be8b02fb33ee) --- .../networking/browsers/chromium/common.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e269d6313ae..ec4d9da93bc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -6,7 +6,7 @@ # Native build inputs: , ninja, pkg-config -, python2, python3, perl +, python3, perl , gnutar, which , llvmPackages # postPatch: @@ -56,6 +56,10 @@ let python3WithPackages = python3.withPackages(ps: with ps; [ ply jinja2 setuptools ]); + clangFormatPython3 = fetchurl { + url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT"; + sha256 = "0ic3hn65dimgfhakli1cyf9j3cxcqsf1qib706ihfhmlzxf7256l"; + }; # The additional attributes for creating derivations based on the chromium # source tree. @@ -122,7 +126,7 @@ let nativeBuildInputs = [ ninja pkg-config - python2 python3WithPackages perl + python3WithPackages perl gnutar which llvmPackages.bintools ]; @@ -209,6 +213,9 @@ let # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc + # We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408: + base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format + patchShebangs . # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin From 0f95b33218c075ccbca95b5bd10c1e18671ba606 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 15 Oct 2021 21:15:33 +0200 Subject: [PATCH 10/13] chromiumDev: 96.0.4662.6 -> 96.0.4664.9 (cherry picked from commit df1531f3dc0ed37b82bb11a96fdbae9e076bf429) --- .../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 d7fcd453b6d..8cc2725e797 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "96.0.4662.6", - "sha256": "14vr0nlp195h0hwfsd43fifl9r3qr875fw2da3gi9l5yi0pxns2q", - "sha256bin64": "1lq114rsgxqrdh18f2x3i0iwdn5ijxw3jb6nrxjxx0c3bvlzhsw8", + "version": "96.0.4664.9", + "sha256": "0hlniaglnd19cb3k2wi9mmf56ws8i89lm5y2dbjpr7vqnmj6qc39", + "sha256bin64": "1crl8gbhjyaa0yhkvm4va0g9dyljra8n5zg9bd1znmjlk0c124x3", "deps": { "gn": { "version": "2021-09-24", From 98b786b341a744cfb22dc6af8f96bccfc27df3a3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 16 Oct 2021 21:55:57 +0200 Subject: [PATCH 11/13] chromiumDev: Fix the build (cherry picked from commit b0581c2699cf4f4fb7da2098385372739d4d8955) --- 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 ec4d9da93bc..a9331041ddd 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -34,6 +34,7 @@ , libva , libdrm, wayland, libxkbcommon # Ozone , curl +, epoxy # postPatch: , glibc # gconv + locale @@ -151,6 +152,8 @@ let libva libdrm wayland mesa.drivers libxkbcommon curl + ] ++ optionals (chromiumVersionAtLeast "96") [ + epoxy ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] From 12c7b8e13e4f8e59877fff975fcc826ab7c01268 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 18 Oct 2021 22:50:21 +0200 Subject: [PATCH 12/13] chromiumBeta: 95.0.4638.49 -> 95.0.4638.54 (cherry picked from commit 338e629f0c230df830c879ea491f84e894a87fd0) --- .../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 8cc2725e797..debb38678a6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "95.0.4638.49", - "sha256": "11fiq6p2d99hl166pf39g83pk7m7ibi1zz19wj7qmcc7ql7006jz", - "sha256bin64": "04s81fnr01jq74fpl5n6jg8iw5iw6sdwyz40zja68h1crxh5d6d6", + "version": "95.0.4638.54", + "sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry", + "sha256bin64": "06d0kjnrv8z74icc6nahllxbwn3xxwn0vgc7ss47402zrqig8lch", "deps": { "gn": { "version": "2021-08-11", From dc7c702c4e930b3114dacac204f03ceb80a1ca37 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 19 Oct 2021 21:43:17 +0200 Subject: [PATCH 13/13] chromium: 94.0.4606.81 -> 95.0.4638.54 https://chromereleases.googleblog.com/2021/10/stable-channel-update-for-desktop_19.html This update includes 19 security fixes. CVEs: CVE-2021-37981 CVE-2021-37982 CVE-2021-37983 CVE-2021-37984 CVE-2021-37985 CVE-2021-37986 CVE-2021-37987 CVE-2021-37988 CVE-2021-37989 CVE-2021-37990 CVE-2021-37991 CVE-2021-37992 CVE-2021-37993 CVE-2021-37996 CVE-2021-37994 CVE-2021-37995 (cherry picked from commit 820b99a77d8ea33313a88852384b840e1fadf0df) --- .../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 debb38678a6..6e890ccb6c3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "94.0.4606.81", - "sha256": "16755mfqxxmvslm9ix060safrnml91ckj5p85960jj5g5hmslwbh", - "sha256bin64": "1d3z5np6b6jax7afak7f0yh76kmmdggdjlrzwyhy8hgrv7c7rsdz", + "version": "95.0.4638.54", + "sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry", + "sha256bin64": "0mf9jfzwz6nkz1yg8lndz1gmsvmdh1rxhqkv0vd9nr04h5x9b41a", "deps": { "gn": { "version": "2021-08-11", @@ -12,9 +12,9 @@ } }, "chromedriver": { - "version": "94.0.4606.61", - "sha256_linux": "1l7ls8qqqd9q3a20a459q40jd9djzf67s8qfdmfj44vwgidiw0fj", - "sha256_darwin": "1b43agdd6vw5zarrbbk1sgmdr6n3d9cdl4dcikk304yplh58d49v" + "version": "95.0.4638.17", + "sha256_linux": "0jqq2h3rjancq9gk4w29gcr4b3z4irnkbvcj97fdsnksck9y5h2q", + "sha256_darwin": "0vl73i28xq3z5njg4287j08pb2sfd28amc8hkm4ddq5dgqpim0l8" } }, "beta": {