Unverified Commit 2283e8b8 authored by Emily's avatar Emily Committed by GitHub
Browse files

chromium,chromedriver: 143.0.7499.192 -> 144.0.7559.59 (#480078)

parents aafa6e42 44a39550

pkgs/applications/networking/browsers/chromium/common.nix

+21 −2
Original line number Diff line number Diff line
@@ -196,6 +196,14 @@ let 
      }

    );



  rustTools = symlinkJoin {

    name = "rustTools";

    paths = [

      buildPackages.rust-bindgen

      buildPackages.rustfmt

    ];

  };



  chromiumRosettaStone = {

    cpu =

      platform:
@@ -598,6 +606,11 @@ let 
        revert = true;

        hash = "sha256-bYcJqPMbE7hMvhZVnzqHok1crUAdqrzqxr+4IHNzAtg=";

      })

    ]

    ++ lib.optionals (chromiumVersionAtLeast "144") [

      # Patch rustc_nightly_capability to eval to false instead of true.

      # https://chromium-review.googlesource.com/c/chromium/src/+/7022369

      ./patches/chromium-144-rustc_nightly_capability.patch

    ];



    postPatch =
@@ -835,7 +848,8 @@ let 
        use_system_libffi = true;

        # Use nixpkgs Rust compiler instead of the one shipped by Chromium.

        rust_sysroot_absolute = "${buildPackages.rustc}";

        rust_bindgen_root = "${buildPackages.rust-bindgen}";

        rust_bindgen_root =

          if chromiumVersionAtLeast "144" then "${rustTools}" else "${buildPackages.rust-bindgen}";

        enable_rust = true;

        # While we technically don't need the cache-invalidation rustc_version provides, rustc_version

        # is still used in some scripts (e.g. build/rust/std/find_std_rlibs.py).
@@ -906,7 +920,12 @@ let 
          TERM=dumb ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}"

          bash -s << EOL

          (

            source chrome/installer/linux/common/installer.include

            source ${

              if chromiumVersionAtLeast "144" then

                "remoting/host/installer/linux/"

              else

                "chrome/installer/linux/common"

            }/installer.include

            PACKAGE=$packageName

            MENUNAME="Chromium"

            process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1"

pkgs/applications/networking/browsers/chromium/info.json

+140 −140

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/browsers/chromium/patches/chromium-144-rustc_nightly_capability.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/build/config/rust.gni b/build/config/rust.gni

index ef45a4a9a6daa45859df27fa00bd17d6ee87aa21..b46cb483330133dd0a02e9b276979dc3a94f2520 100644

--- a/build/config/rust.gni

+++ b/build/config/rust.gni

@@ -112,7 +112,7 @@ use_chromium_rust_toolchain = rust_sysroot_absolute == ""

 # `rustc_nightly_capability = false` will make the build avoid the use of

 # Rust nightly features. There are no bots that test this and there is no

 # guarantee it will work, but we accept patches for this configuration.

-rustc_nightly_capability = use_chromium_rust_toolchain

+rustc_nightly_capability = true

 

 # Platform support for the Rust toolchain.

 chromium_toolchain_supports_platform = !is_wasm