summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2022-08-07 20:31:31 +0300
committerEfraim Flashner <efraim@flashner.co.il>2022-08-07 20:31:31 +0300
commitf63ef9ab0de9f3cce6e573f548e9dabcf5e6be7f (patch)
tree75367f3fdc6b01aee6a38f23ccf904b956b2588c
parenteb8ab9128467113c62b020bfd4d21e20aba7402f (diff)
downloadguix-f63ef9ab0de9f3cce6e573f548e9dabcf5e6be7f.tar.gz
gnu: msmtp: Don't override defaults when checking for network.
This is no longer needed as the defaults have changed upstream.

* gnu/packages/mail.scm (msmtp)[arguments]: Remove substitution to force
'ping' instead of 'netcat' to check for network access.
-rw-r--r--gnu/packages/mail.scm6
1 files changed, 1 insertions, 5 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index f72f6c21e3..d0839fbe09 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1751,11 +1751,7 @@ addons which can add many functionalities to the base client.")
                (install-file (string-append msmtpq "/msmtpq") bin)
                (install-file (string-append msmtpq "/msmtp-queue") bin)
                (install-file (string-append msmtpq "/README.msmtpq") doc)
-               (install-file "scripts/vim/msmtp.vim" vimfiles)
-               ;; Don't rely on netcat being in the PATH to test for a
-               ;; connection, instead look up and ping debian.org.
-               (substitute* (string-append bin "/msmtpq")
-                 (("EMAIL_CONN_TEST=n") "EMAIL_CONN_TEST=p"))))))))
+               (install-file "scripts/vim/msmtp.vim" vimfiles)))))))
     (properties
      '((release-monitoring-url . "https://marlam.de/msmtp/download/")))
     (synopsis