diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 40a0d7997528..ca52cf94d8c6 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -87,7 +87,7 @@ mkChromiumDerivation (base: rec { then "https://github.com/Eloston/ungoogled-chromium" else "https://www.chromium.org/"; maintainers = with maintainers; if ungoogled - then [ squalus primeos ] + then [ squalus primeos michaeladler ] else [ primeos thefloweringash ]; license = if enableWideVine then licenses.unfree else licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a309189ba27b..167545379211 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -39,14 +39,12 @@ , glibc # gconv + locale # Package customization: -, gnomeSupport ? false, gnome2 ? null -, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , cupsSupport ? true, cups ? null , proprietaryCodecs ? true , pulseSupport ? false, libpulseaudio ? null , ungoogled ? false, ungoogled-chromium # Optional dependencies: -, libgcrypt ? null # gnomeSupport || cupsSupport +, libgcrypt ? null # cupsSupport , systemdSupport ? stdenv.isLinux , systemd }: @@ -161,8 +159,6 @@ let curl libepoxy ] ++ optional systemdSupport systemd - ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] - ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; @@ -280,7 +276,7 @@ let # Optional features: use_gio = true; - use_gnome_keyring = gnomeKeyringSupport; + use_gnome_keyring = false; # Superseded by libsecret use_cups = cupsSupport; # Feature overrides: @@ -292,6 +288,9 @@ let enable_widevine = true; # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture: rtc_use_pipewire = true; + } // optionalAttrs (chromiumVersionAtLeast "101") { + # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): + chrome_pgo_phase = 0; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index de57f0369680..bb0939fc9491 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -8,8 +8,6 @@ # package customization # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" -, gnomeSupport ? false, gnome2 ? null -, gnomeKeyringSupport ? false , proprietaryCodecs ? true , enableWideVine ? false , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -46,7 +44,7 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit channel chromiumVersionAtLeast versionRange; - inherit gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs + inherit proprietaryCodecs cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 85ebb8a7b935..45f4282582f5 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -38,9 +38,9 @@ for entry in feed.entries: else: 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)? th(e|at) .+ in the wild\.', content) - if zero_days: + if fixes := re.search(r'This update includes .+ security fix(es)?\.', content): + fixes = fixes.group(0) + if zero_days := re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content): fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) if cve_list := re.findall(r'CVE-[^: ]+', content): diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 945a677946b7..8abd8fbdad5a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,22 +19,9 @@ } }, "beta": { - "version": "100.0.4896.56", - "sha256": "0vdyddxhmkw9bqwx5j19h69swx9ysiipsmcc1sjl0qv8bn8f790z", - "sha256bin64": "09h4fxsx0q5b0gn258xnmk11qz7ql8flpn4mq5x201abmv29y856", - "deps": { - "gn": { - "version": "2022-01-21", - "url": "https://gn.googlesource.com/gn", - "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", - "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" - } - } - }, - "dev": { - "version": "101.0.4951.7", - "sha256": "0xnvbiqi50hgky35qaivcyzfp05nnwfwqrd50dksqkzycl8avb4z", - "sha256bin64": "19my3zr9d3w2ypl9cm1xa15vhyv9add1f283alb9fmh2qwhl4scg", + "version": "101.0.4951.41", + "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609", + "sha256bin64": "1jbj5cykxamf32c1s4gsid1wxcsdf4hng2d19q9h7b2ashkvvrbi", "deps": { "gn": { "version": "2022-03-14", @@ -44,6 +31,19 @@ } } }, + "dev": { + "version": "102.0.5005.12", + "sha256": "11n03hz3g8h7srywxrjwrdrxybdjvmdjrnigjlrwjkydprg1l7ab", + "sha256bin64": "0hc56a98ikkbgdw36dpz9k6r15jmjmnm7faml8z59vixxlvkrw7y", + "deps": { + "gn": { + "version": "2022-04-14", + "url": "https://gn.googlesource.com/gn", + "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167", + "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h" + } + } + }, "ungoogled-chromium": { "version": "100.0.4896.127", "sha256": "0kgq38dy9mjyc44556i9gxhlsgd7dfvv1xi1ibk92b4p7i2y6427",