diff options
| author | Emily <git@emilylange.de> | 2024-01-05 16:55:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-05 16:55:52 +0100 |
| commit | 14f8081d59918144f42fa71cc7692df5879bcd3d (patch) | |
| tree | ea63209129308d6747ec4c908a1d24d58ba9732a | |
| parent | wavebox: 10.119.8-2 -> 10.120.10-2 (diff) | |
| parent | chromium: remove maintainer handles from README.md, mention electron (diff) | |
| download | nixpkgs-14f8081d59918144f42fa71cc7692df5879bcd3d.tar.gz | |
Merge pull request #278942 from NixOS/backport-275459-to-release-23.11
[Backport release-23.11] chromium: drop inactive maintainers, CODEOWNERS: init chromium
| -rw-r--r-- | .github/CODEOWNERS | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/README.md | 22 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/browser.nix | 4 |
3 files changed, 11 insertions, 17 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2b4dd256389f..20303e98b871 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -150,6 +150,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 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 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"; |