diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-05 15:57:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-05 15:57:50 +0100 |
commit | 34ecb3cdc6094030832e50012d5db2db45881f51 (patch) | |
tree | 6de9454f5c12d1dbf75bdf8d5c6b5a7e7fa07767 /pkgs/applications/networking/browsers | |
parent | 668f666cd9bedc53b2f53841c30c4bdaa8befd12 (diff) | |
parent | cdf5db87d48a1264b9ce68cb1755fe696a9e6713 (diff) |
Merge pull request #275459 from emilylange/chromium-drop-inactive-maintainers
chromium: drop inactive maintainers, CODEOWNERS: init chromium
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/README.md | 22 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/browser.nix | 4 |
2 files changed, 9 insertions, 17 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/README.md b/pkgs/applications/networking/browsers/chromium/README.md index c5a537147c487..c543ded564528 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 diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 909b506457e54..24811cc336b6a 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"; |