Merge pull request #198532 from raindev/syncthing-devices-folders

Sandro 796cc1ad 741b9178

Changed files
+2 -2
nixos
modules
services
networking
+2 -2
nixos/modules/services/networking/syncthing.nix
···
# generate the new config by merging with the NixOS config options
new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * {
-
"devices": (${builtins.toJSON devices}${optionalString (! cfg.overrideDevices) " + .devices"}),
-
"folders": (${builtins.toJSON folders}${optionalString (! cfg.overrideFolders) " + .folders"})
+
"devices": (${builtins.toJSON devices}${optionalString (cfg.devices == {} || ! cfg.overrideDevices) " + .devices"}),
+
"folders": (${builtins.toJSON folders}${optionalString (cfg.folders == {} || ! cfg.overrideFolders) " + .folders"})
} * ${builtins.toJSON cfg.extraOptions}')
# send the new config