colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #270704 from Avaq/avaq/vdirsync-fix-statuspath

Browse Source 
nixos/vdirsyncer: fix config.statusPath option
This commit is contained in:
Linus Heckemann 2023-12-14 13:56:34 +01:00 committed by GitHub
commit feed24c54b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/networking/vdirsyncer.nix
View File

@ -20,9 +20,11 @@ let
else
pkgs.writeText "vdirsyncer-${name}.conf" (toIniJson (
{
general = cfg'.config.general // (lib.optionalAttrs (cfg'.config.statusPath == null) {
status_path = "/var/lib/vdirsyncer/${name}";
});
general = cfg'.config.general // {
status_path = if cfg'.config.statusPath == null
then "/var/lib/vdirsyncer/${name}"
else cfg'.config.statusPath;
};
} // (
mapAttrs' (name: nameValuePair "pair ${name}") cfg'.config.pairs
) // (