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

getmail: fix configuration mailboxes generation (#1719)

Browse source 
The mailboxes must be a tuple of string or the string "ALL".
The generated value was broken if the mailboxes configuration was a list
of only one string (but not "ALL"): the generated expression ( "str" )
was not a tuple but a string.
Now, we always generate a tuple (by adding a comma, even with a list of
size one). Getmail works with the special value "ALL" whether it is a
in tuple or not, so this case is not specifically handled.
This commit is contained in:
Thibaut Marty 2021-03-01 23:58:18 +01:00 committed by GitHub
parent 9068ff292c
commit e72e241d7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/programs/getmail.nix
View file

@ -11,8 +11,7 @@ let
with account; with account;
let let
passCmd = concatMapStringsSep ", " (x: "'${x}'") passwordCommand; passCmd = concatMapStringsSep ", " (x: "'${x}'") passwordCommand;
renderedMailboxes = renderedMailboxes = concatMapStrings (x: "'${x}', ") getmail.mailboxes;
concatMapStringsSep ", " (x: "'${x}'") getmail.mailboxes;
retrieverType = if imap.tls.enable then retrieverType = if imap.tls.enable then
"SimpleIMAPSSLRetriever" "SimpleIMAPSSLRetriever"
else else

2
tests/modules/programs/getmail/getmail-expected.conf
View file

@ -5,7 +5,7 @@ server = imap.example.com
port = 993 port = 993
username = home.manager username = home.manager
password_command = ('password-command') password_command = ('password-command')
mailboxes = ( 'INBOX', 'Sent', 'Work' ) mailboxes = ( 'INBOX', 'Sent', 'Work', )
[destination] [destination]
type = MDA_external type = MDA_external