Unverified Commit 796cc1ad authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

parents 741b9178 43bc09e0

nixos/modules/services/networking/syncthing.nix

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ let 


    # 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