diff options
| author | h7x4 <h7x4@nani.wtf> | 2024-01-23 09:18:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-23 09:18:31 +0100 |
| commit | f1e0a0a3c51f45e1a12fbe9ed527aadaaf6ac39a (patch) | |
| tree | a9525fbc68d26ae2ea941d5ed7a3357d738f1494 | |
| parent | 6bbcb63401633f7455cdd450e5650eee11ce2ccf (diff) | |
| parent | 940fb2a3e02be09e9fabe24f76fc61a2068b5c13 (diff) | |
Merge pull request #281985 from bryango/inetutils-low-priority
inetutils: set priority lower than util-linux
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2405.section.md | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/inetutils/default.nix | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 2795323587cba..6956c1ab6053e 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -81,6 +81,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. 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; }; } |