movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/unitOption: remove unnecessary definition filtering

Browse source
This commit is contained in:
Johannes Kirschbauer 2025-05-30 22:39:51 +02:00
parent 94d09d1046
commit 46be72d315
No known key found for this signature in database
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nixos/lib/systemd-unit-options.nix
View file

@ -15,7 +15,6 @@ let
inherit (lib) inherit (lib)
any any
concatMap concatMap
filterOverrides
isList isList
literalExpression literalExpression
mergeEqualOption mergeEqualOption
@ -56,13 +55,10 @@ rec {
name = "systemd option"; name = "systemd option";
merge = merge =
loc: defs: loc: defs:
let if any (def: isList def.value) defs then
defs' = filterOverrides defs; concatMap (def: toList def.value) defs
in
if any (def: isList def.value) defs' then
concatMap (def: toList def.value) defs'
else else
mergeEqualOption loc defs'; mergeEqualOption loc defs;
}; };
sharedOptions = { sharedOptions = {