From 0ccfce78678126ec8d7d97742bc340cc3637d5ed Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Fri, 19 Jan 2024 14:07:46 +0800 Subject: inetutils: set priority lower than util-linux The `logger` binary from `util-linux` should be the priority. This has been the default for many linux distributions. To instead prioritize this package, set a _lower_ `meta.priority`, or use e.g. lib.setPrio 5 inetutils --- pkgs/tools/networking/inetutils/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 9b1723a4d122a..47533f13cb373 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -7,6 +7,7 @@ , help2man , apparmorRulesFromClosure , libxcrypt +, util-linux }: stdenv.mkDerivation rec { @@ -93,5 +94,15 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.unix; + + /** + The `logger` binary from `util-linux` is preferred over `inetutils`. + To instead prioritize this package, set a _lower_ `meta.priority`, or + use e.g. `lib.setPrio 5 inetutils`. + + Note that the default `meta.priority` is defined in `buildEnv` and is + currently 5. + */ + priority = (util-linux.meta.priority or 5) + 1; }; } -- cgit 1.4.1 From 940fb2a3e02be09e9fabe24f76fc61a2068b5c13 Mon Sep 17 00:00:00 2001 From: bryango Date: Mon, 22 Jan 2024 21:53:06 +0800 Subject: inetutils: release-note on `meta.priority` --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 84ece231efead..b6f5e2b80d4de 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -63,6 +63,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - Invidious has changed its default database username from `kemal` to `invidious`. Setups involving an externally provisioned database (i.e. `services.invidious.database.createLocally == false`) should adjust their configuration accordingly. The old `kemal` user will not be removed automatically even when the database is provisioned automatically.(https://github.com/NixOS/nixpkgs/pull/265857) +- `inetutils` now has a lower priority to avoid shadowing the commonly used `util-linux`. If one wishes to restore the default priority, simply use `lib.setPrio 5 inetutils` or override with `meta.priority = 5`. + - `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`. - The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead. -- cgit 1.4.1