Re: [PATCH] update notmuch and python bindings

[Troy Sankey <sankeytms@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 560 bytes --]

Updated patches address all comments so far except for the removal of
the emacs input.  Also updated the test numbers just for fun.

Quoting ng0 (2016-08-07 18:24:57)
> I'd also advise to upgrade git to something more recent if your distro
> allows it :)

Debian stable :)  It's a long term project of mine to switch to GuixSD.
I'm switching over one package at a time.  Next is notmuch!

> I'll try to test build tomorrow morning when my buildserver is up
> again. release notes read interesting enough. thanks for the patches.

Thanks.

Troy

[-- Attachment #2: 0003-gnu-python2-notmuch-Update-to-0.22.1.patch --]
[-- Type: text/x-diff, Size: 2071 bytes --]

From 8d0f5d8c0a8bb1205e71df2f2aa7366252961792 Mon Sep 17 00:00:00 2001
From: Troy Sankey <sankeytms@gmail.com>
Date: Sun, 7 Aug 2016 13:27:18 -0400
Subject: [PATCH 3/3] gnu: python2-notmuch: Update to 0.22.1.

---
 gnu/packages/mail.scm | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 1634d86..7e0b096 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -560,38 +560,7 @@ and search library.")
     (license gpl3+)))
 
 (define-public python2-notmuch
-  (package
-    (name "python2-notmuch")
-    (version "0.15.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://pypi.python.org/packages/source/n/notmuch/notmuch-"
-                    version
-                    ".tar.gz"))
-              (sha256
-               (base32
-                "18g8701ibr153ngsz258kgcd42wqnbf9ifpqig1bijy6b0zx9xn5"))))
-    (build-system python-build-system)
-    (inputs `(("notmuch" ,notmuch)))
-    (arguments
-     `(#:python ,python-2
-       #:phases (modify-phases %standard-phases
-                  (add-before
-                   'build 'set-libnotmuch-file-name
-                   (lambda* (#:key inputs #:allow-other-keys)
-                     (let ((notmuch (assoc-ref inputs "notmuch")))
-                       (substitute* "notmuch/globals.py"
-                         (("libnotmuch\\.so\\.[0-9]")
-                          (string-append notmuch "/lib/libnotmuch.so.4")))
-                       #t))))
-       #:tests? #f))                              ;no "test" target
-    (home-page "http://notmuchmail.org/")
-    (synopsis "Python bindings of the Notmuch mail indexing library")
-    (description
-     "This package provides Python bindings to use the Notmuch mail indexing
-and search library.")
-    (license gpl3+)))
+  (package-with-python2 python-notmuch))
 
 (define-public getmail
   (package
-- 
2.1.4


[-- Attachment #3: 0002-gnu-Add-python-notmuch.patch --]
[-- Type: text/x-diff, Size: 2496 bytes --]

From 0a134eaf40aa9dd6fa5e2e24e3d226203a03da73 Mon Sep 17 00:00:00 2001
From: Troy Sankey <sankeytms@gmail.com>
Date: Sun, 7 Aug 2016 13:26:30 -0400
Subject: [PATCH 2/3] gnu: Add python-notmuch

---
 gnu/packages/mail.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 82e35fb..1634d86 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -517,6 +517,48 @@ ing, and tagging large collections of email messages.")
 useful for email address completion.")
     (license license:expat)))
 
+(define-public python-notmuch
+  (package
+    (name "python-notmuch")
+    (version "0.22.1")
+    (source (origin
+              (method url-fetch)
+              ;; notmuch python bindings are now unavailable on pypi.  The
+              ;; bindings are distributed via the notmuch release tarball.
+              (uri (string-append
+                    "https://notmuchmail.org/releases/notmuch-"
+                    version
+                    ".tar.gz"))
+              (sha256
+               (base32
+                "0jwpda3q023dn3sp41n8648951i7iagfv8zzpriv7hpkjivlafg7"))))
+    (build-system python-build-system)
+    (inputs `(("notmuch" ,notmuch)))
+    (arguments
+     `(#:tests? #f  ; no "test" target
+       #:phases
+       (modify-phases %standard-phases
+         ;; this python package lives in a subdirectory of the notmuch source
+         ;; tree, so chdir into it before building:
+         (add-before 'build 'chdir
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (chdir "bindings/python")))
+         ;; make sure the correct notmuch shared library gets loaded:
+         (add-before
+           'build 'set-libnotmuch-file-name
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((notmuch (assoc-ref inputs "notmuch")))
+               (substitute* "notmuch/globals.py"
+                 (("libnotmuch\\.so\\.")
+                  (string-append notmuch "/lib/libnotmuch.so.")))
+               #t))))))
+    (home-page "http://notmuchmail.org/")
+    (synopsis "Python bindings of the Notmuch mail indexing library")
+    (description
+     "This package provides Python bindings to use the Notmuch mail indexing
+and search library.")
+    (license gpl3+)))
+
 (define-public python2-notmuch
   (package
     (name "python2-notmuch")
-- 
2.1.4


[-- Attachment #4: 0001-gnu-notmuch-Update-to-0.22.1.patch --]
[-- Type: text/x-diff, Size: 1974 bytes --]

From 034a4ac3b1bc85ae574fbe9f79add609cf311cc1 Mon Sep 17 00:00:00 2001
From: Troy Sankey <sankeytms@gmail.com>
Date: Sun, 7 Aug 2016 13:21:28 -0400
Subject: [PATCH 1/3] gnu: notmuch: Update to 0.22.1.

This also removes the emacs input.  Quote from the notmuch NEWS file:

  Drop dependency on "pkg-config emacs".
---
 gnu/packages/mail.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 28978a8..82e35fb 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -436,18 +436,18 @@ attachments, create new maildirs, and so on.")
 (define-public notmuch
   (package
     (name "notmuch")
-    (version "0.21")
+    (version "0.22.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://notmuchmail.org/releases/notmuch-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1cr53rbpkcy3pvrmhbg2gq7sjpwb0c8xd7a4zhzxbiv8s7z8yvyh"))))
+                "0jwpda3q023dn3sp41n8648951i7iagfv8zzpriv7hpkjivlafg7"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f ;; FIXME: 662 tests; 168 fail and 99 are skipped
-                   ;; with perl input: 50 fail and 99 are skipped
+     '(#:tests? #f ; FIXME: 694 tests; 170 fail and 100 are skipped
+                   ; with perl input: 50 fail and 100 are skipped
        #:phases (modify-phases %standard-phases
                   (replace 'configure
                     (lambda* (#:key outputs #:allow-other-keys)
@@ -464,8 +464,7 @@ attachments, create new maildirs, and so on.")
        ("python-sphinx" ,python2-sphinx)
        ("bash-completion" ,bash-completion)))
     (inputs
-     `(("emacs" ,emacs)
-       ("glib" ,glib)
+     `(("glib" ,glib)
        ("gmime" ,gmime)
        ("talloc" ,talloc)
        ("xapian" ,xapian)
-- 
2.1.4