mirror of
https://github.com/nix-community/home-manager
synced 2024-11-30 06:59:45 +01:00
vdirsyncer: fix undefined variable 'mkList'
... at .../modules/programs/vdirsyncer.nix:117:38 change to listString
This commit is contained in:
parent
3ff5f6073f
commit
b0df7d9919
1 changed files with 2 additions and 2 deletions
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue