diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2019-11-08 16:45:44 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2019-11-08 15:45:44 +0000 |
| commit | 9fe4e068123146afda5f2b9a6d630ba76d1daff5 (patch) | |
| tree | da257862d4ee94295ea68c34b138bf00ca1bda58 | |
| parent | 0132b040fc82791ad1375bad2383ab822acae13e (diff) | |
| download | nixpkgs-9fe4e068123146afda5f2b9a6d630ba76d1daff5.tar nixpkgs-9fe4e068123146afda5f2b9a6d630ba76d1daff5.tar.gz nixpkgs-9fe4e068123146afda5f2b9a6d630ba76d1daff5.tar.bz2 nixpkgs-9fe4e068123146afda5f2b9a6d630ba76d1daff5.tar.lz nixpkgs-9fe4e068123146afda5f2b9a6d630ba76d1daff5.tar.xz nixpkgs-9fe4e068123146afda5f2b9a6d630ba76d1daff5.tar.zst nixpkgs-9fe4e068123146afda5f2b9a6d630ba76d1daff5.zip | |
nixos/systemd: Allow unit options to have multiple equal defs (#73024)
E.g. this allows
systemd.services.<name?>.serviceConfig.DynamicUser =
mkMerge [ true true ];| -rw-r--r-- | nixos/modules/system/boot/systemd-unit-options.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index c1f2c98afcd..bee21f1a8f3 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 = { |