From 9fe4e068123146afda5f2b9a6d630ba76d1daff5 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 8 Nov 2019 16:45:44 +0100 Subject: [PATCH] nixos/systemd: Allow unit options to have multiple equal defs (#73024) E.g. this allows systemd.services..serviceConfig.DynamicUser = mkMerge [ true true ]; --- nixos/modules/system/boot/systemd-unit-options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index c1f2c98afcd8..bee21f1a8f36 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -24,7 +24,7 @@ in rec { in if isList (head defs'') then concatLists defs'' - else mergeOneOption loc defs'; + else mergeEqualOption loc defs'; }; sharedOptions = {