Archived
1
0
Fork 0

gnu: neomutt: Update to 20191102.

* gnu/packages/mail.scm (neomutt): Update to 20191102.
This commit is contained in:
Tobias Geerinckx-Rice 2019-11-02 22:35:05 +01:00
parent 4a7f132240
commit d54a759d2b
No known key found for this signature in database
GPG key ID: D889B0F018C5493C

View file

@ -399,101 +399,98 @@ operating systems.")
(license gpl2+))) (license gpl2+)))
(define-public neomutt (define-public neomutt
(let ((tag "2019-10-25")) (package
(package (name "neomutt")
(name "neomutt") (version "20191102")
;; Upstream now uses YYYY-MM-DD instead of YYYYMMDD, but we're forever (source
;; wed to the latter through guix upgrade. (origin
(version (apply string-append (string-split tag #\-))) (method git-fetch)
(source (uri (git-reference
(origin (url "https://github.com/neomutt/neomutt.git")
(method git-fetch) (commit version)))
(uri (git-reference (file-name (git-file-name name version))
(url "https://github.com/neomutt/neomutt.git") (sha256
(commit tag))) (base32 "0x5f9zbvxsxg5y2ir4xq4xw1q2snaxkidhdyhcxw5ljw3qqwhlyq"))))
(file-name (git-file-name name version)) (build-system gnu-build-system)
(sha256 (inputs
(base32 "0hy6rxgm3acjqxpf4ss7391kps4g06fbjhbpgv1jdrj1y9kv0rm1")))) `(("cyrus-sasl" ,cyrus-sasl)
(build-system gnu-build-system) ("gdbm" ,gdbm)
(inputs ("gpgme" ,gpgme)
`(("cyrus-sasl" ,cyrus-sasl) ("ncurses" ,ncurses)
("gdbm" ,gdbm) ("gnutls" ,gnutls)
("gpgme" ,gpgme) ("openssl" ,openssl) ; for S/MIME
("ncurses" ,ncurses) ("perl" ,perl)
("gnutls" ,gnutls) ("kyotocabinet" ,kyotocabinet)
("openssl" ,openssl) ; for S/MIME ("libxslt" ,libxslt)
("perl" ,perl) ("libidn2" ,libidn2)
("kyotocabinet" ,kyotocabinet) ("libxml2" ,libxml2)
("libxslt" ,libxslt) ("lmdb" ,lmdb)
("libidn2" ,libidn2) ("notmuch" ,notmuch)))
("libxml2" ,libxml2) (native-inputs
("lmdb" ,lmdb) `(("automake" ,automake)
("notmuch" ,notmuch))) ("gettext-minimal" ,gettext-minimal)
(native-inputs ("pkg-config" ,pkg-config)
`(("automake" ,automake) ("docbook-xsl" ,docbook-xsl)
("gettext-minimal" ,gettext-minimal) ("docbook-xml" ,docbook-xml-4.2)
("pkg-config" ,pkg-config) ("w3m" ,w3m)
("docbook-xsl" ,docbook-xsl) ("tcl" ,tcl)))
("docbook-xml" ,docbook-xml-4.2) (arguments
("w3m" ,w3m) `(#:test-target "test"
("tcl" ,tcl))) #:configure-flags
(arguments (list "--gpgme"
`(#: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"
"--disable-idn" "--disable-idn"
"--idn2" "--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. ;; 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.
(replace 'configure (replace 'configure
(lambda* (#:key outputs inputs configure-flags #:allow-other-keys) (lambda* (#:key outputs inputs configure-flags #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(flags `(,@configure-flags)) (flags `(,@configure-flags))
(bash (which "bash"))) (bash (which "bash")))
(setenv "SHELL" bash) (setenv "SHELL" bash)
(setenv "CONFIG_SHELL" bash) (setenv "CONFIG_SHELL" bash)
(apply invoke bash (apply invoke bash
(string-append (getcwd) "/configure") (string-append (getcwd) "/configure")
flags))))))) flags)))))))
(home-page "https://www.neomutt.org/") (home-page "https://www.neomutt.org/")
(synopsis "Command-line mail reader based on Mutt") (synopsis "Command-line mail reader based on Mutt")
(description (description
"NeoMutt is a command-line mail reader which is based on mutt. "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