Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

vdirsyncer: fix undefined variable 'mkList'

Browse source 
... at .../modules/programs/vdirsyncer.nix:117:38
change to listString
This commit is contained in:
Johannes Rosenberger 2020-04-24 20:37:18 +02:00 committed by Robert Helgesson
parent 3ff5f6073f
commit b0df7d9919
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/programs/vdirsyncer.nix
View file

@ -107,14 +107,14 @@ let
let let
contents = map (c: if (isString c) contents = map (c: if (isString c)
then ''"${c}"'' then ''"${c}"''
else mkList (map wrapString c)) v; else listString (map wrap c)) v;
in ''collections = ${if ((isNull v) || v == []) then "null" else listString contents}'' in ''collections = ${if ((isNull v) || v == []) then "null" else listString contents}''
else if (n == "conflictResolution") then else if (n == "conflictResolution") then
if v == "remote wins" if v == "remote wins"
then ''conflict_resolution = "a wins"'' then ''conflict_resolution = "a wins"''
else if v == "local wins" else if v == "local wins"
then ''conflict_resolution = "b wins"'' then ''conflict_resolution = "b wins"''
else ''conflict_resolution = ${mkList (map wrapString (["command"] ++ v))}'' else ''conflict_resolution = ${listString (map wrap (["command"] ++ v))}''
else throw "Unrecognized option: ${n}"; else throw "Unrecognized option: ${n}";
attrsString = a: concatStringsSep "\n" (mapAttrsToList optionString a); attrsString = a: concatStringsSep "\n" (mapAttrsToList optionString a);