From edc55ce9d6317f5f6ad5c4aedcff06d5082694a3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 1 Sep 2020 01:13:15 -0400 Subject: 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. --- gnu/packages/mail.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index beee68c67d..6f3a967575 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -928,20 +928,14 @@ (define-public notifymuch (define-public notmuch (package (name "notmuch") - (version "0.30-0.31rc1") ; Ensure it is ordered before "0.31" + (version "0.31") (source (origin (method url-fetch) (uri (string-append "https://notmuchmail.org/releases/notmuch-" - ;; version - "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")) + version ".tar.xz")) (sha256 (base32 - "11f10r9pp3p22afpfsrlz0xa0raas4w7fg2jkscgkjj5710ws8fw")))) + "1543l57viqzqikjgfzp2abpwz3p0k2iq0b1b3wmn31lwaghs07sp")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -973,7 +967,7 @@ (define-public notmuch (string-append "--emacsetcdir=" elisp))))) (add-before 'check 'disable-failing-tests ;; 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 _ (substitute* "test/T356-protected-headers.sh" (("\\$NOTMUCH_GMIME_X509_CERT_VALIDITY") "0")) -- cgit v1.2.3