From 477e7d6b60e817661632ff3a8aaf2e39c4cceadc Mon Sep 17 00:00:00 2001 From: emilylange Date: Tue, 19 Dec 2023 18:05:58 +0100 Subject: [PATCH 1/3] chromium: drop inactive maintainers Our ./maintainers/README.md has a section titled "How to lose maintainer status", which describes an "inactivity measure": Maintainers how haven't reacted to "package-related notifications" for more than 3 months can be removed. All those 4 maintainers that are getting dropped as part of this commit haven't responded to any such notifications (mostly review pings) for at least 3 months. --- pkgs/applications/networking/browsers/chromium/browser.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 909b506457e5..24811cc336b6 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -85,8 +85,8 @@ mkChromiumDerivation (base: rec { then "https://github.com/ungoogled-software/ungoogled-chromium" else "https://www.chromium.org/"; maintainers = with lib.maintainers; if ungoogled - then [ squalus primeos michaeladler networkexception emilylange ] - else [ primeos thefloweringash networkexception emilylange ]; + then [ networkexception emilylange ] + else [ networkexception emilylange ]; license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3; platforms = lib.platforms.linux; mainProgram = "chromium"; From ff1380cb3a936bc84d04059ca842af957f3ab513 Mon Sep 17 00:00:00 2001 From: emilylange Date: Tue, 19 Dec 2023 18:06:13 +0100 Subject: [PATCH 2/3] CODEOWNERS: init chromium --- .github/CODEOWNERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index effb31eb6163..ef8a595aac26 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -166,6 +166,8 @@ # Browsers /pkgs/applications/networking/browsers/firefox @mweinelt +/pkgs/applications/networking/browsers/chromium @emilylange +/nixos/tests/chromium.nix @emilylange # Certificate Authorities pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt From cdf5db87d48a1264b9ce68cb1755fe696a9e6713 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 30 Dec 2023 03:40:11 +0100 Subject: [PATCH 3/3] chromium: remove maintainer handles from README.md, mention electron Specifically the maintainers section is quite outdated and prone to get out of sync with whatever primary data we have (mostly meta.maintainers) in each derivation. In an attempt to lower the risk of ending up out of sync again, we simply remove the maintainer handles. Also adds a mention for the newly from source built electron variant, as almost everything except `upstream-info.nix` bumps will trigger electron rebuilds as well. And lastly, removes mentions of `chromium{Beta,Dev}` and the accompanying `google-chrome-{beta,dev}, that have been removed a few months ago. I might look into reworking bigger parts of the README.md in the future, but this honestly isn't that high of a priority for me for now. --- .../networking/browsers/chromium/README.md | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/README.md b/pkgs/applications/networking/browsers/chromium/README.md index c5a537147c48..c543ded56452 100644 --- a/pkgs/applications/networking/browsers/chromium/README.md +++ b/pkgs/applications/networking/browsers/chromium/README.md @@ -1,26 +1,18 @@ # Maintainers - Note: We could always use more contributors, testers, etc. E.g.: - - A dedicated maintainer for the NixOS stable channel + - Dedicated maintainers for the NixOS stable channel - PRs with cleanups, improvements, fixes, etc. (but please try to make reviews as easy as possible) - People who handle stale issues/PRs -- Primary maintainer (responsible for all updates): @primeos -- Testers (test all stable channel updates) - - `nixos-unstable`: - - `x86_64`: @danielfullmer - - `aarch64`: @thefloweringash - - Stable channel: - - `x86_64`: @Frostman + - Other relevant packages: - - `chromiumBeta` and `chromiumDev`: For testing purposes only (not build on - Hydra). We use these channels for testing and to fix build errors in advance - so that `chromium` updates are trivial and can be merged fast. - - `google-chrome`, `google-chrome-beta`, `google-chrome-dev`: Updated via - Chromium's `upstream-info.nix` - - `ungoogled-chromium`: @squalus + - `google-chrome`: Updated via Chromium's `upstream-info.nix`. + - `ungoogled-chromium`: A patch set for Chromium, that has its own entry in Chromium's `upstream-info.nix`. - `chromedriver`: Updated via Chromium's `upstream-info.nix` and not built - from source. + from source. Must match Chromium's major version. + - `electron-source`: Various version of electron that are built from source using Chromium's + `-unwrapped` derivation, due to electron being based on Chromium. # Upstream links