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.

1 files changed, 94 insertions, 97 deletions

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 21d270252f..9e8b778c73 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -390,104 +390,101 @@ operating systems.")
     (license gpl2+)))
 
 (define-public neomutt
-  (package
-    (name "neomutt")
-    (version "20180716")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/neomutt/neomutt.git")
-             (commit (string-append "neomutt-" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0im2kkahkr04q04irvcimfawxi531ld6wrsa92r2m7l10gmijkl8"))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("cyrus-sasl" ,cyrus-sasl)
-       ("gdbm" ,gdbm)
-       ("gpgme" ,gpgme)
-       ("ncurses" ,ncurses)
-       ("gnutls" ,gnutls)
-       ("openssl" ,openssl) ;For smime
-       ("perl" ,perl)
-       ("kyotocabinet" ,kyotocabinet)
-       ("libxslt" ,libxslt)
-       ("libidn" ,libidn)
-       ("libxml2" ,libxml2)
-       ("lmdb" ,lmdb)
-       ("notmuch" ,notmuch)))
-    (native-inputs
-     `(("automake" ,automake)
-       ("gettext-minimal" ,gettext-minimal)
-       ("pkg-config" ,pkg-config)
-       ("docbook-xsl" ,docbook-xsl)
-       ("docbook-xml" ,docbook-xml-4.2)
-       ("w3m" ,w3m)
-       ("tcl" ,tcl)))
-    (arguments
-     `(#:tests? #f
-       #:configure-flags
-       (list "--gpgme"
-
-             ;; database, implies header caching
-             "--disable-tokyocabinet"
-             "--disable-qdbm"
-             "--disable-bdb"
-             "--lmdb"
-             "--kyotocabinet"
-
-             "--gdbm"
-
-             "--gnutls"
-             "--disable-ssl"
-             "--sasl"
-             (string-append "--with-sasl="
-                            (assoc-ref %build-inputs "cyrus-sasl"))
-
-
-             "--smime"
-             "--notmuch"
-             "--idn"
-
-             ;; 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.
-             "--with-mailpath=/var/mail"
-
-             "--with-ui=ncurses"
-             (string-append "--with-ncurses="
-                            (assoc-ref %build-inputs "ncurses"))
-             (string-append "--prefix="
-                            (assoc-ref %outputs "out"))
-             "--debug")
-       #:phases
-       (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"))
-                    (flags `(,@configure-flags))
-                    (bash (which "bash")))
-               (setenv "SHELL" bash)
-               (setenv "CONFIG_SHELL" bash)
-               (apply invoke bash
-                      (string-append (getcwd) "/configure")
-                      flags)))))))
-    (home-page "https://www.neomutt.org/")
-    (synopsis "Command-line mail reader based on Mutt")
-    (description
-     "NeoMutt is a command-line mail reader which is based on mutt.
+  (let ((tag "2019-10-25"))
+    (package
+      (name "neomutt")
+      ;; 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 tag)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0hy6rxgm3acjqxpf4ss7391kps4g06fbjhbpgv1jdrj1y9kv0rm1"))))
+      (build-system gnu-build-system)
+      (inputs
+       `(("cyrus-sasl" ,cyrus-sasl)
+         ("gdbm" ,gdbm)
+         ("gpgme" ,gpgme)
+         ("ncurses" ,ncurses)
+         ("gnutls" ,gnutls)
+         ("openssl" ,openssl)           ; for S/MIME
+         ("perl" ,perl)
+         ("kyotocabinet" ,kyotocabinet)
+         ("libxslt" ,libxslt)
+         ("libidn2" ,libidn2)
+         ("libxml2" ,libxml2)
+         ("lmdb" ,lmdb)
+         ("notmuch" ,notmuch)))
+      (native-inputs
+       `(("automake" ,automake)
+         ("gettext-minimal" ,gettext-minimal)
+         ("pkg-config" ,pkg-config)
+         ("docbook-xsl" ,docbook-xsl)
+         ("docbook-xml" ,docbook-xml-4.2)
+         ("w3m" ,w3m)
+         ("tcl" ,tcl)))
+      (arguments
+       `(#:test-target "test"
+         #:configure-flags
+         (list "--gpgme"
+
+               ;; Database, implies header caching.
+               "--disable-tokyocabinet"
+               "--disable-qdbm"
+               "--disable-bdb"
+               "--lmdb"
+               "--kyotocabinet"
+
+               "--gdbm"
+
+               "--gnutls"
+               "--disable-ssl"
+               "--sasl"
+               (string-append "--with-sasl="
+                              (assoc-ref %build-inputs "cyrus-sasl"))
+
+
+               "--smime"
+               "--notmuch"
+               "--disable-idn"
+               "--idn2"
+
+               ;; If we do not set this, neomutt wants to check
+               ;; whether the path exists, which it does not
+               ;; in the chroot.
+               "--with-mailpath=/var/mail"
+
+               "--with-ui=ncurses"
+               (string-append "--with-ncurses="
+                              (assoc-ref %build-inputs "ncurses"))
+               (string-append "--prefix="
+                              (assoc-ref %outputs "out"))
+               "--debug")
+         #:phases
+         (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.
+           (replace 'configure
+             (lambda* (#:key outputs inputs configure-flags #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (flags `(,@configure-flags))
+                      (bash (which "bash")))
+                 (setenv "SHELL" bash)
+                 (setenv "CONFIG_SHELL" bash)
+                 (apply invoke bash
+                        (string-append (getcwd) "/configure")
+                        flags)))))))
+      (home-page "https://www.neomutt.org/")
+      (synopsis "Command-line mail reader based on Mutt")
+      (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