diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/browsers/chromium')
3 files changed, 35 insertions, 29 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index f555ab289391..6d24f18ec94c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -361,7 +361,6 @@ let # Optional features: use_gio = true; - use_gnome_keyring = false; # Superseded by libsecret use_cups = cupsSupport; # Feature overrides: @@ -384,6 +383,8 @@ let # We do intentionally not set rustc_version as nixpkgs will never do incremental # rebuilds, thus leaving this empty is fine. rust_sysroot_absolute = "${rustc}"; + # Building with rust is disabled for now - this matches the flags in other major distributions. + enable_rust = false; } // lib.optionalAttrs (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) { # https://www.mail-archive.com/v8-users@googlegroups.com/msg14528.html arm_control_flow_integrity = "none"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py index b8af11ee61d0..f8dae9593601 100755 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py @@ -63,21 +63,26 @@ def get_file_revision(revision, file_path): return base64.b64decode(resp) -def get_matching_chromedriver(version): - """Gets the matching chromedriver version for the given Chromium version.""" - # See https://chromedriver.chromium.org/downloads/version-selection - build = re.sub('.[0-9]+$', '', version) - chromedriver_version_url = f'https://chromedriver.storage.googleapis.com/LATEST_RELEASE_{build}' - with urlopen(chromedriver_version_url) as http_response: - chromedriver_version = http_response.read().decode() - def get_chromedriver_url(system): - return ('https://chromedriver.storage.googleapis.com/' + - f'{chromedriver_version}/chromedriver_{system}.zip') +def get_chromedriver(channel): + """Get the latest chromedriver builds given a channel""" + # See https://chromedriver.chromium.org/downloads/version-selection#h.4wiyvw42q63v + chromedriver_versions_url = f'https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json' + print(f'GET {chromedriver_versions_url}') + with urlopen(chromedriver_versions_url) as http_response: + chromedrivers = json.load(http_response) + channel = chromedrivers['channels'][channel] + downloads = channel['downloads']['chromedriver'] + + def get_chromedriver_url(platform): + for download in downloads: + if download['platform'] == platform: + return download['url'] + return { - 'version': chromedriver_version, + 'version': channel['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('mac_arm64')) + 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac-x64')), + 'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac-arm64')) } @@ -212,7 +217,7 @@ with urlopen(RELEASES_URL) as resp: channel['deps'] = get_channel_dependencies(channel['version']) if channel_name == 'stable': - channel['chromedriver'] = get_matching_chromedriver(channel['version']) + channel['chromedriver'] = get_chromedriver('Stable') elif channel_name == 'ungoogled-chromium': ungoogled_repo_url = 'https://github.com/ungoogled-software/ungoogled-chromium.git' channel['deps']['ungoogled-patches'] = { diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index e53706340011..908310356122 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -35,31 +35,31 @@ }; deps = { gn = { - rev = "e9e83d9095d3234adf68f3e2866f25daf766d5c7"; - sha256 = "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a"; + rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d"; + sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"; url = "https://gn.googlesource.com/gn"; - version = "2023-05-19"; + version = "2023-06-09"; }; }; - sha256 = "1h3j24ihn76qkvckzg703pm1jsh6nbkc48n2zx06kia8wz96567z"; - sha256bin64 = "04jklk2zwkyy8i70v9nk7nw35w2g9pyxdw9w3sn9mddgbjjph5z9"; - version = "115.0.5790.170"; + sha256 = "108wrm64pig0v24n44zd52jfzsy2kda84r5k8abfvg4sjlm0bh8y"; + sha256bin64 = "1sr7wfssayw94x8bfn7bk03040221npj7612ccxgzdgr4x5i4adl"; + version = "116.0.5845.96"; }; ungoogled-chromium = { deps = { gn = { - rev = "e9e83d9095d3234adf68f3e2866f25daf766d5c7"; - sha256 = "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a"; + rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d"; + sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"; url = "https://gn.googlesource.com/gn"; - version = "2023-05-19"; + version = "2023-06-09"; }; ungoogled-patches = { - rev = "115.0.5790.170-1"; - sha256 = "0vk82jacadb4id16596s4751j4idq6903w6sl2s7cj4ppxd6pyf1"; + rev = "116.0.5845.96-1"; + sha256 = "14smm0vmqzn2664qdbv7asm8n2gg88zcvwrjpsn54qwk0njv7zlr"; }; }; - sha256 = "1h3j24ihn76qkvckzg703pm1jsh6nbkc48n2zx06kia8wz96567z"; - sha256bin64 = "04jklk2zwkyy8i70v9nk7nw35w2g9pyxdw9w3sn9mddgbjjph5z9"; - version = "115.0.5790.170"; + sha256 = "108wrm64pig0v24n44zd52jfzsy2kda84r5k8abfvg4sjlm0bh8y"; + sha256bin64 = "1sr7wfssayw94x8bfn7bk03040221npj7612ccxgzdgr4x5i4adl"; + version = "116.0.5845.96"; }; } |