From 46be72d31539780a988f60b3a5f46bc3726d9bad Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Fri, 30 May 2025 22:39:51 +0200 Subject: [PATCH] nixos/unitOption: remove unnecessary definition filtering --- nixos/lib/systemd-unit-options.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index 0ddae4e20198..eff78fef265d 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -15,7 +15,6 @@ let inherit (lib) any concatMap - filterOverrides isList literalExpression mergeEqualOption @@ -56,13 +55,10 @@ rec { name = "systemd option"; merge = loc: defs: - let - defs' = filterOverrides defs; - in - if any (def: isList def.value) defs' then - concatMap (def: toList def.value) defs' + if any (def: isList def.value) defs then + concatMap (def: toList def.value) defs else - mergeEqualOption loc defs'; + mergeEqualOption loc defs; }; sharedOptions = {