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

chromium,chromedriver: 128.0.6613.137 -> 129.0.6668.58 (#342721)

parents cea14594 3277484e

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

+4 −1
Original line number Diff line number Diff line
@@ -312,9 +312,12 @@ let 
      # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61

      # allowing us to use our rustc and our clang.

      ./patches/chromium-121-rust.patch

    ] ++ lib.optionals (chromiumVersionAtLeast "126") [

    ] ++ lib.optionals (versionRange "126" "129") [

      # Rebased variant of patch right above to build M126+ with our rust and our clang.

      ./patches/chromium-126-rust.patch

    ] ++ lib.optionals (chromiumVersionAtLeast "129") [

      # Rebased variant of patch right above to build M129+ with our rust and our clang.

      ./patches/chromium-129-rust.patch

    ];



    postPatch = ''

pkgs/applications/networking/browsers/chromium/patches/chromium-129-rust.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn

index 45086d6838cac..81132ad8ecb31 100644

--- a/build/config/compiler/BUILD.gn

+++ b/build/config/compiler/BUILD.gn

@@ -1727,16 +1727,6 @@ config("runtime_library") {

     configs += [ "//build/config/c++:runtime_library" ]

   }

 

-  # Rust and C++ both provide intrinsics for LLVM to call for math operations. We

-  # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins

-  # library. The Rust symbols are marked as weak, so that they can be replaced by

-  # the C++ symbols. This config ensures the C++ symbols exist and are strong in

-  # order to cause that replacement to occur by explicitly linking in clang's

-  # compiler-rt library.

-  if (is_clang && !is_nacl && !is_cronet_build) {

-    configs += [ "//build/config/clang:compiler_builtins" ]

-  }

-

   # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia

   # configuration.

   if (is_posix || is_fuchsia) {

pkgs/applications/networking/browsers/chromium/upstream-info.nix

+9 −9
Original line number Diff line number Diff line 
{

  stable = {

    chromedriver = {

      hash_darwin = "sha256-UtBJZG+pRdqwxWsvuxYrRJsmFdMEa5h6lWXt39cPxF0=";

      hash_darwin = "sha256-303weqU04cCCwlLlSVnEyvKvHu09RjGFLmg5cf/exss=";

      hash_darwin_aarch64 =

        "sha256-2HFrIwc8Jzlg6/eKkJqfd8kwS8c6powU2RnpBGMSBak=";

      hash_linux = "sha256-8EEJL0A/t0VabaKHEHC2WHwygUo+PCsKeU09SqRzkVE=";

      version = "128.0.6613.137";

        "sha256-TybJYKeMzm9FQp0Jqx82VF1OOiVSpS/QgNUEDlWG7Uc=";

      hash_linux = "sha256-D8aKGKnbFT6YUhyhZUuz/XhCrUVS+Y7I7GaI6Qfv2bE=";

      version = "129.0.6668.58";

    };

    deps = {

      gn = {

        hash = "sha256-BiMGbML5aNUt4JzzVqSszBj+8BMlEc92csNugo5qjUk=";

        rev = "b2afae122eeb6ce09c52d63f67dc53fc517dbdc8";

        hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA=";

        rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad";

        url = "https://gn.googlesource.com/gn";

        version = "2024-06-11";

        version = "2024-08-19";

      };

    };

    hash = "sha256-/q+Z1a1EFZRQvC3pmuDbzJWzSSYkI7bfgUAaJRBaj00=";

    version = "128.0.6613.137";

    hash = "sha256-8dKWu2/ZKw5ZthH1s5wR+h9b0aIqlDhNsPUrlE9DMQg=";

    version = "129.0.6668.58";

  };

  ungoogled-chromium = {

    deps = {