diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 618633935213..cdfdcc9bcdd2 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -166,6 +166,8 @@ mapAttrs (channel: chromiumPkg: makeTest { clipboard = machine.succeed( ru("${pkgs.xclip}/bin/xclip -o") ) + if url == "chrome://gpu": + clipboard = "" # TODO: We cannot copy the text via Ctrl+a print(f"{description} window content:\n{clipboard}") with machine.nested(description): yield clipboard @@ -246,11 +248,10 @@ mapAttrs (channel: chromiumPkg: makeTest { machine.screenshot("after_copy_from_chromium") - if major_version < "107": - # TODO: Fix the chrome://gpu test for M107+ - with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"): - # To check the text rendering (catches regressions like #131074): - machine.wait_for_text("Graphics Feature Status") + with test_new_win("gpu_info", "chrome://gpu", "GPU Internals"): + # To check the text rendering (catches regressions like #131074): + machine.wait_for_text("Graphics Feature Status") + # TODO: Fix copying all of the text to the clipboard with test_new_win("version_info", "chrome://version", "About Version") as clipboard: diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9c9d4c8408ab..6bd002789504 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -295,7 +295,15 @@ let chrome_pgo_phase = 0; clang_base_path = "${llvmPackages.clang}"; use_qt = false; + } // optionalAttrs (!chromiumVersionAtLeast "108") { use_system_libwayland_server = true; + } // optionalAttrs (chromiumVersionAtLeast "108") { + # The default has changed to false. We'll build with libwayland from + # Nixpkgs for now but might want to eventually use the bundled libwayland + # as well to avoid incompatibilities (if this continues to be a problem + # from time to time): + use_system_libwayland = true; + system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 542cd9413a38..0dcd4c96c219 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,22 +19,9 @@ } }, "beta": { - "version": "107.0.5304.62", - "sha256": "1w77id89gszichqxsrqgkb3v0kf26fic5p3y1ndgrw86d8kilgpj", - "sha256bin64": "0lc08mc1540w4chscq813pmiavvx32qfb581w7lh9ayby15j2nkk", - "deps": { - "gn": { - "version": "2022-09-14", - "url": "https://gn.googlesource.com/gn", - "rev": "fff29c1b3f9703ea449f720fe70fa73575ef24e5", - "sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp" - } - } - }, - "dev": { - "version": "108.0.5359.10", - "sha256": "1wmb3qxd126j3466h8wb2fsfy92218rv812sxxqdbpyf2z66m8pj", - "sha256bin64": "0vv64hqx5wf8qsm3z518wv9phipb7nbg6kj5mghx55rn20qmfpbr", + "version": "108.0.5359.71", + "sha256": "0pgzf6xrd71is1dld1arhq366vjp8p54x75zyx6y7vcjqj0a0v6b", + "sha256bin64": "14sarqyw2pdcnkk2xnsdq58wg0s576fjvqfg0ishprm7ndks1z6m", "deps": { "gn": { "version": "2022-10-05", @@ -44,6 +31,19 @@ } } }, + "dev": { + "version": "109.0.5414.10", + "sha256": "05yhfb5gznllh9rm6jhzaakj5kvdlxa8c4zqml10h297dbyr44bf", + "sha256bin64": "01fzjxrgzhccj75gvqj5w2xhqrphwzycdfqbsd6nc5p08jizpvy0", + "deps": { + "gn": { + "version": "2022-11-10", + "url": "https://gn.googlesource.com/gn", + "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", + "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" + } + } + }, "ungoogled-chromium": { "version": "107.0.5304.122", "sha256": "0f2jdvlnp1s5ia01lnqk0ykqji2x4ab9g4kxk637n4csf0i1gj85",