diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c0860758d2b3..1c43346c1fb9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -802,10 +802,12 @@ let runHook postConfigure ''; - # Don't spam warnings about unknown warning options. This is useful because + # Mute some warnings that are enabled by default. This is useful because # our Clang is always older than Chromium's and the build logs have a size # of approx. 25 MB without this option (and this saves e.g. 66 %). - env.NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; + env.NIX_CFLAGS_COMPILE = + "-Wno-unknown-warning-option" + + lib.optionalString (chromiumVersionAtLeast "135") " -Wno-unused-command-line-argument -Wno-shadow"; env.BUILD_CC = "$CC_FOR_BUILD"; env.BUILD_CXX = "$CXX_FOR_BUILD"; env.BUILD_AR = "$AR_FOR_BUILD"; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 4fcc0be6d3f8..b687e910b4b7 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,26 +1,27 @@ { "chromium": { - "version": "134.0.6998.165", + "version": "135.0.7049.52", "chromedriver": { - "hash_darwin": "sha256-yiURcjAoIksCZYJMTVygUtud+IQcKSDDDdGlXMHWtFY=", - "hash_darwin_aarch64": "sha256-pkZBqQL7UqT9BWRbrdnbVn+u3Obth1g+0B/PPnAJj40=" + "version": "135.0.7049.42", + "hash_darwin": "sha256-CixR0TvndAgxvXYbetIqKg6NRu/z3pJe+USCZ0pyQd4=", + "hash_darwin_aarch64": "sha256-WKDi97j1F9+I6RYOsdiXVrgVibZ3ZoVPljo1XAtw0o8=" }, "deps": { "depot_tools": { - "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688", - "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk=" + "rev": "85ec2718b5a29990c7eb67778348c9f76a00f392", + "hash": "sha256-eWlHnSRfLFcd3OoyCTIFewDf0eC9KQowScQOnphgfg8=" }, "gn": { - "rev": "ed1abc107815210dc66ec439542bee2f6cbabc00", - "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U=" + "rev": "4a8016dc391553fa1644c0740cc04eaac844121e", + "hash": "sha256-8NynNvLNCHxy8EYmsnPovKhXu9DcDcYBhg4A6d2QIfY=" }, - "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=" + "npmHash": "sha256-wNrZaugdKJCyV1WchkKXzr/I1OW1AtjiC2p7qTZZOqU=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "fd886e2cb29dd984c13deec032832dee68d8abe3", - "hash": "sha256-xD06hGSrccTGB6fUGw0b7RrGNBQjNmdGKPaRqhXVVOY=", + "rev": "9ba7e609d28c509a8ce9265c2247065d8d251173", + "hash": "sha256-PjvfckdlaMq9HWefGxFppgBumlqh7xoCoxYFwk/r630=", "recompress": true }, "src/third_party/clang-format/script": { @@ -30,23 +31,23 @@ }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "2e25154d49c29fa9aa42c30ad4a027bd30123434", - "hash": "sha256-QxEbtsEKCs2Xgulq7nVWtAeOGkIYFOy/L1ROfXa5u8U=" + "rev": "7f8b68f91ca8b192375f5e71cd81fb3ed9650ef3", + "hash": "sha256-1P+p5MPXm0WkeYgzIxG2SBKZVPWplUlEo7xYI//Y0uw=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "634228a732a1d9ae1a6d459556e8fc58707cf961", - "hash": "sha256-ln/DCNYJXVksbwdDBnxCfc4VwtjQlJXF7ktl/NxLupg=" + "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d", + "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g=" }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "e55d8cf51c6db1fdd4bb56c158945ec59772c8ee", - "hash": "sha256-JazjgI+ch9RgnsDgu6p4cT4UmCBor4x4sRi1ClLISAY=" + "rev": "62e217a12ee1133833d9890b2f7adde900e4efbd", + "hash": "sha256-FBMrvCCVwm0mmaQHDvKXljxxLwthpsFqhPE8yqBx5Aw=" }, "src/third_party/llvm-libc/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", - "rev": "6d0c8ee02e2fd44e69ac30e721e13be463035ee5", - "hash": "sha256-bF4hV9fY0GLYAHUnxSXkCxdZLMKR3wYWaqYJaM9aQiE=" + "rev": "a02de4d0d992b110c8b180fdec91258e7b60265f", + "hash": "sha256-LtxaimMmnman7BKLKpSR8rJtbEvHsmGVeHvzEukB4EY=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -65,8 +66,8 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "600fc3a0b121d5007b4bb97b001e756625e6d418", - "hash": "sha256-f3Tdz0ykxQ2FHbNweJwPdAZHA8eVpjPuxqRpxwhYtRM=" + "rev": "441c86221443f48e818335d51f84cf1880c35aa4", + "hash": "sha256-nMLn2wTAr+3U1VpqWWq93zJHrlT+f1Yky8ONKk0kWjg=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", @@ -75,8 +76,8 @@ }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "e7d001c82ee5bead5140481671828d5e156a525a", - "hash": "sha256-5YFqWgkyQ/PUKTkk1j3mAFD8JMbI+E4XRdSq34HFMWA=" + "rev": "25a56e315359eaebb2ff4213771016a4978a346d", + "hash": "sha256-ZkrAaNgCqG09CufQN35wFi09TVxvbf/U4jGNNMRLY0M=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", @@ -90,13 +91,13 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "914c97c116e09ef01a99fbbbe9cd28cda56552c7", - "hash": "sha256-Y4eX8YHwVXiXW4U8KGbFd4fTU/v/EAUpfwv6lB127Y4=" + "rev": "079266db445215380befce453b1ab3bbdfeaf73d", + "hash": "sha256-Bcm9wxlLqp/ANg+cPvsuwAlaxVmef6g+12L5ZE4uCGA=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", - "rev": "cb550a25c75a99ae0def91a02e16ae29d73e6d1e", - "hash": "sha256-kqBpWHCxUl1ekmrbdPn6cL2y75nK4FxECJ5mo83Zgf4=" + "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8", + "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw=" }, "src/third_party/angle/third_party/rapidjson/src": { "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", @@ -105,8 +106,8 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "48e7f3020f52ef9adc31aa0f5db01dc42cc487cd", - "hash": "sha256-g59uC7feByGR1Ema8LqUCr5XWKpDMeXXvlS2thOo5Ks=" + "rev": "ba86fb95004331f2cf571dd9adefe2458290ee11", + "hash": "sha256-wl/T/WxVNctM4m4VSFFqqtJ0xkEBiuILYywAylqa0Oo=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", @@ -120,13 +121,13 @@ }, "src/third_party/dav1d/libdav1d": { "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "42b2b24fb8819f1ed3643aa9cf2a62f03868e3aa", - "hash": "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g=" + "rev": "7d4b789f55389dad1820d6caf6a650038dad06e2", + "hash": "sha256-O6WOm6qTSgRmDR+yY2wH6t+7ob+TtZIA5Gax1ysEZh0=" }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "7056f50fdefc6bc46aa442e720d0336e2855b570", - "hash": "sha256-aYlcplXSGjFov9dqql6d+a1PxJWtZJNQaaezof0u9QQ=" + "rev": "bdc68b25b620d7302a955e2c38c548ebfe74ef31", + "hash": "sha256-R9SQiKUjLkLmPJwuWpw7fcibrWxSlXWkDsCra7Ci0UQ=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -135,8 +136,8 @@ }, "src/third_party/dawn/third_party/dxc": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "c2ed9ad4ee775f3de903ce757c994aecc59a5306", - "hash": "sha256-jecGwARtdSr2OEC68749mpFUAHuYP/IzYUZyj23CwJE=" + "rev": "0a1143572d107c8b6980df092b84a79190ec1fbd", + "hash": "sha256-sUSQTOi0EuIHX9h27RXb5HnbcdfkG/U1K6EbBdjSto8=" }, "src/third_party/dawn/third_party/dxheaders": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -155,8 +156,8 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "24d5dfa7725d6ece31941c3f3343ba6362986d6b", - "hash": "sha256-AEGYE2rSsPcRzJSm97DGsrPVbhCH+lyVI61Z4qavKc8=" + "rev": "ce91fc1d085136f9c7ddca684d1764689d49b337", + "hash": "sha256-SsxohjLb+uoN5cMXU5DJDrtF1QVk8EWK/qvTLxCleUI=" }, "src/third_party/highway/src": { "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", @@ -170,8 +171,8 @@ }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "ea42fe28775844ec8fe0444fc421398be42d51fe", - "hash": "sha256-g9i5v11uZy/3Smn8zSCFmC27Gdp5VP2b0ROrj+VmP1k=" + "rev": "673e61fc215b178a90c0e67858bbf162c8158993", + "hash": "sha256-8Dl6Aol33o2FYID3oIw9grB0jY9VJnnnhmiNdyycTlU=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", @@ -180,13 +181,13 @@ }, "src/third_party/cast_core/public/src": { "url": "https://chromium.googlesource.com/cast_core/public", - "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05", - "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c=" + "rev": "dcb3d2e87cebe20b6dda06d8b29abb9af27ca422", + "hash": "sha256-e8+rQhEU5+FfwjyEE1TM6emO0cUntuS4GN7y/BuC/U8=" }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "d5166861902b565df446e15181eba270fe168275", - "hash": "sha256-xkvz743+w0xsI0w4reAo2rfC4J7opl1biA3eNYuRn+o=" + "rev": "93e56257a5089dc49f1dfd1240c527f5fe1b237f", + "hash": "sha256-K5sOlXx72YmXlm7cc7jWf3lKmHcMdVHTwVueJo5CoHY=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", @@ -195,8 +196,8 @@ }, "src/third_party/chromium-variations": { "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "84c18c7a0205fbd0a27b0214b16ded7fc44dc062", - "hash": "sha256-zXAmoKyj104BaIe4Rug18WbVKkyAsyWPCTPPEerinVo=" + "rev": "270a25f8795caf0a798ebf5a7d69284e3d830d19", + "hash": "sha256-ZkETD+Pka5vItN70nhlGQelycFAEnb1Qfv9k2aDXZSE=" }, "src/third_party/cld_3/src": { "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", @@ -215,8 +216,8 @@ }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6", - "hash": "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo=" + "rev": "aaac07ee499895770c89163ce0920ef8bb41ed23", + "hash": "sha256-A86nAbKs7trVwwa1HFUNbV//6O1minvlHTpZR3vabrU=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -225,23 +226,23 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "ea21b22629965105426f3df5e58190513e95a17e", - "hash": "sha256-xUaGf4MaEXg2RHgrGS1Uuz97vq5Vbt4HFV/AXYB4lCA=" + "rev": "b8d797a61689892adb182c9bec457c9bd24b26d2", + "hash": "sha256-44bD1nG7CRrvBcd9NbU4yksn7Ly9WYsWETXat/L3f0I=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "0391f0d11cbf3cf3c5bcf82e19e9d9839b1936ed", - "hash": "sha256-EL+lOTe1Vzg4JW2q7t3UoXzHHiEmLjf7khH9fXdplbo=" + "rev": "bf8d1d3aaf469343576db89f81df26aeb16bd62b", + "hash": "sha256-XscXxoCUSVGsBCB8xymEsaLc4WgzZPXu6zkRbv8ZQZw=" }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688", - "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk=" + "rev": "85ec2718b5a29990c7eb67778348c9f76a00f392", + "hash": "sha256-eWlHnSRfLFcd3OoyCTIFewDf0eC9KQowScQOnphgfg8=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "65b3f414b81ffe4df49202af6fc75bc26a3cb109", - "hash": "sha256-rdBpJWdQ5VtFnIfbr/Vq1q1euSvkbY8iIqyuTMAS2KM=" + "rev": "ad4e2fc82183b1463ac870818c28680bbc3de889", + "hash": "sha256-HS5O+r0GFe3Dfh+86JQlsEC+5Gcs1xmUkDyZ7qixqXw=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -250,8 +251,8 @@ }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "2a35a917be47766a895be610bedd66006980b7e6", - "hash": "sha256-WG7uiduuMnXrvEpXJNGksrYkBsim+l7eiu5N+mx0Yr0=" + "rev": "4c38131a16803130b66266a912029504f2cf23cd", + "hash": "sha256-dOq8RJ/V8kulSMK0OUWzHruiwJSP3f/86ih5gk2MMWQ=" }, "src/third_party/farmhash/src": { "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", @@ -265,8 +266,8 @@ }, "src/third_party/ffmpeg": { "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "d10a0f8bf5ddcce572df95105152bc74041cae0c", - "hash": "sha256-OXumpRb9XB38dOCJmL3jDcabiJ08wAvydVlJwMgpCoQ=" + "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6", + "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM=" }, "src/third_party/flac": { "url": "https://chromium.googlesource.com/chromium/deps/flac.git", @@ -293,15 +294,10 @@ "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=" }, - "src/third_party/grpc/src": { - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", - "rev": "a363b6c001139b9c8ffb7cd63f60a72f15349c3b", - "hash": "sha256-RKGZWtH2JmP2mXN+4ln/nCJvOyzynrYcfrxSY8k1vVg=" - }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "b1f47850878d232eea372ab167e760ccac4c4e32", - "hash": "sha256-YxWz3O9see1dktqZnC551V12yU5jcOERTB1Hn1lwUNM=" + "rev": "5d4e649f740c675426fbe4cdaffc53ee2a4cb954", + "hash": "sha256-DxLHuzIvw7WIKKMCRBz4ne97j9DufoohXQZV6yZ5zfY=" }, "src/third_party/freetype-testing/src": { "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", @@ -315,8 +311,8 @@ }, "src/third_party/harfbuzz-ng/src": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "6d8035a99c279e32183ad063f0de201ef1b2f05c", - "hash": "sha256-isQvwaVdL4cM465A8Gs06VioAu8RvZFrwXDsXhfOoFo=" + "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce", + "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw=" }, "src/third_party/ink/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink.git", @@ -350,8 +346,8 @@ }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "e235eb34c6c4fed790ccdad4b16394301360dcd4", - "hash": "sha256-jpXIcz5Uy6fDEvxTq8rTFx/M+0+SQ6TCDaqnp7nMtng=" + "rev": "24a9e940d481f992ba852599c78bb2217362847b", + "hash": "sha256-oLknxClUh7l72ZAx7sxNDM6dUhMT0vUE2IdDjRLDKtk=" }, "src/third_party/hunspell_dictionaries": { "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", @@ -380,8 +376,8 @@ }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "44ac6c2594a880edbb9cb1e4e197c2b53d078130", - "hash": "sha256-AKXKxXqOMUb3APf5r15NmIMyhJ4ZmW5+t7y5XdgdZkw=" + "rev": "a32ca113e3b050693e4bb379525dfae519ebd0d9", + "hash": "sha256-eoV+g/QVzcI7PqDmAic5Ra9K/ba4IV1wXE4RFecuMuk=" }, "src/third_party/domato/src": { "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git", @@ -395,18 +391,18 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "3990233fc06a35944d6d33797e63931802122a95", - "hash": "sha256-4NOQug0MlWZ18527V3IDuGcxGEJ4b+mZZbdzugWoBgQ=" + "rev": "99fcd816eeaa7da46688bc4b9f4f9e71be13c2e8", + "hash": "sha256-SOIvGkR3k7TAs9KFA3mFbBSq5h4eJghKo38IVioOK3U=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", - "rev": "c5938b119ef52f9ff628436c1e66c9a5322ece83", - "hash": "sha256-+6339vcd0KJj5V11dvJvs0YpQpTxsLmDuBoYVzyn9Ec=" + "rev": "a75457c637a365910508f3c2c2b986a701b03a2e", + "hash": "sha256-v3+Rj3jS/lCYZNjjAXB6zohdvM45PKayB43jX37ntsU=" }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "97690c6996f683a6f3e07d75fc4557958c55ac7b", - "hash": "sha256-d1D9/6d7a1+27nD8VijhzRMglE2PqvAMK8+GbMeesSQ=" + "rev": "45d6317a64aad3d5060b800db267f7cea3f27198", + "hash": "sha256-SmU+c9YveQ4N13bteuhtmo0uvySeCnmZYpC5NYiMJuo=" }, "src/third_party/beto-core/src": { "url": "https://beto-core.googlesource.com/beto-core.git", @@ -423,21 +419,26 @@ "rev": "d6b5ffea959ad31e231c203d7446bf8b39e987ce", "hash": "sha256-lCwGk4Q+OXwO8vOlOQrkgygYqLrwpku/PkR03oEdX3Y=" }, + "src/third_party/speedometer/v3.1": { + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", + "rev": "cc9ee085ae18f05961ff3dfa1ee1a90d67b7f8ee", + "hash": "sha256-28vGPZLaD9xSwursTRRK1xndedeBUZ5TF/4hdy0RjFc=" + }, "src/third_party/speedometer/v3.0": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=" }, - "src/third_party/speedometer/v2.0": { - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "732af0dfe867f8815e662ac637357e55f285dbbb", - "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=" - }, "src/third_party/speedometer/v2.1": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", "rev": "8bf7946e39e47c875c00767177197aea5727e84a", "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=" }, + "src/third_party/speedometer/v2.0": { + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", + "rev": "732af0dfe867f8815e662ac637357e55f285dbbb", + "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=" + }, "src/third_party/ukey2/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", @@ -445,8 +446,8 @@ }, "src/third_party/cros-components/src": { "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "1f1c782f06956a2deb5d33f09c466e4852099c71", - "hash": "sha256-80WqSMP5Vlc4OY+gfpU3SRGavs7fJbTQVW1AIhq6jmE=" + "rev": "97dc8c7a1df880206cc54d9913a7e9d73677072a", + "hash": "sha256-CT9c4LqTwhldsxoEny8MesULwQC4k95F4tfCtRZErGM=" }, "src/third_party/libdrm/src": { "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", @@ -480,8 +481,8 @@ }, "src/third_party/libprotobuf-mutator/src": { "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", - "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=" + "rev": "7bf98f78a30b067e22420ff699348f084f802e12", + "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE=" }, "src/third_party/libsrtp": { "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", @@ -500,8 +501,8 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "7b3fa8114cf8ef23cbf91e50c368c1ca768d95d5", - "hash": "sha256-2FgBb0HzgMihGsWbEtQqyN2EXZs/y5+ToWL1ZXG35W0=" + "rev": "2bfb9f9e0a9cca18cd5a0045e931b49dac390c79", + "hash": "sha256-BWid6iU7CDEElh8j13a+S767vwnO8qQg26Vp5nQGEHc=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", @@ -515,8 +516,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "5a9a6ea936085310f3b9fbd4a774868e6a984ec4", - "hash": "sha256-E5ePVHrEXMM8mS1qaUwPTqYO0BdP7TYuUhfX+BCiq/0=" + "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad", + "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -545,18 +546,18 @@ }, "src/third_party/openh264/src": { "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", - "rev": "33f7f48613258446decb33b3575fc0a3c9ed14e3", - "hash": "sha256-lZlZjX8GCJOc77VJ9i1fSWn63pfVOEcwwlzh0UpIgy4=" + "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f", + "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=" }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "38d1445b41d1eb597fcd100688dbaff98aa072ed", - "hash": "sha256-KGVFyGp7ItKeapub3Bd+htXH/gMaaBd+k8iC7hLtvl0=" + "rev": "b756f3c04ba53983a94cd12eb29b7f22e472fd58", + "hash": "sha256-P6vAoVF1/geM6MjihcEBQtbf8CxE8sPSKTRLz8/c2yE=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", - "rev": "56013b77b6c0a650d00bde40e750e7c3b7c6bc3d", - "hash": "sha256-Dz7wMYQHVR7sjCGaQe2nxIxZsAxsK6GGDNpDvypPefo=" + "rev": "00459762409cb29cecf398a23cdb0cae918b7515", + "hash": "sha256-QXGJRGyyuN0EPDAF7CAzcTSbjHkz8FRjhqd1JEFF/1o=" }, "src/third_party/openscreen/src/third_party/tinycbor/src": { "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", @@ -565,23 +566,23 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "12f7715a6390050c5cffb7e4c9b2be1c2f2956d0", - "hash": "sha256-/u+HYjmxSIX2GlriEWYZQJ8TDFNfzSufATGq1j9zx9w=" + "rev": "9afffebfa895ea6cdcc05516908c50bd7fe72797", + "hash": "sha256-89rJdhwUJtJCMO7FvVoTYO80swFRkoWUB/ZYs1tOLzE=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "0d78d85c2bfb993ab8dd9a85b6fee6caa6a0f357", - "hash": "sha256-bjgSwq4LPz9qN9rVqIJUTHetRguCx67Uq5oe1ksPqGE=" + "rev": "aa4d8267bafad6782a1f2c8d979104f2aaa622a0", + "hash": "sha256-smVQykQVZdhybEUz7BlRLc+FVNH0UyGh+0eSxP8Jzrc=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", - "rev": "e34549db516f8712f678fcd4bc411613b5cc5295", - "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=" + "rev": "426b2e025aa59c23a1b6e19fbacd6b4a11bfad16", + "hash": "sha256-5uieIE6ygM4Ooz9xbu1NVKCHHsPn6Ekz6OzqfWiA7/M=" }, "src/third_party/pthreadpool/src": { "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git", - "rev": "e1469417238e13eebaa001779fa031ed25c59def", - "hash": "sha256-cFRELaRtWspZaqtmdKmVPqM7HVskHlFMAny+Zv/Zflw=" + "rev": "f94ab76fe99754960035d520dce28e15b647e8cf", + "hash": "sha256-NdKKMnXZ6rYOC2wA6a1bPNStxpemzGckN6PPWom6mFA=" }, "src/third_party/pyelftools": { "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", @@ -600,8 +601,8 @@ }, "src/third_party/re2/src": { "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca", - "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=" + "rev": "c84a140c93352cdabbfb547c531be34515b12228", + "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=" }, "src/third_party/ruy/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", @@ -610,13 +611,13 @@ }, "src/third_party/search_engines_data/resources": { "url": "https://chromium.googlesource.com/external/search_engines_data.git", - "rev": "6dc3b54b420e6e03a34ee7259fcd2b1978fac5f3", - "hash": "sha256-8RY3AU2V4iZKEmVwT7Z1Q3QlcTXDIdeyYwnQoyJcAUY=" + "rev": "48ba13bfb5488755a5d72aa60ff4a47069be498f", + "hash": "sha256-//z0HlMOkGTcp1IjbS0m+0dmgVYsG7EkfCiK2vvG2wU=" }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125", - "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw=" + "rev": "b99f146a03d3c98049768fd91c2bbe6594b02b2c", + "hash": "sha256-tl1GDmcStkuKMmzzsYuRG6Nrk4xDqgYYBoa1VsQNOwY=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -635,8 +636,8 @@ }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "86cf34f50cbe5a9f35da7eedad0f4d4127fb8342", - "hash": "sha256-PSkIU8zC+4AVcYu0vaYo6I1SSykrHgcgGVMBJanux8o=" + "rev": "c12c13839d689f411911326b1f72e96eb525686c", + "hash": "sha256-C8y5ShwMffNZpFuILYNw3WOMVJp/jPen/wNbFl1vqBY=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -645,18 +646,18 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "51c6eed226abcfeeb46864e837d01563cc5b907b", - "hash": "sha256-qXHENS/6NwHAr1/16eb079XzmwAnpLtVZuva8uGCf+8=" + "rev": "d120e39920c0e61cc1227bc1abe50fd6ecd3ce66", + "hash": "sha256-9p0/tR3bPvCJn+6eofmQXKbyfzxfbeVexdvuHpn50wk=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "2e4b45a53a0e2e66bcb6540ae384c53a517218d0", - "hash": "sha256-9ebWETg/fsS4MYZg74XHs/Nz3nX6BXBNVRN2PmyWXWM=" + "rev": "c1c31f4d17a9e4b2af40d85c89d573eb43187e0d", + "hash": "sha256-uEsy4PBhO3EBJF6YdWj32GmMabgKWQJUeW3cWInAinE=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "0549c7127c2fbab2904892c9d6ff491fa1e93751", - "hash": "sha256-LwspMo771iaV5YeEJWgdb8xi37KMa0rsSdvO3uqMOAI=" + "rev": "8b822ee8ac2c3e52926820f46ad858532a895951", + "hash": "sha256-hPd5roeHOgMiz2VUx13bUsKKDSvgQAXRdk7wfdi6e48=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -665,38 +666,38 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "e7294a8ebed84f8c5bd3686c68dbe12a4e65b644", - "hash": "sha256-/p7kBW7mwpG/Uz0goMM7L3zjpOMBzGiuN+0ZBEOpORo=" + "rev": "54a521dd130ae1b2f38fef79b09515702d135bdd", + "hash": "sha256-PScDq8HhQPFUs78N75QyL9oEykmjZmAhdxCAqQ0LJds=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "ce37fd67f83cd1e8793b988d2e4126bbf72b19dd", - "hash": "sha256-SJcxmKdzOjg6lOJk/3m8qo7puvtci1YEU6dXKjthx0Q=" + "rev": "f289d047f49fb60488301ec62bafab85573668cc", + "hash": "sha256-2Wv0dxVQ8NvuDRTcsXkH1GKmuA6lsIuwTl0j6kbTefo=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "39f924b810e561fd86b2558b6711ca68d4363f68", - "hash": "sha256-twJJVBfnZbH/8Wn273h45K3BOnlAicqL2zJl6OfLm2E=" + "rev": "952f776f6573aafbb62ea717d871cd1d6816c387", + "hash": "sha256-LfJ7um+rzc4HdkJerHWkuPWeEc7ZFSBafbP+svAjklk=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "0508dee4ff864f5034ae6b7f68d34cb2822b827d", - "hash": "sha256-QqFC3Iyhw9Pq6TwBHxa0Ss7SW0bHo0Uz5N18oxl2ROg=" + "rev": "809941a4ca137df69dc9c6e8eb456bd70309197c", + "hash": "sha256-FPXAofnMfgUkwwRGh8rqtXrmLjouP5A8umXV1pHm1ck=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "c52931f012cb7b48e42bbf2050a7fb2183b76406", - "hash": "sha256-nIzrishMMxWzOuD3aX8B6Iuq2kPsUF0Uuvz7GijTulY=" + "rev": "fb8f5a5d69f4590ff1f5ecacb5e3957b6d11daee", + "hash": "sha256-fO6fkWOMYbf/um7gKFyjtrFE21g1kYx3lLvPv4gY7qw=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "fe7a09b13899c5c77d956fa310286f7a7eb2c4ed", - "hash": "sha256-zI3y5aoP4QcYp677Oxj5Ef7lJyJwOMdGsaRBe+X9vpI=" + "rev": "2d8f273ebd4b843c402d9ee881616895b854e42f", + "hash": "sha256-nD/WTBTwCnfZdwdNKldDVpcuirSghCIeJRBeX+uQXBk=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "a30aa23cfaff4f28f039c025c159128a6c336a7e", - "hash": "sha256-foa5hzqf1hPwOj3k57CloCe/j0qXW3zCQ4mwCT4epF4=" + "rev": "4e7b0c905b1a0401e24333800937cc8792efa037", + "hash": "sha256-CCpfWpyGki9klgHInjs6gAhw5shPXlzmFgccCHNfGQY=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", @@ -705,8 +706,8 @@ }, "src/third_party/wasm_tts_engine/src": { "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine", - "rev": "7a91dbfddd93afa096a69fb7d292e22d4afecad2", - "hash": "sha256-bV+1YFEtCyTeZujsZtZiexT/aUTN3MaVerR2UdkUPBY=" + "rev": "6ab3e63276a2d66ba3e7db4f87c5b7cb00e22130", + "hash": "sha256-ZcnKKnHsN1UyztAXClc2EUwfeX3yuLtMM2Zjwpnh62U=" }, "src/third_party/wayland/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", @@ -740,8 +741,8 @@ }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "fb2b951ac3c23e453335edf35c9b3bad431d9009", - "hash": "sha256-tjY5ADd5tMFsYHk6xT+TXwsDYV5eI2oOywmyTjjAxYc=" + "rev": "dcfb0d153f1e19905b0af26e640470c9ec5578e7", + "hash": "sha256-726p6OfKAzHtnjz/8WtMcsRxuq4wqyJv3+DHOHDTeYY=" }, "src/third_party/webpagereplay": { "url": "https://chromium.googlesource.com/webpagereplay.git", @@ -750,8 +751,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "8d78f5de6c27b2c793039989ea381f1428fb0100", - "hash": "sha256-IsjTrEnxIqINYYjWJmDp7rlubl5dJ2YMpJf/DrG/mRM=" + "rev": "04413d62f754a7b1a3a2d8c3df23bcde040112b2", + "hash": "sha256-sFoBgpPeMJQNSjNp8dDEUlB/7lJUpIXTpu0eRq94cGk=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -770,18 +771,18 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "0824e2965f6edc2297e55c8dff5a8ac4cb12aaad", - "hash": "sha256-eb9B9lXPB2GiC4qehB/HOU36W1e9RZ0N2oEbIifyrHE=" + "rev": "7702e723fa25102db8b633ead4e3c221a5121487", + "hash": "sha256-n3FxY4HESzNyccQLENbuisU29v79c2x+7fYOsUrQnFg=" }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "ea0aa030cdf31f7897c5bfc153f0d36e92768095", - "hash": "sha256-UJsuaSzR4V8alLdtxzpla1v9WYHPKPp13YrgA4Y6/yA=" + "rev": "ef2bf5781112a4cd6b62ac1817f7842bbdc7ea8f", + "hash": "sha256-hDDNrUXGxG/o1oZnypAnuLyIeM16Hy6x1KacGu9Hhmw=" }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6", - "hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8=" + "rev": "e2591684c45463aa1e46ebefc3fd35deee63f37c", + "hash": "sha256-tbGzFdqmkoSiVGk1WMRroWC3NR5GaHRuMwGzPhVodxk=" } } }, diff --git a/pkgs/applications/networking/browsers/chromium/update.mjs b/pkgs/applications/networking/browsers/chromium/update.mjs index c6b2cd3e1e5d..42483eb06b40 100755 --- a/pkgs/applications/networking/browsers/chromium/update.mjs +++ b/pkgs/applications/networking/browsers/chromium/update.mjs @@ -40,7 +40,7 @@ for (const attr_path of Object.keys(lockfile)) { } const version_nixpkgs = !ungoogled ? lockfile[attr_path].version : lockfile[attr_path].deps['ungoogled-patches'].rev - const version_upstream = !ungoogled ? await get_latest_chromium_release() : + const version_upstream = !ungoogled ? await get_latest_chromium_release('linux') : ungoogled_rev ?? await get_latest_ungoogled_release() console.log(`[${attr_path}] ${chalk.red(version_nixpkgs)} (nixpkgs)`) @@ -59,7 +59,7 @@ for (const attr_path of Object.keys(lockfile)) { lockfile[attr_path] = { version: version_chromium, - chromedriver: !ungoogled ? await fetch_chromedriver_binaries(version_chromium) : undefined, + chromedriver: !ungoogled ? await fetch_chromedriver_binaries(await get_latest_chromium_release('mac')) : undefined, deps: { depot_tools: {}, gn: {}, @@ -140,7 +140,7 @@ async function fetch_gn(chromium_rev, gn_previous) { } -async function fetch_chromedriver_binaries(chromium_version) { +async function fetch_chromedriver_binaries(version) { // https://developer.chrome.com/docs/chromedriver/downloads/version-selection const prefetch = async (url) => { const expr = [`(import ./. {}).fetchzip { url = "${url}"; hash = ""; }`] @@ -149,8 +149,9 @@ async function fetch_chromedriver_binaries(chromium_version) { } // if the URL ever changes, the URLs in the chromedriver derivations need updating as well! - const url = (platform) => `https://storage.googleapis.com/chrome-for-testing-public/${chromium_version}/${platform}/chromedriver-${platform}.zip` + const url = (platform) => `https://storage.googleapis.com/chrome-for-testing-public/${version}/${platform}/chromedriver-${platform}.zip` return { + version, hash_darwin: await prefetch(url('mac-x64')), hash_darwin_aarch64: await prefetch(url('mac-arm64')), } @@ -172,8 +173,8 @@ async function resolve_DEPS(depot_tools_checkout, chromium_rev) { } -async function get_latest_chromium_release() { - const url = `https://versionhistory.googleapis.com/v1/chrome/platforms/linux/channels/stable/versions/all/releases?` + new URLSearchParams({ +async function get_latest_chromium_release(platform) { + const url = `https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases?` + new URLSearchParams({ order_by: 'version desc', filter: 'endtime=none,fraction>=0.5' }) diff --git a/pkgs/development/tools/selenium/chromedriver/binary.nix b/pkgs/development/tools/selenium/chromedriver/binary.nix index e4b9b65909a3..5274d495444a 100644 --- a/pkgs/development/tools/selenium/chromedriver/binary.nix +++ b/pkgs/development/tools/selenium/chromedriver/binary.nix @@ -9,18 +9,19 @@ let upstream-info = - (lib.importJSON ../../../../applications/networking/browsers/chromium/info.json).chromium; + (lib.importJSON ../../../../applications/networking/browsers/chromium/info.json) + .chromium.chromedriver; # See ./source.nix for Linux allSpecs = { x86_64-darwin = { system = "mac-x64"; - hash = upstream-info.chromedriver.hash_darwin; + hash = upstream-info.hash_darwin; }; aarch64-darwin = { system = "mac-arm64"; - hash = upstream-info.chromedriver.hash_darwin_aarch64; + hash = upstream-info.hash_darwin_aarch64; }; };