[bug#52075] [PATCH 0/4] gnu: alot: Update to 0.10.

[bug#52075] [PATCH 0/4] gnu: alot: Update to 0.10.

[Tanguy Le Carrour]

Hi Guix,

In order to update `alot`, I had to change its inputs and add a new
variable: python-notmuch2.

Thanks for your time and reviews!

Tanguy Le Carrour (4):
  gnu: python-urwidtrees: Update to 1.0.3.
  gnu: notmuch: Update to 0.34.1.
  gnu: Add python-notmuch2.
  gnu: alot: Update to 0.10.

 gnu/packages/mail.scm       | 36 ++++++++++++++++++++++++++++++------
 gnu/packages/python-xyz.scm |  7 +++----
 2 files changed, 33 insertions(+), 10 deletions(-)

-- 
2.34.0

[bug#52075] [PATCH 1/4] gnu: python-urwidtrees: Update to 1.0.3.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-urwidtrees): Update to 1.0.3.
[arguments]: Use setuptools.
---
 gnu/packages/python-xyz.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 34d4910194..abb1e78e62 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8855,7 +8855,7 @@ (define-public python-textdistance
 (define-public python-urwidtrees
   (package
     (name "python-urwidtrees")
-    (version "1.0.2")
+    (version "1.0.3")
     (source
       (origin
         (method git-fetch)
@@ -8867,11 +8867,10 @@ (define-public python-urwidtrees
         (file-name (git-file-name name version))
         (sha256
           (base32
-           "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2"))))
+           "1y1vysx7jg0vbrarlsykhf7nmr8fc6k1fva1q3i98xq2m30s6r68"))))
     (build-system python-build-system)
     (arguments
-     '(#:use-setuptools? #f
-       #:tests? #f)) ; no tests
+     '(#:tests? #f)) ; no tests
     (propagated-inputs `(("python-urwid" ,python-urwid)))
     (home-page "https://github.com/pazz/urwidtrees")
     (synopsis "Tree widgets for urwid")
-- 
2.34.0

[bug#52075] [PATCH 2/4] gnu: notmuch: Update to 0.34.1.

[Tanguy Le Carrour]

* gnu/packages/mail.scm (notmuch): Update to 0.34.1.
---
 gnu/packages/mail.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 0e7134eaf3..7c7e411d5c 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -28,7 +28,7 @@
 ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
 ;;; Copyright © 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2019, 2020 Tanguy Le Carrour <tanguy@bioneland.org>
+;;; Copyright © 2019, 2020, 2021 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020 Justus Winter <justus@sequoia-pgp.org>
 ;;; Copyright © 2020 Eric Brown <ecbrown@ericcbrown.com>
@@ -1349,14 +1349,14 @@ (define-public notifymuch
 (define-public notmuch
   (package
     (name "notmuch")
-    (version "0.33.2")
+    (version "0.34.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://notmuchmail.org/releases/notmuch-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1bic1f2va136aygfy53bsgziwiidcpb7qf1v05mlza2jmgv94j14"))))
+                "05nq64gp8vnrwrl22d60v7ixgdhm9339ajhcdfkq0ll1qiycyyj5"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-- 
2.34.0

[bug#52075] [PATCH 3/4] gnu: Add python-notmuch2.

[Tanguy Le Carrour]

* gnu/packages/mail.scm (python-notmuch2): New variable.
---
 gnu/packages/mail.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 7c7e411d5c..9dc38708bf 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -107,6 +107,7 @@ (define-module (gnu packages mail)
   #:use-module (gnu packages language)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages libevent)
+  #:use-module (gnu packages libffi)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages libunwind)
@@ -1511,6 +1512,29 @@ (define-public python-notmuch
 (define-public python2-notmuch
   (package-with-python2 python-notmuch))
 
+(define-public python-notmuch2
+  (package
+    (name "python-notmuch2")
+    (version (package-version notmuch))
+    ;; The bindings are distributed via the notmuch release tarball.
+    (source (package-source notmuch))
+    (build-system python-build-system)
+    (inputs `(("notmuch" ,notmuch)))
+    (propagated-inputs `(("python-cffi" ,python-cffi)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; This python package lives in a subdirectory of the notmuch source
+         ;; tree, so chdir into it before building.
+         (add-after 'unpack 'enter-python-dir
+           (lambda _ (chdir "bindings/python-cffi") #t)))))
+    (home-page (package-home-page notmuch))
+    (synopsis "Pythonic bindings for the notmuch mail database using CFFI")
+    (description
+     "This package provides Python bindings to use the Notmuch mail indexing
+and search library.")
+    (license license:gpl3+)))
+
 (define-public muchsync
   (package
     (name "muchsync")
-- 
2.34.0

[bug#52075] [PATCH 3/4] gnu: Add python-notmuch2.

[Nicolas Goaziou]

Hello,

Tanguy Le Carrour <tanguy@bioneland.org> writes:

> * gnu/packages/mail.scm (python-notmuch2): New variable.

Thanks.

Would it be possible (or appropriate) to inherit from python-notmuch
instead?

Regards,
-- 
Nicolas Goaziou

[bug#52075] [PATCH 3/4] gnu: Add python-notmuch2.

[Tanguy LE CARROUR]

Hi Nicolas,

Thanks for reviewing!

Quoting Nicolas Goaziou (2021-11-24 11:29:02)
> Tanguy Le Carrour <tanguy@bioneland.org> writes:
> 
> > * gnu/packages/mail.scm (python-notmuch2): New variable.
> 
> Thanks.
> 
> Would it be possible (or appropriate) to inherit from python-notmuch
> instead?

Possible? Yes! Thanks for suggesting.

```
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 1069aac16c..e1e199c656 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1514,12 +1514,8 @@ (define-public python2-notmuch

 (define-public python-notmuch2
   (package
+    (inherit python-notmuch)
     (name "python-notmuch2")
-    (version (package-version notmuch))
-    ;; The bindings are distributed via the notmuch release tarball.
-    (source (package-source notmuch))
-    (build-system python-build-system)
-    (inputs `(("notmuch" ,notmuch)))
     (propagated-inputs `(("python-cffi" ,python-cffi)))
     (arguments
      `(#:phases
@@ -1528,11 +1524,7 @@ (define-public python-notmuch2
          ;; tree, so chdir into it before building.
          (add-after 'unpack 'enter-python-dir
            (lambda _ (chdir "bindings/python-cffi") #t)))))
-    (home-page (package-home-page notmuch))
     (synopsis "Pythonic bindings for the notmuch mail database using CFFI")
-    (description
-     "This package provides Python bindings to use the Notmuch mail indexing
-and search library.")
     (license license:gpl3+)))
```

Appropriate? I have no idea!

If this version is OK with you, I can submit a V2 of the patch set.

Regards,

-- 
Tanguy

[bug#52075] [PATCH 3/4] gnu: Add python-notmuch2.

[Nicolas Goaziou]

Tanguy LE CARROUR <tanguy@bioneland.org> writes:

>  (define-public python-notmuch2
>    (package
> +    (inherit python-notmuch)
>      (name "python-notmuch2")
> -    (version (package-version notmuch))
> -    ;; The bindings are distributed via the notmuch release tarball.
> -    (source (package-source notmuch))
> -    (build-system python-build-system)
> -    (inputs `(("notmuch" ,notmuch)))
>      (propagated-inputs `(("python-cffi" ,python-cffi)))
>      (arguments
>       `(#:phases
> @@ -1528,11 +1524,7 @@ (define-public python-notmuch2
>           ;; tree, so chdir into it before building.
>           (add-after 'unpack 'enter-python-dir
>             (lambda _ (chdir "bindings/python-cffi") #t)))))

You can drop the trailing #t above.

> -    (home-page (package-home-page notmuch))
>      (synopsis "Pythonic bindings for the notmuch mail database using CFFI")
> -    (description
> -     "This package provides Python bindings to use the Notmuch mail indexing
> -and search library.")
>      (license license:gpl3+)))
> ```
>
> Appropriate? I have no idea!
>
> If this version is OK with you, I can submit a V2 of the patch set.

It looks good, thanks. Please submit a v2 and I'll apply the patch set.

Regards,
-- 
Nicolas Goaziou

[bug#52075] [PATCH 3/4] gnu: Add python-notmuch2.

[Jack Hill]

On Wed, 24 Nov 2021, Tanguy LE CARROUR wrote:

> Hi Nicolas,
>
> Thanks for reviewing!
>
> Quoting Nicolas Goaziou (2021-11-24 11:29:02)
>> Tanguy Le Carrour <tanguy@bioneland.org> writes:
>>
>>> * gnu/packages/mail.scm (python-notmuch2): New variable.
>>
>> Thanks.
>>
>> Would it be possible (or appropriate) to inherit from python-notmuch
>> instead?
>
> Possible? Yes! Thanks for suggesting.
>
> Appropriate? I have no idea!

As far as appropriate, do you know more about the origin of these 
"notmuch2" bindings? I know that at some point notmuch upstream re-wrote 
the binding using CFFI. Is that the origin of this package? If so, then I 
would be inclined to make this package independent of the existing 
python-notmuch package. If not, then please ignore this concern.

Thoughts?
Jack

[bug#52075] [PATCH 3/4] gnu: Add python-notmuch2.

[Nicolas Goaziou]

Hello,

Jack Hill <jackhill@jackhill.us> writes:

> As far as appropriate, do you know more about the origin of these
> "notmuch2" bindings? I know that at some point notmuch upstream
> re-wrote the binding using CFFI. Is that the origin of this package?
> If so, then I would be inclined to make this package independent of
> the existing python-notmuch package. If not, then please ignore this
> concern.

I do not grasp your concern. python-notmuch and python-notmuch2 share
most fields. Inheritance prevents duplication, that's all.

Why are you inclined to make this new package independant (in the sense
of Guix inheritance) of python-notmuch?

Regards,
-- 
Nicolas Goaziou

[bug#52075] [PATCH 3/4] gnu: Add python-notmuch2.

[Jack Hill]

On Wed, 24 Nov 2021, Nicolas Goaziou wrote:

> Hello,
>
> Jack Hill <jackhill@jackhill.us> writes:
>
>> As far as appropriate, do you know more about the origin of these
>> "notmuch2" bindings? I know that at some point notmuch upstream
>> re-wrote the binding using CFFI. Is that the origin of this package?
>> If so, then I would be inclined to make this package independent of
>> the existing python-notmuch package. If not, then please ignore this
>> concern.
>
> I do not grasp your concern. python-notmuch and python-notmuch2 share
> most fields. Inheritance prevents duplication, that's all.
>
> Why are you inclined to make this new package independant (in the sense
> of Guix inheritance) of python-notmuch?

It is possible that my concern was misplaced. My thinking was that if the 
two bindings were logically separate projects, rather than being 
variations on the same code, we should keep them logically separate in 
Guix even if they are superficially similar. However, it might not be a 
logically separate project, and that might not be the right way to think 
about it anyway.

I don't have an objection to the version using inheritance. I am still 
curious in learning about the differences between the two packages if only 
for my own edification.

Hopefully that clarifies, and sorry for adding noise to this review.

Best,
Jack

bug#52075: [PATCH 3/4] gnu: Add python-notmuch2.

[Nicolas Goaziou]

Hello,

Jack Hill <jackhill@jackhill.us> writes:

> It is possible that my concern was misplaced. My thinking was that if
> the two bindings were logically separate projects, rather than being 
> variations on the same code, we should keep them logically separate in
> Guix even if they are superficially similar. However, it might not be
> a logically separate project, and that might not be the right way to
> think about it anyway.

They are probably internally separate, but they do share superficial
parts. The Guix shortcut is only concerned about the latter, IMO.

> I don't have an objection to the version using inheritance.

I applied the patch set. Thanks to Tanguy for it, and to you for the
feedback!

> I am still curious in learning about the differences between the two
> packages if only for my own edification.

I cannot help here, unfortunately.

> Hopefully that clarifies, and sorry for adding noise to this review.

No problem! I think you raise an interesting question: does inheritance
in Guix imply strong internal dependency between the project inheriting
and the one being inherited?

Regards,
-- 
Nicolas Goaziou

[bug#52075] [PATCH 3/4] gnu: Add python-notmuch2.

[Tanguy LE CARROUR]

Hi,


Quoting Nicolas Goaziou (2021-11-27 10:15:06)
> Jack Hill <jackhill@jackhill.us> writes:
> […]
> > I don't have an objection to the version using inheritance.
> 
> I applied the patch set. Thanks to Tanguy for it, and to you for the
> feedback!

Thanks!


> > I am still curious in learning about the differences between the two
> > packages if only for my own edification.
> 
> I cannot help here, unfortunately.

`python-notmuch2` contains the new binding that uses CFFI.
`python-notmuch` contains the "old" binding which, I guess, will be
deprecated at some point.

There's not much in the documentation or the mailing list about why they
decided to work on the new binding, though.


> > Hopefully that clarifies, and sorry for adding noise to this review.
> 
> No problem! I think you raise an interesting question: does inheritance
> in Guix imply strong internal dependency between the project inheriting
> and the one being inherited?

Actually, I have to admit that I have the same reserve about using
inheritance. But it's totally fine with me to use it as a mechanism
to reduce code duplication.

Regards,

-- 
Tanguy

[bug#52075] [PATCH 4/4] gnu: alot: Update to 0.10.

[Tanguy Le Carrour]

* gnu/packages/mail.scm (alot): Update to 0.10.
[inputs]: Use python-notmuch2.
---
 gnu/packages/mail.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 9dc38708bf..1069aac16c 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1240,7 +1240,7 @@ (define-public mu
 (define-public alot
   (package
     (name "alot")
-    (version "0.9.1")
+    (version "0.10")
     (source (origin
               (method git-fetch)
               ;; package author intends on distributing via github rather
@@ -1252,7 +1252,7 @@ (define-public alot
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0s94m17yph1gq9f2svipb3bbwbw1s4j3zf2xkg5h91006v8286r6"))))
+                "0awf1phdy1wqm01cy9zmvqlw6c8pvkxm2f9ncjd0cmzxqnmq1dyn"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -1288,7 +1288,7 @@ (define-public alot
        ("python-urwid" ,python-urwid)
        ("python-urwidtrees" ,python-urwidtrees)
        ("python-gpg" ,python-gpg)
-       ("python-notmuch" ,python-notmuch)))
+       ("python-notmuch2" ,python-notmuch2)))
     (home-page "https://github.com/pazz/alot")
     (synopsis "Command-line MUA using Notmuch")
     (description
-- 
2.34.0

[bug#52075] [PATCH v2 1/4] gnu: python-urwidtrees: Update to 1.0.3.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-urwidtrees): Update to 1.0.3.
[arguments]: Use setuptools.
---
 gnu/packages/python-xyz.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 34d4910194..abb1e78e62 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8855,7 +8855,7 @@ (define-public python-textdistance
 (define-public python-urwidtrees
   (package
     (name "python-urwidtrees")
-    (version "1.0.2")
+    (version "1.0.3")
     (source
       (origin
         (method git-fetch)
@@ -8867,11 +8867,10 @@ (define-public python-urwidtrees
         (file-name (git-file-name name version))
         (sha256
           (base32
-           "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2"))))
+           "1y1vysx7jg0vbrarlsykhf7nmr8fc6k1fva1q3i98xq2m30s6r68"))))
     (build-system python-build-system)
     (arguments
-     '(#:use-setuptools? #f
-       #:tests? #f)) ; no tests
+     '(#:tests? #f)) ; no tests
     (propagated-inputs `(("python-urwid" ,python-urwid)))
     (home-page "https://github.com/pazz/urwidtrees")
     (synopsis "Tree widgets for urwid")
-- 
2.34.0

[bug#52075] [PATCH v2 2/4] gnu: notmuch: Update to 0.34.1.

[Tanguy Le Carrour]

* gnu/packages/mail.scm (notmuch): Update to 0.34.1.
---
 gnu/packages/mail.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 0e7134eaf3..7c7e411d5c 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -28,7 +28,7 @@
 ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
 ;;; Copyright © 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2019, 2020 Tanguy Le Carrour <tanguy@bioneland.org>
+;;; Copyright © 2019, 2020, 2021 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020 Justus Winter <justus@sequoia-pgp.org>
 ;;; Copyright © 2020 Eric Brown <ecbrown@ericcbrown.com>
@@ -1349,14 +1349,14 @@ (define-public notifymuch
 (define-public notmuch
   (package
     (name "notmuch")
-    (version "0.33.2")
+    (version "0.34.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://notmuchmail.org/releases/notmuch-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1bic1f2va136aygfy53bsgziwiidcpb7qf1v05mlza2jmgv94j14"))))
+                "05nq64gp8vnrwrl22d60v7ixgdhm9339ajhcdfkq0ll1qiycyyj5"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-- 
2.34.0

[bug#52075] [PATCH v2 3/4] gnu: Add python-notmuch2.

[Tanguy Le Carrour]

* gnu/packages/mail.scm (python-notmuch2): New variable.
---
 gnu/packages/mail.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 7c7e411d5c..454c15e88b 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -107,6 +107,7 @@ (define-module (gnu packages mail)
   #:use-module (gnu packages language)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages libevent)
+  #:use-module (gnu packages libffi)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages libunwind)
@@ -1511,6 +1512,21 @@ (define-public python-notmuch
 (define-public python2-notmuch
   (package-with-python2 python-notmuch))
 
+(define-public python-notmuch2
+  (package
+    (inherit python-notmuch)
+    (name "python-notmuch2")
+    (propagated-inputs `(("python-cffi" ,python-cffi)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; This python package lives in a subdirectory of the notmuch source
+         ;; tree, so chdir into it before building.
+         (add-after 'unpack 'enter-python-dir
+           (lambda _ (chdir "bindings/python-cffi"))))))
+    (synopsis "Pythonic bindings for the notmuch mail database using CFFI")
+    (license license:gpl3+)))
+
 (define-public muchsync
   (package
     (name "muchsync")
-- 
2.34.0

[bug#52075] [PATCH v2 4/4] gnu: alot: Update to 0.10.

[Tanguy Le Carrour]

* gnu/packages/mail.scm (alot): Update to 0.10.
[inputs]: Use python-notmuch2.
---
 gnu/packages/mail.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 454c15e88b..b6ca985f53 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1240,7 +1240,7 @@ (define-public mu
 (define-public alot
   (package
     (name "alot")
-    (version "0.9.1")
+    (version "0.10")
     (source (origin
               (method git-fetch)
               ;; package author intends on distributing via github rather
@@ -1252,7 +1252,7 @@ (define-public alot
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0s94m17yph1gq9f2svipb3bbwbw1s4j3zf2xkg5h91006v8286r6"))))
+                "0awf1phdy1wqm01cy9zmvqlw6c8pvkxm2f9ncjd0cmzxqnmq1dyn"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -1288,7 +1288,7 @@ (define-public alot
        ("python-urwid" ,python-urwid)
        ("python-urwidtrees" ,python-urwidtrees)
        ("python-gpg" ,python-gpg)
-       ("python-notmuch" ,python-notmuch)))
+       ("python-notmuch2" ,python-notmuch2)))
     (home-page "https://github.com/pazz/alot")
     (synopsis "Command-line MUA using Notmuch")
     (description
-- 
2.34.0