[PATCH] gnu: notmuch: Update to 0.20.2.

[PATCH] gnu: notmuch: Update to 0.20.2.

[David Thompson]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-notmuch-Update-to-0.20.2.patch --]
[-- Type: text/x-patch, Size: 2817 bytes --]

From 74d2db4f0ecbfc00473493e410a086f7c7c0bb10 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sat, 15 Aug 2015 22:23:59 -0400
Subject: [PATCH] gnu: notmuch: Update to 0.20.2.

* gnu/packages/mail.scm (notmuch): Update to 0.20.2.  Add python-sphinx native
  input.  Rewrite phases using 'modify-phases' syntax.
---
 gnu/packages/mail.scm | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index f8eba5c..131e48f 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -365,36 +365,31 @@ attachments, create new maildirs, and so on.")
 (define-public notmuch
   (package
     (name "notmuch")
-    (version "0.19")
+    (version "0.20.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://notmuchmail.org/releases/notmuch-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1szf6c44g209pcjq5nvfhlp3nzcm3lrcwv4spsxmwy13hiaccvrr"))))
+                "1v5dcnlg4km5hfaq0i0qywq5fn66fi0rq4aaibyqkwxz8mis4hgp"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f ;; FIXME: Test suite hangs and times out.
-       #:phases (alist-replace
-                 'configure
-                 (lambda* (#:key outputs #:allow-other-keys)
-                   (setenv "CC" "gcc")
-                   (setenv "CONFIG_SHELL" (which "sh"))
-
-                   ;; XXX Should python-docutils make a symlink
-                   ;; for "rst2man" and other similar programs?
-                   (substitute* '("configure" "doc/prerst2man.py")
-                     ((" rst2man ") " rst2man.py "))
-
-                   (let ((out (assoc-ref outputs "out")))
-                     (zero? (system* "./configure"
-                                     (string-append "--prefix=" out)))))
-                 %standard-phases)))
+     '(#:tests? #t ;; FIXME: 637 tests; 70 fail and 98 are skipped
+       #:phases (modify-phases %standard-phases
+                  (replace 'configure
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (setenv "CC" "gcc")
+                      (setenv "CONFIG_SHELL" (which "sh"))
+
+                      (let ((out (assoc-ref outputs "out")))
+                        (zero? (system* "./configure"
+                                        (string-append "--prefix=" out)))))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("python" ,python-2)
-       ("python2-docutils" ,python2-docutils)
+       ("python-docutils" ,python2-docutils)
+       ("python-sphinx" ,python2-sphinx)
        ("bash-completion" ,bash-completion)))
     (inputs
      `(("emacs" ,emacs)
-- 
2.4.3


[-- Attachment #2: Type: text/plain, Size: 38 bytes --]


-- 
David Thompson
GPG Key: 0FF1D807

Re: [PATCH] gnu: notmuch: Update to 0.20.2.

[Thompson, David]

Found a small typo.  The test suite should remain disabled.

s/#:tests? #t/#:tests? #f/

- Dave

Re: [PATCH] gnu: notmuch: Update to 0.20.2.

[Mark H Weaver]

David Thompson <davet@gnu.org> writes:

> From 74d2db4f0ecbfc00473493e410a086f7c7c0bb10 Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Sat, 15 Aug 2015 22:23:59 -0400
> Subject: [PATCH] gnu: notmuch: Update to 0.20.2.
>
> * gnu/packages/mail.scm (notmuch): Update to 0.20.2.  Add python-sphinx native
>   input.  Rewrite phases using 'modify-phases' syntax.

The commit log should probably mention that you enabled tests, but
otherwise it looks good to me.

     Thanks!
       Mark

Re: [PATCH] gnu: notmuch: Update to 0.20.2.

[Thompson, David]

On Sun, Aug 16, 2015 at 2:01 PM, Mark H Weaver <mhw@netris.org> wrote:
> David Thompson <davet@gnu.org> writes:
>
>> From 74d2db4f0ecbfc00473493e410a086f7c7c0bb10 Mon Sep 17 00:00:00 2001
>> From: David Thompson <dthompson2@worcester.edu>
>> Date: Sat, 15 Aug 2015 22:23:59 -0400
>> Subject: [PATCH] gnu: notmuch: Update to 0.20.2.
>>
>> * gnu/packages/mail.scm (notmuch): Update to 0.20.2.  Add python-sphinx native
>>   input.  Rewrite phases using 'modify-phases' syntax.
>
> The commit log should probably mention that you enabled tests, but
> otherwise it looks good to me.

That was a typo, sorry.  I'm actually leaving the tests disabled.
Things are much improved since I first packaged notmuch, but there's
still annoying issues that I can't figure out.

Fixed and pushed.  Thanks.

- Dave