TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: neomutt: Update to 20191025.

Browse source 
* 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.
This commit is contained in:
Tobias Geerinckx-Rice 2019-10-25 23:13:06 +02:00
parent cb9744f5de
commit 5cc96489ae
No known key found for this signature in database
GPG key ID: D889B0F018C5493C
1 changed files with 87 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

177
gnu/packages/mail.scm
View file

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