From 223f4d34b257a25d47d1250f7f61726eeda2319d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 5 Oct 2022 20:24:11 +0200 Subject: [PATCH 1/2] chromedriver: Disable on aarch64-darwin chromedriver_mac64_m1.zip is currently not available anymore and I do not have time to look into it: path is '/nix/store/zhz7hrk94dc0dn7a42czhd1nz9142826-chromedriver_mac64.zip' nix-prefetch-url https://chromedriver.storage.googleapis.com/106.0.5249.61/chromedriver_mac64_m1.zip error: unable to download 'https://chromedriver.storage.googleapis.com/106.0.5249.61/chromedriver_mac64_m1.zip': HTTP error 404 response body: NoSuchKeyThe specified key does not exist.
No such object: chromedriver/106.0.5249.61/chromedriver_mac64_m1.zip
(cherry picked from commit 3d50284bb23e2a7e5031206e03cabd9e10b8907d) --- pkgs/applications/networking/browsers/chromium/update.py | 4 +++- pkgs/development/tools/selenium/chromedriver/default.nix | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 8341f2c6ee22..32e2dd010bec 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -70,7 +70,9 @@ def get_matching_chromedriver(version): 'version': chromedriver_version, 'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')), 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64')), - 'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac64_m1')) + # TODO: No such object: chromedriver/106.0.5249.61/chromedriver_mac64_m1.zip: + # 'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac64_m1')) + 'sha256_darwin_aarch64': "0000000000000000000000000000000000000000000000000000000000000000" } diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 66a73b1c1e98..1e06a06e55f1 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -18,10 +18,10 @@ let sha256 = upstream-info.sha256_darwin; }; - aarch64-darwin = { - system = "mac64_m1"; - sha256 = upstream-info.sha256_darwin_aarch64; - }; + # aarch64-darwin = { + # system = "mac64_m1"; + # sha256 = upstream-info.sha256_darwin_aarch64; + # }; }; spec = allSpecs.${stdenv.hostPlatform.system} From b73813be24d0e4e784f52c4ca8728b5913814c2f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 5 Oct 2022 20:17:42 +0200 Subject: [PATCH 2/2] chromium: 106.0.5249.61 -> 106.0.5249.91 https://chromereleases.googleblog.com/2022/09/stable-channel-update-for-desktop_30.html This update includes 3 security fixes. CVEs: CVE-2022-3370 CVE-2022-3373 (cherry picked from commit ff92f35b83f0d92eea7d990c4edb351d99e4cacc) --- .../browsers/chromium/upstream-info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d79e63d54df3..1cf024a4d6b8 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "106.0.5249.61", - "sha256": "15qljfg8w124yp65srp1rz3ywrlqhzqzkhimn1h9xz0jkf9cnypj", - "sha256bin64": "0l0vxlv8gmd655z2889549iafnyd4gyknqfal5iaqdhvig3sdp07", + "version": "106.0.5249.91", + "sha256": "16jlwzlfqdhhyajsxxrdfcqmh76ds8g1w4xd5mz3bdbd81mljh2p", + "sha256bin64": "1cfhsar79f319417cx4blcg5hk7b7ix45r7vhrbbwla18p0jij5y", "deps": { "gn": { "version": "2022-08-11", @@ -12,10 +12,10 @@ } }, "chromedriver": { - "version": "106.0.5249.21", - "sha256_linux": "0z4m5145s00dycb7f7nscwghzwqym4if6k95w0q6d1hjyih8jh32", - "sha256_darwin": "1jnwaim2p579p1xlh9y2w11rp5agmp2144ipjs1fg9p97hrdi3yf", - "sha256_darwin_aarch64": "13wl55n54ld6nrmy1vallrqkzz031kzmw4sjwczra6k7ryd4z09w" + "version": "106.0.5249.61", + "sha256_linux": "0l2270d5az46pc6icpn3zx7yr8ilkszsrfy3qmwrx3cyc4xnmznj", + "sha256_darwin": "07k76i9m3j34h6ybn1wafy39d2ngf06bhp24qzwvv45rks714hqa", + "sha256_darwin_aarch64": "0000000000000000000000000000000000000000000000000000000000000000" } }, "beta": {