mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 11:40:45 +00:00
Merge pull request #281985 from bryango/inetutils-low-priority
inetutils: set priority lower than util-linux
This commit is contained in:
commit
f1e0a0a3c5
|
@ -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.
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue