diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-25 00:02:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 00:02:13 +0000 |
| commit | bbbd0a92afb49fb7cbfe382e7db43417595b2fe3 (patch) | |
| tree | f518ba2546d68a1fb96a260143ef9831a6944fed /pkgs/applications/networking/browsers | |
| parent | a45818989adb69966bbaa992b9b0d1c743d4726e (diff) | |
| parent | 1e643a385290e54947594ac241d4cf407348910c (diff) | |
| download | nixpkgs-bbbd0a92afb49fb7cbfe382e7db43417595b2fe3.tar nixpkgs-bbbd0a92afb49fb7cbfe382e7db43417595b2fe3.tar.gz nixpkgs-bbbd0a92afb49fb7cbfe382e7db43417595b2fe3.tar.bz2 nixpkgs-bbbd0a92afb49fb7cbfe382e7db43417595b2fe3.tar.lz nixpkgs-bbbd0a92afb49fb7cbfe382e7db43417595b2fe3.tar.xz nixpkgs-bbbd0a92afb49fb7cbfe382e7db43417595b2fe3.tar.zst nixpkgs-bbbd0a92afb49fb7cbfe382e7db43417595b2fe3.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 2 | ||||
| -rwxr-xr-x | pkgs/applications/networking/browsers/chromium/get-commit-message.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d9385ceb042..74133a9d47e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -288,7 +288,7 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; # Optional features: - use_gio = gnomeSupport; + use_gio = gnomeSupport || chromiumVersionAtLeast "99"; use_gnome_keyring = gnomeKeyringSupport; use_cups = cupsSupport; diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index b0fbe20db8e..85ebb8a7b93 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -39,7 +39,7 @@ for entry in feed.entries: print('chromium: TODO -> ' + version + '\n') print(url) if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0): - zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content) + zero_days = re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content) if zero_days: fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) |