gnu: neomutt: Update to 20191025.

* gnu/packages/mail.scm (neomutt): Update to 20191025.
[inputs]: Use libidn2 instead of libidn.
[arguments]: Adjust #:configure-flags accordingly.
Enable tests.  Remove ‘fix-sasl-test’ phase.

gnu/packages/mail.scm

@@ -390,18 +390,21 @@ (define-public mutt
     (license gpl2+)))
 
 (define-public neomutt
+  (let ((tag "2019-10-25"))
     (package
       (name "neomutt")
-    (version "20180716")
+      ;; Upstream now uses YYYY-MM-DD instead of YYYYMMDD, but we're forever
+      ;; wed to the latter through ‘guix upgrade’.
+      (version (apply string-append (string-split tag #\-)))
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/neomutt/neomutt.git")
-             (commit (string-append "neomutt-" version))))
+               (commit tag)))
          (file-name (git-file-name name version))
          (sha256
-        (base32 "0im2kkahkr04q04irvcimfawxi531ld6wrsa92r2m7l10gmijkl8"))))
+          (base32 "0hy6rxgm3acjqxpf4ss7391kps4g06fbjhbpgv1jdrj1y9kv0rm1"))))
       (build-system gnu-build-system)
       (inputs
        `(("cyrus-sasl" ,cyrus-sasl)
@@ -409,11 +412,11 @@ (define-public neomutt
          ("gpgme" ,gpgme)
          ("ncurses" ,ncurses)
          ("gnutls" ,gnutls)
-       ("openssl" ,openssl) ;For smime
+         ("openssl" ,openssl)           ; for S/MIME
          ("perl" ,perl)
          ("kyotocabinet" ,kyotocabinet)
          ("libxslt" ,libxslt)
-       ("libidn" ,libidn)
+         ("libidn2" ,libidn2)
          ("libxml2" ,libxml2)
          ("lmdb" ,lmdb)
          ("notmuch" ,notmuch)))
@@ -426,11 +429,11 @@ (define-public neomutt
          ("w3m" ,w3m)
          ("tcl" ,tcl)))
       (arguments
-     `(#:tests? #f
+       `(#:test-target "test"
          #:configure-flags
          (list "--gpgme"
 
-             ;; database, implies header caching
+               ;; Database, implies header caching.
                "--disable-tokyocabinet"
                "--disable-qdbm"
                "--disable-bdb"
@@ -448,11 +451,12 @@ (define-public neomutt
 
                "--smime"
                "--notmuch"
-             "--idn"
+               "--disable-idn"
+               "--idn2"
 
                ;; If we do not set this, neomutt wants to check
                ;; whether the path exists, which it does not
-             ;; in the chroot. The workaround is this.
+               ;; in the chroot.
                "--with-mailpath=/var/mail"
 
                "--with-ui=ncurses"
@@ -465,13 +469,6 @@ (define-public neomutt
          (modify-phases %standard-phases
            ;; TODO: autosetup is meant to be included in the source,
            ;; but we should package autosetup and use our own version of it.
-         (add-before 'configure 'fix-sasl-test
-           (lambda _
-             ;; Upstream suggestion to fix the failing sasl autosetup test.
-             (substitute* "auto.def"
-               (("cc-with \\[list -cflags -I\\$prefix/include -libs")
-                "cc-with [list -includes stddef.h -cflags -I$prefix/include -libs"))
-             #t))
            (replace 'configure
              (lambda* (#:key outputs inputs configure-flags #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))
@@ -487,7 +484,7 @@ (define-public neomutt
       (description
        "NeoMutt is a command-line mail reader which is based on mutt.
 It adds a large amount of new and improved features to mutt.")
-    (license gpl2+)))
+      (license gpl2+))))
 
 (define-public gmime
   (package