From 2ec280866b1cfc63aac00b04c47215ab3d92a898 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 4 Jan 2022 20:26:12 +0100 Subject: [PATCH 01/15] chromiumDev: Backport important fixes for Wayland This will be required to prevent crashes on Wayland compositors that support version 4 of the wl_output protocol (available since Wayland 1.20.0). This should affect any compositor that is based on wlroots 0.15.0 and soon more. Upstream will hopefully backport those patches soon (if not we could also apply them to M97 - only two trivial changes are necessary to apply the first patch). More information: - Chromium bug report: https://bugs.chromium.org/p/chromium/issues/detail?id=1279574 - wlroots bug report: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3344 (cherry picked from commit 843508dad46d2205ea8dd81c446349d573187a87) --- .../networking/browsers/chromium/common.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7edec1f5a625..b4fdf61d1668 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -161,6 +161,18 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch + ] ++ lib.optionals (versionRange "98" "99") [ + # A critical Ozone/Wayland fix: + (githubPatch { + # [linux/wayland] Fixed terminate caused by binding to wrong version. + commit = "dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d"; + sha256 = "sha256-FH7lBQTruMzkBT2XQ+kgADmJA0AxJfaV/gvtoqfQ4a4="; + }) + (githubPatch { + # [linux/wayland] Fixed terminate caused by binding to wrong version. (fixup) + commit = "a84b79daa8897b822336b8f348ef4daaae07af37"; + sha256 = "sha256-2x6/rGGzTC6lKLMkVyD9RNCTsMVrtRQyr/NjSpaj2is="; + }) ]; postPatch = '' From e812cb81e0ea41fddb5aed0076343b84972df987 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 11 Jan 2022 23:36:46 +0100 Subject: [PATCH 02/15] chromiumBeta: 97.0.4692.71 -> 98.0.4758.48 (cherry picked from commit 1be7e7673151a6c07ef8b5da9204e10790b1f029) --- .../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 d1c35161b74a..2f8544e0c27f 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": "97.0.4692.71", - "sha256": "0z7ximvm4a78kxyp4j0i2jzklxazpw6jcqi9jkaf8bvq9ga8kqca", - "sha256bin64": "18wr4pgzfcvvdpvvxhpd4as2qnyggq9f8z90ikdz8yj8i71l5wnc", + "version": "98.0.4758.48", + "sha256": "0c6lxmr8xxjhifm28v9ri05v5al9ph6infksx9qgd045svmfynxs", + "sha256bin64": "0m7vbd7fy4wrbk28hw3hy6x8yb8vyyyisnicdhkp6j0xq9ni5jhj", "deps": { "gn": { - "version": "2021-11-03", + "version": "2021-12-07", "url": "https://gn.googlesource.com/gn", - "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", - "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" + "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", + "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" } } }, From ba587e2630bcb16d8eb3b4117a448f5d29c94b13 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 11 Jan 2022 23:36:46 +0100 Subject: [PATCH 03/15] chromiumDev: 98.0.4758.9 -> 99.0.4818.0 (cherry picked from commit 9cf4be40d3023b77a9393b999f37b0be57bc90ba) --- .../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 2f8544e0c27f..49a80a41a44a 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": "98.0.4758.9", - "sha256": "1sq6v2hdhpk12w37sz7jf5vwkn72ydcqzcxysf7hs2flcfgscydj", - "sha256bin64": "1jfj08jpxji2q890zbvpvmgf5bjqgvigkr1hg8ch8vaaybs5wr04", + "version": "99.0.4818.0", + "sha256": "1k8xzmybrmwgcyg4n7x3gj486rpwic17m6i5ij9nmfzcxx7fbwlm", + "sha256bin64": "1jfqmv94ami3n6hzp9ycczqv3lh3wijsf555mg62rv4rdvw5adm6", "deps": { "gn": { - "version": "2021-12-07", + "version": "2022-01-07", "url": "https://gn.googlesource.com/gn", - "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", - "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" + "rev": "f1b1412521b41e47118b29863224171e434a27a2", + "sha256": "1cxq991by7sa5k1hvb5xx98bfqgq7rdbw3cawhyyqq91a521wsb7" } } }, From 3702a2147e4f2b86d0ae052708c38f75873da909 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 13 Jan 2022 20:14:49 +0100 Subject: [PATCH 04/15] chromiumBeta: 98.0.4758.48 -> 98.0.4758.54 (cherry picked from commit 61affb7d91b9e91da6d17130b258f00a5da18fee) --- .../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 49a80a41a44a..1eaa5e01d1c6 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": "98.0.4758.48", - "sha256": "0c6lxmr8xxjhifm28v9ri05v5al9ph6infksx9qgd045svmfynxs", - "sha256bin64": "0m7vbd7fy4wrbk28hw3hy6x8yb8vyyyisnicdhkp6j0xq9ni5jhj", + "version": "98.0.4758.54", + "sha256": "0w3pvp23y0vyj9p7j6nfxgnnzc5jyjn65k1khx0i333hs97vidbc", + "sha256bin64": "1qxkqw45jzcrg2ziqh4npg19a52b5j1hvag4n5qlrq4bfblsbwwh", "deps": { "gn": { "version": "2021-12-07", From 6f9a0da2d2f1a41ba596daafe99ef1105e2c56d7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 15 Jan 2022 20:09:44 +0100 Subject: [PATCH 05/15] chromium: Backport important fixes for Wayland This is 843508dad46 for M97 (upstream didn't backport them so far). (cherry picked from commit a8affa912c883c59f7052779a2440c796715ced8) --- .../networking/browsers/chromium/common.nix | 12 ++++++- ...-ozone-wayland-fix-surface_augmenter.patch | 31 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b4fdf61d1668..d9385ceb0427 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -161,13 +161,23 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch - ] ++ lib.optionals (versionRange "98" "99") [ + ] ++ lib.optionals (versionRange "97" "98") [ # A critical Ozone/Wayland fix: + # (Note: The patch for surface_augmenter.cc doesn't apply on M97 so we extract that part.) + (fetchpatch { + # [linux/wayland] Fixed terminate caused by binding to wrong version. + url = "https://github.com/chromium/chromium/commit/dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d.patch"; + excludes = [ "ui/ozone/platform/wayland/host/surface_augmenter.cc" ]; + sha256 = "sha256-lp4kxPNAkafdE9NfD3ittTCpomRpX9Hqhtt9GFf4Ntw="; + }) + ./patches/m97-ozone-wayland-fix-surface_augmenter.patch + ] ++ lib.optionals (versionRange "98" "99") [ (githubPatch { # [linux/wayland] Fixed terminate caused by binding to wrong version. commit = "dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d"; sha256 = "sha256-FH7lBQTruMzkBT2XQ+kgADmJA0AxJfaV/gvtoqfQ4a4="; }) + ] ++ lib.optionals (versionRange "97" "99") [ (githubPatch { # [linux/wayland] Fixed terminate caused by binding to wrong version. (fixup) commit = "a84b79daa8897b822336b8f348ef4daaae07af37"; diff --git a/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch b/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch new file mode 100644 index 000000000000..e63000fabc1c --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch @@ -0,0 +1,31 @@ +diff --git a/ui/ozone/platform/wayland/host/surface_augmenter.cc b/ui/ozone/platform/wayland/host/surface_augmenter.cc +index d971d15e71426..6e5408398bcea 100644 +--- a/ui/ozone/platform/wayland/host/surface_augmenter.cc ++++ b/ui/ozone/platform/wayland/host/surface_augmenter.cc +@@ -13,7 +13,8 @@ + namespace ui { + + namespace { +-constexpr uint32_t kMaxSurfaceAugmenterVersion = 1; ++constexpr uint32_t kMinVersion = 1; ++constexpr uint32_t kMaxVersion = 1; + } + + // static +@@ -27,11 +28,13 @@ void SurfaceAugmenter::Instantiate(WaylandConnection* connection, + uint32_t version) { + DCHECK_EQ(interface, kInterfaceName); + +- if (connection->surface_augmenter_) ++ if (connection->surface_augmenter_ || ++ !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) { + return; ++ } + +- auto augmenter = wl::Bind( +- registry, name, std::min(version, kMaxSurfaceAugmenterVersion)); ++ auto augmenter = wl::Bind(registry, name, ++ std::min(version, kMaxVersion)); + if (!augmenter) { + LOG(ERROR) << "Failed to bind surface_augmenter"; + return; From 6a5b59c2d81dcfaf6494d5efa6ea716777510ebe Mon Sep 17 00:00:00 2001 From: Brandon Weeks Date: Wed, 19 Jan 2022 11:50:11 -0800 Subject: [PATCH 06/15] google-chrome: fix hardware acceleration on Wayland (#155447) Fix #103049. (cherry picked from commit c3e8270c3a623c8230879d8eb174d31fb9382d35) --- .../networking/browsers/google-chrome/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index fe6ef5c059de..33a9e9f865cb 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -5,7 +5,7 @@ , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core -, libkrb5, libdrm, mesa +, libkrb5, libdrm, libglvnd, mesa , libxkbcommon, pipewire, wayland # ozone/wayland # Command line programs @@ -66,7 +66,7 @@ let liberation_ttf curl util-linux xdg-utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core - libkrb5 libdrm mesa coreutils + libkrb5 libdrm libglvnd mesa coreutils libxkbcommon pipewire wayland ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva @@ -119,12 +119,6 @@ in stdenv.mkDerivation { cp -a opt/* $out/share cp -a usr/share/* $out/share - # To fix --use-gl=egl: - test -e $out/share/google/$appname/libEGL.so - ln -s libEGL.so $out/share/google/$appname/libEGL.so.1 - test -e $out/share/google/$appname/libGLESv2.so - ln -s libGLESv2.so $out/share/google/$appname/libGLESv2.so.2 - substituteInPlace $out/share/applications/google-$appname.desktop \ --replace /usr/bin/google-chrome-$dist $exe substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \ From eedf3b1e18a80f2248b717862a6f21d732fc280a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 21 Jan 2022 22:01:36 +0100 Subject: [PATCH 07/15] chromiumBeta: 98.0.4758.54 -> 98.0.4758.66 (cherry picked from commit 10bc0b32d8cb72b7f56689c6f102a27975dd24b7) --- .../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 1eaa5e01d1c6..ee0f74a938ea 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": "98.0.4758.54", - "sha256": "0w3pvp23y0vyj9p7j6nfxgnnzc5jyjn65k1khx0i333hs97vidbc", - "sha256bin64": "1qxkqw45jzcrg2ziqh4npg19a52b5j1hvag4n5qlrq4bfblsbwwh", + "version": "98.0.4758.66", + "sha256": "06hdd2cy6mdiiwbrn2jawmcidxbf46z9wyklkm3mmzbrj1xrh0gd", + "sha256bin64": "0r1lmgvvxb1h6p20gzp8qwdfs4czvqyg6bgp4wb2aax1n0448rbr", "deps": { "gn": { "version": "2021-12-07", From 969006c9930c242e4b2fc5ca50a601948aecb966 Mon Sep 17 00:00:00 2001 From: Brandon Weeks Date: Tue, 18 Jan 2022 00:16:04 -0800 Subject: [PATCH 08/15] google-chrome: add /run/opengl-driver/share/vulkan/icd.d/ to path NixOS stores ICDs at /run/opengl-driver/share/vulkan/icd.d/. Because Chrome ships its own vulkan-loader and doesn't use the NixOS system vulkan-loader, Chrome won't search the /run/opengl-driver directory withou either adding it to the path or patching Chrome's libvulkan.so.1. This change adds "${addOpenGLRunpath.driverLink}/share" unconditionally to the path. addOpenGLRunpath is the same module that NixOS system vulkan-loader uses as the path. Tested by running `VK_LOADER_DEBUG=all google-chrome-unstable --enable-features=Vulkan` and verifying Vulkan is enabled with chrome://gpu. (cherry picked from commit 007af34263d102667f077363b3958e6bf4b05ea8) --- .../networking/browsers/google-chrome/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 33a9e9f865cb..e93ea8ca66d1 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -44,7 +44,7 @@ , libvaSupport ? true, libva # For Vulkan support (--enable-features=Vulkan) -, vulkanSupport ? true, vulkan-loader +, addOpenGLRunpath }: with lib; @@ -70,7 +70,6 @@ let libxkbcommon pipewire wayland ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva - ++ optional vulkanSupport vulkan-loader ++ [ gtk3 ]; suffix = if channel != "stable" then "-" + channel else ""; @@ -143,7 +142,7 @@ in stdenv.mkDerivation { makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \ --prefix LD_LIBRARY_PATH : "$rpath" \ --prefix PATH : "$binpath" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \ --add-flags ${escapeShellArg commandLineArgs} for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do From cb8e1946cdccc6ed251e1efb82b3fc29c189e017 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 22 Jan 2022 12:06:09 +0100 Subject: [PATCH 09/15] chromiumDev: 99.0.4818.0 -> 99.0.4840.0 (cherry picked from commit 9970f3d56e3f25c2426036f3e186d08ab6c59350) --- .../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 ee0f74a938ea..981861d6a2fa 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": "99.0.4818.0", - "sha256": "1k8xzmybrmwgcyg4n7x3gj486rpwic17m6i5ij9nmfzcxx7fbwlm", - "sha256bin64": "1jfqmv94ami3n6hzp9ycczqv3lh3wijsf555mg62rv4rdvw5adm6", + "version": "99.0.4840.0", + "sha256": "0l1azyd7an8nw2gjnn313gn6sljvw6lbd9g59s7d59lpn2bmbc7j", + "sha256bin64": "145qjhdmi39aaw0a3sarlgi67rjhik1xbm62rw7ba0wgnrbvvrjb", "deps": { "gn": { - "version": "2022-01-07", + "version": "2022-01-10", "url": "https://gn.googlesource.com/gn", - "rev": "f1b1412521b41e47118b29863224171e434a27a2", - "sha256": "1cxq991by7sa5k1hvb5xx98bfqgq7rdbw3cawhyyqq91a521wsb7" + "rev": "80a40b07305373617eba2d5878d353532af77da3", + "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" } } }, From 535ff955a9a0b3675a1561755b117f4d2bcd44ad Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 2 Oct 2021 11:58:08 +0200 Subject: [PATCH 10/15] chromium: get-commit-message.py: Improve the parsing The latest announcement uses the following structure: "Google is aware the exploits for CVE-2021-37975 and CVE-2021-37976 exist in the wild." (https://chromereleases.googleblog.com/2021/09/stable-channel-update-for-desktop_30.html) (cherry picked from commit d0ed7ee0b040ba45609028663d6d2c686fee7820) --- .../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 b0fbe20db8ef..85ebb8a7b935 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -39,7 +39,7 @@ for entry in feed.entries: 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)? that .+ in the wild\.', content) + zero_days = re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content) if zero_days: fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) From a6aac66897b4bf5e5bc6332b7ed270950eb3556e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 24 Jan 2022 22:02:17 +0100 Subject: [PATCH 11/15] chromiumDev: Fix the configuration phase This fixes: -------------------------------------------------------------------------------- configuring ERROR at //ui/gtk/BUILD.gn:17:1: Assertion failed. assert(use_gio, "GIO is required for building with GTK") ^----- GIO is required for building with GTK See //content/shell/BUILD.gn:308:15: which caused the file to be included. deps += [ "//ui/gtk" ] ^--------- -------------------------------------------------------------------------------- But there's still another build issue(s) left: -------------------------------------------------------------------------------- [25491/48383] ACTION //components/url_formatter/spoof_checks/top_domains:generate_top_domain_list_variables_file(//build/toolchain/linux/unbundle:default)d_tmp/browser_command.mojom-webui.jsab_page_third_party.mojom-webui.js FAILED: gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc python3 ../../build/gn_run_binary.py make_top_domain_list_variables ../../components/url_formatter/spoof_checks/top_domains/domains.list top500_domains gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc make_top_domain_list_variables failed with exit code -4 ninja: build stopped: subcommand failed. -------------------------------------------------------------------------------- (cherry picked from commit e8b241cdbad6f7c0af4115c0d733874b02f5c54f) --- 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 d9385ceb0427..74133a9d47e9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -288,7 +288,7 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; # Optional features: - use_gio = gnomeSupport; + use_gio = gnomeSupport || chromiumVersionAtLeast "99"; use_gnome_keyring = gnomeKeyringSupport; use_cups = cupsSupport; From 5971c610e493577579e2d5182bafc0663274e184 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 27 Jan 2022 23:24:22 +0100 Subject: [PATCH 12/15] chromiumBeta: 98.0.4758.66 -> 98.0.4758.74 (cherry picked from commit b0b0ffd4662c75d2e94b7382901faa782d0e7acc) --- pkgs/applications/networking/browsers/chromium/common.nix | 7 ------- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 74133a9d47e9..5640b993013b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -171,13 +171,6 @@ let sha256 = "sha256-lp4kxPNAkafdE9NfD3ittTCpomRpX9Hqhtt9GFf4Ntw="; }) ./patches/m97-ozone-wayland-fix-surface_augmenter.patch - ] ++ lib.optionals (versionRange "98" "99") [ - (githubPatch { - # [linux/wayland] Fixed terminate caused by binding to wrong version. - commit = "dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d"; - sha256 = "sha256-FH7lBQTruMzkBT2XQ+kgADmJA0AxJfaV/gvtoqfQ4a4="; - }) - ] ++ lib.optionals (versionRange "97" "99") [ (githubPatch { # [linux/wayland] Fixed terminate caused by binding to wrong version. (fixup) commit = "a84b79daa8897b822336b8f348ef4daaae07af37"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 981861d6a2fa..1ea90bec07f1 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": "98.0.4758.66", - "sha256": "06hdd2cy6mdiiwbrn2jawmcidxbf46z9wyklkm3mmzbrj1xrh0gd", - "sha256bin64": "0r1lmgvvxb1h6p20gzp8qwdfs4czvqyg6bgp4wb2aax1n0448rbr", + "version": "98.0.4758.74", + "sha256": "01v9bfq3905zqhyp78zq69ipz2b5ldsrm8yjr9qb6434zrhlcvyb", + "sha256bin64": "0p85zanpmlkxc34zhx2rybbwriwqbjmg27rrjcf76gvfljlj3g51", "deps": { "gn": { "version": "2021-12-07", From 2d27291f09896c37baba67129b9adfd177db3b37 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 29 Jan 2022 12:47:59 +0100 Subject: [PATCH 13/15] chromiumDev: 99.0.4840.0 -> 99.0.4844.11 (cherry picked from commit eb78072935d69921f7c6482ee05d1aebfb378739) --- .../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 1ea90bec07f1..0b87355bdd64 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": "99.0.4840.0", - "sha256": "0l1azyd7an8nw2gjnn313gn6sljvw6lbd9g59s7d59lpn2bmbc7j", - "sha256bin64": "145qjhdmi39aaw0a3sarlgi67rjhik1xbm62rw7ba0wgnrbvvrjb", + "version": "99.0.4844.11", + "sha256": "1jkcif839yrhsckx5j1jqsmkhlvhm1gqk3mhvji1mfi4rg1dfd0l", + "sha256bin64": "01vl7ah3jkryrfnjidv8yq490hyqll6gd0vddy0b98wgyn3h593h", "deps": { "gn": { "version": "2022-01-10", From d303befb57524cb773758c487f48f6ee3274667f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 1 Feb 2022 21:46:26 +0100 Subject: [PATCH 14/15] chromiumBeta: 98.0.4758.74 -> 98.0.4758.80 (cherry picked from commit 87711ba56b6b74c5bbc2b6f4bbbaa48ea07e0d25) --- .../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 0b87355bdd64..ec3b84faa1b4 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": "98.0.4758.74", - "sha256": "01v9bfq3905zqhyp78zq69ipz2b5ldsrm8yjr9qb6434zrhlcvyb", - "sha256bin64": "0p85zanpmlkxc34zhx2rybbwriwqbjmg27rrjcf76gvfljlj3g51", + "version": "98.0.4758.80", + "sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8", + "sha256bin64": "12a69cbv2sbrly6g477ln4pssh8n1rdg6mr6cc17iy2jhfihry0q", "deps": { "gn": { "version": "2021-12-07", From 1994dfa21dd7f6daa271d2344d80e8686247e592 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 2 Feb 2022 19:36:55 +0100 Subject: [PATCH 15/15] chromiumDev: 99.0.4844.11 -> 99.0.4844.16 (cherry picked from commit 47f0427d1523f7fe2ebb7430fe5809451e59d1b3) --- .../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 ec3b84faa1b4..0fa6dcb35808 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": "99.0.4844.11", - "sha256": "1jkcif839yrhsckx5j1jqsmkhlvhm1gqk3mhvji1mfi4rg1dfd0l", - "sha256bin64": "01vl7ah3jkryrfnjidv8yq490hyqll6gd0vddy0b98wgyn3h593h", + "version": "99.0.4844.16", + "sha256": "0xig6l1yx9glgb1a53idncnqc1imjvbszi5mrp39yvijarmx8s1f", + "sha256bin64": "18p2hqykizijb9w96dm8yxwgvpjx37vabyw6n9wc59l6wyhbjkkw", "deps": { "gn": { "version": "2022-01-10",