gnu: notmuch: Update to 0.32.1.

* gnu/packages/mail.scm (notmuch): Update to 0.32.1.
[arguments]<#:phases>: Don’t return #t at the end of the phase, this won’t be
necessary once core-update gets merged.

Signed-off-by: Marius Bakke <marius@gnu.org>
This commit is contained in:
Xinglu Chen 2021-05-16 16:08:32 +02:00 committed by Marius Bakke
parent a9f84f93b4
commit 030bdbf141
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -1331,14 +1331,14 @@ (define-public notifymuch
(define-public notmuch (define-public notmuch
(package (package
(name "notmuch") (name "notmuch")
(version "0.31.4") (version "0.32.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://notmuchmail.org/releases/notmuch-" (uri (string-append "https://notmuchmail.org/releases/notmuch-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0magnyjjhhv11nwcm2596hdxszrj61y69i0hmwqdc3v6cxjvcqc6")))) "0586d13ssygapjdri4cl25wzywivwsbxpjm6xlgxj6f9ii7clix7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
@ -1354,8 +1354,7 @@ (define-public notmuch
(add-after 'unpack 'patch-notmuch-lib.el (add-after 'unpack 'patch-notmuch-lib.el
(lambda _ (lambda _
(substitute* "emacs/notmuch-lib.el" (substitute* "emacs/notmuch-lib.el"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))))
#t))
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(setenv "CC" "gcc") (setenv "CC" "gcc")
@ -1372,15 +1371,13 @@ (define-public notmuch
;; and try removing this for notmuch versions > 0.31. ;; and try removing this for notmuch versions > 0.31.
(lambda _ (lambda _
(substitute* "test/T356-protected-headers.sh" (substitute* "test/T356-protected-headers.sh"
(("\\$NOTMUCH_GMIME_X509_CERT_VALIDITY") "0")) (("\\$NOTMUCH_GMIME_X509_CERT_VALIDITY") "0"))))
#t))
(add-before 'check 'prepare-test-environment (add-before 'check 'prepare-test-environment
(lambda _ (lambda _
(setenv "TEST_CC" "gcc") (setenv "TEST_CC" "gcc")
;; Patch various inline shell invocations. ;; Patch various inline shell invocations.
(substitute* (find-files "test" "\\.sh$") (substitute* (find-files "test" "\\.sh$")
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))))
#t))
(add-after 'install 'make-autoloads (add-after 'install 'make-autoloads
(assoc-ref emacs:%standard-phases 'make-autoloads))))) (assoc-ref emacs:%standard-phases 'make-autoloads)))))
(native-inputs (native-inputs