From e3828769e877b1869129a3816515a8c0ea454977 Mon Sep 17 00:00:00 2001
From: Jos van Bakel <jos@codeaddict.org>
Date: Wed, 9 Dec 2020 09:22:00 +0100
Subject: [PATCH] msmtp: fix passwordeval (#1643)

msmtp fails with broken pipe error when sending emails.
The new line after the password is not required anymore since msmtp 1.8.0.
---
 modules/programs/msmtp.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/programs/msmtp.nix b/modules/programs/msmtp.nix
index 7b6704860..7357b615b 100644
--- a/modules/programs/msmtp.nix
+++ b/modules/programs/msmtp.nix
@@ -26,9 +26,8 @@ let
         tls_fingerprint = msmtp.tls.fingerprint;
       } // optionalAttrs (smtp.port != null) { port = toString smtp.port; }
         // optionalAttrs (passwordCommand != null) {
-          # msmtp requires the password to finish with a newline.
           passwordeval =
-            ''${pkgs.bash}/bin/bash -c "${toString passwordCommand}; echo"'';
+            ''${pkgs.bash}/bin/bash -c "${toString passwordCommand}"'';
         } // msmtp.extraConfig) ++ optional primary ''
 
           account default : ${name}'');