me
/
guix
Archived
1
0
Fork 0
Code

gnu: notmuch: Update to 0.31. 

* gnu/packages/mail.scm (notmuch): Update to 0.31.

[source]: Remove the workarounds that were temporarily needed to cope with the
tilde ("~") in the upstream "~rc" version number.
master
Mark H Weaver 2020-09-01 01:13:15 -04:00
parent b2e5d1c145
commit edc55ce9d6
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 4 additions and 10 deletions
gnu/packages

14
gnu/packages/mail.scm
View File

@ -928,20 +928,14 @@ invoking @command{notifymuch} from the post-new hook.")
(define-public notmuch (define-public notmuch
(package (package
(name "notmuch") (name "notmuch")
(version "0.30-0.31rc1") ; Ensure it is ordered before "0.31" (version "0.31")
(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 version ".tar.xz"))
"0.31~rc1" ;FIXME: Remove on the next update
".tar.xz"))
;; FIXME: The 'file-name' field below is needed only because of
;; the tilde "~" in the URL base name. Remove it when the tilde
;; is no longer there.
(file-name (string-append name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"11f10r9pp3p22afpfsrlz0xa0raas4w7fg2jkscgkjj5710ws8fw")))) "1543l57viqzqikjgfzp2abpwz3p0k2iq0b1b3wmn31lwaghs07sp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
@ -973,7 +967,7 @@ invoking @command{notifymuch} from the post-new hook.")
(string-append "--emacsetcdir=" elisp))))) (string-append "--emacsetcdir=" elisp)))))
(add-before 'check 'disable-failing-tests (add-before 'check 'disable-failing-tests
;; FIXME: Investigate why these tests are failing, ;; FIXME: Investigate why these tests are failing,
;; 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"))