diff --git a/ci/OWNERS b/ci/OWNERS index 9265ae8bc83df..596cf711567db 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -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 diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index d4259c2895ad2..bdedac20c5ebd 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -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 ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4a16de319a1e3..c0a661a860389 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -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 [ diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index ecce9b395a75d..73ce63d6f8bc9 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -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))