gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chromium: remove ofborg maintainer ping workaround, use CODEOWNERS (#362543)

Browse Source
This commit is contained in:
Aleksana
2024-12-07 12:10:17 +08:00
committed by GitHub
parent 5d4235a897 674835a9d9
commit 0abc80da7f
4 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci/OWNERS
+2 -2
View File
@@ -207,8 +207,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
pkgs/applications/networking/browsers/chromium/browser.nix
+2
View File
@@ -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 ];
pkgs/applications/networking/browsers/chromium/common.nix
+1 -6
View File
@@ -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 [
pkgs/applications/networking/browsers/chromium/default.nix
-6
View File
@@ -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))