Skip to content

[Backport release-24.11] chromium: remove ofborg maintainer ping workaround, use CODEOWNERS #362678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Aleksanaa merged 1 commit into from
Dec 7, 2024
Merged

[Backport release-24.11] chromium: remove ofborg maintainer ping workaround, use CODEOWNERS #362678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/OWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza

# Browsers
/pkgs/applications/networking/browsers/firefox @mweinelt
/pkgs/applications/networking/browsers/chromium @emilylange
/nixos/tests/chromium.nix @emilylange
/pkgs/applications/networking/browsers/chromium @emilylange @networkException
/nixos/tests/chromium.nix @emilylange @networkException

# Certificate Authorities
pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt
Expand Down
2 changes: 2 additions & 0 deletions pkgs/applications/networking/browsers/chromium/browser.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ mkChromiumDerivation (base: rec {
homepage = if ungoogled
then "https://github.com/ungoogled-software/ungoogled-chromium"
else "https://www.chromium.org/";
# Maintainer pings for this derivation are highly unreliable.
# If you add yourself as maintainer here, please also add yourself as CODEOWNER.
maintainers = with lib.maintainers; if ungoogled
then [ networkexception emilylange ]
else [ networkexception emilylange ];
Expand Down
7 changes: 1 addition & 6 deletions pkgs/applications/networking/browsers/chromium/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,12 +663,7 @@ let
} // lib.optionalAttrs (!isElectron) {
inherit chromiumDeps npmDeps;
};
}
# overwrite `version` with the exact same `version` from the same source,
# except it internally points to `upstream-info.nix` for
# `builtins.unsafeGetAttrPos`, which is used by ofborg to decide
# which maintainers need to be pinged.
// builtins.removeAttrs upstream-info (builtins.filter (e: e != "version") (builtins.attrNames upstream-info));
};

# Remove some extraAttrs we supplied to the base attributes already.
in stdenv.mkDerivation (base // removeAttrs extraAttrs [
Expand Down
6 changes: 0 additions & 6 deletions pkgs/applications/networking/browsers/chromium/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,3 @@ in stdenv.mkDerivation {
inherit sandboxExecutableName;
};
}
# the following is a complicated and long-winded variant of
# `inherit (chromium.browser) version`, with the added benefit
# that it keeps the pointer to upstream-info.nix for
# builtins.unsafeGetAttrPos, which is what ofborg uses to
# decide which maintainers need to be pinged.
// builtins.removeAttrs chromium.browser (builtins.filter (e: e != "version") (builtins.attrNames chromium.browser))