[bug#70390] [PATCH 0/2] Add s-exp support to Notmuch

[bug#70390] [PATCH 0/2] Add s-exp support to Notmuch

[Fabio Natali via Guix-patches via]

Dear All,

On 2022-04-25⁰, support for S-expression-based queries was added to
Notmuch (version 0.36). This is based on a C/C++ library called sfsexp¹.

You can check whether your Notmuch was built with s-exp support with
this command²:

,----
| notmuch config get built_with.sexp_queries
`----

The Notmuch version currently packaged in Guix does not support s-exp
queries.

This patch micro-series is to:

- Add sfsexp¹.
- Update Notmuch to make use of sfsexp and to allow S-expression-based queries.

Thanks, best wishes, Fabio.


⁰ https://git.notmuchmail.org/git?p=notmuch;a=blob;f=NEWS;h=cf8107f26362431549dc410cb8379de5c10221f1;hb=HEAD#l165
¹ https://github.com/mjsottile/sfsexp
² https://notmuchmail.org/doc/latest/man7/notmuch-sexp-queries.html


Fabio Natali (2):
  gnu: Add sfsexp.
  gnu: notmuch: Add sfsexp dependency.

 gnu/packages/c.scm    | 22 ++++++++++++++++++++++
 gnu/packages/mail.scm |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)


base-commit: e5dda412c2e28fb65a549824f492895e72c33813
-- 
2.41.0

[bug#70390] [PATCH 1/2] gnu: Add sfsexp.

[Fabio Natali via Guix-patches via]

* gnu/packages/c.scm (sfsexp): New variable.

Change-Id: Iabfbe10b4ad6134ae886a3d26487f881107b559c
---
 gnu/packages/c.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index c004aade73..ef8f9e473b 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -628,6 +628,28 @@ (define-public packcc
 any other grammar rules.")
     (license license:expat)))
 
+(define-public sfsexp
+  (package
+    (name "sfsexp")
+    (version "1.4.1")
+    (home-page "https://github.com/mjsottile/sfsexp")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "03srnpc7p1j7ygd0wx9gybcxhqm50kjzkybh1xs75nwz97q3y2dq"))))
+    (build-system gnu-build-system)
+    (native-inputs (list autoconf automake libtool))
+    (synopsis "Symbolic expression library for C and C++")
+    (description
+     "sfsexp is a C/C++ library for the manipulation (read, parse, modify, and create)
+of symbolic expressions.")
+    (license license:lgpl2.1+)))
+
 (define-public sparse
   (package
     (name "sparse")
-- 
2.41.0

[bug#70390] [PATCH 2/2] gnu: notmuch: Add sfsexp dependency.

[Fabio Natali via Guix-patches via]

sfsexp is a C/C++ library for the manipulation (read, parse, modify, and create)
of symbolic expressions. In an environment where sfsexp is available, Notmuch
will compile with support for a S-expression-based query format. This commit is
to add sfsexp as a Notmuch dependency and therefore to add S-exp support.

Change-Id: Ic3b4a30b2672ad690d66b283e9bdc8e2197f97a7
---
 gnu/packages/mail.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index e0fbd0a5ff..2b5561f706 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -81,6 +81,7 @@ (define-module (gnu packages mail)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages c)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
@@ -1414,6 +1415,7 @@ (define-public notmuch
                   (("/bin/sh") sh))))))))
     (native-inputs
      (list bash-completion
+           git
            pkg-config
            python
            python-docutils
@@ -1427,7 +1429,7 @@ (define-public notmuch
            man-db
            perl))
     (inputs
-     (list glib gmime talloc xapian zlib))
+     (list glib gmime sfsexp talloc xapian zlib))
     (home-page "https://notmuchmail.org/")
     (synopsis "Thread-based email index, search, and tagging")
     (description
-- 
2.41.0

[bug#70390] [PATCH 2/2] gnu: notmuch: Add sfsexp dependency.

[Nicolas Graves via Guix-patches via]

On 2024-04-15 08:25, Fabio Natali via Guix-patches via wrote:

> sfsexp is a C/C++ library for the manipulation (read, parse, modify, and create)
> of symbolic expressions. In an environment where sfsexp is available, Notmuch
> will compile with support for a S-expression-based query format. This commit is
> to add sfsexp as a Notmuch dependency and therefore to add S-exp support.
>
> Change-Id: Ic3b4a30b2672ad690d66b283e9bdc8e2197f97a7
> ---
>  gnu/packages/mail.scm | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
> index e0fbd0a5ff..2b5561f706 100644
> --- a/gnu/packages/mail.scm
> +++ b/gnu/packages/mail.scm
> @@ -81,6 +81,7 @@ (define-module (gnu packages mail)
>    #:use-module (gnu packages bash)
>    #:use-module (gnu packages bison)
>    #:use-module (gnu packages boost)
> +  #:use-module (gnu packages c)
>    #:use-module (gnu packages calendar)
>    #:use-module (gnu packages check)
>    #:use-module (gnu packages compression)
> @@ -1414,6 +1415,7 @@ (define-public notmuch
>                    (("/bin/sh") sh))))))))
>      (native-inputs
>       (list bash-completion
> +           git

You probably want to use git-minimal here. I've checked that it
builds. Otherwise LGTM.

>             pkg-config
>             python
>             python-docutils
> @@ -1427,7 +1429,7 @@ (define-public notmuch
>             man-db
>             perl))
>      (inputs
> -     (list glib gmime talloc xapian zlib))
> +     (list glib gmime sfsexp talloc xapian zlib))
>      (home-page "https://notmuchmail.org/")
>      (synopsis "Thread-based email index, search, and tagging")
>      (description

-- 
Best regards,
Nicolas Graves

[bug#70390] [PATCH 2/2] gnu: notmuch: Add sfsexp dependency.

[Nicolas Graves via Guix-patches via]

On 2024-04-15 08:25, Fabio Natali via Guix-patches via wrote:

> sfsexp is a C/C++ library for the manipulation (read, parse, modify, and create)
> of symbolic expressions. In an environment where sfsexp is available, Notmuch
> will compile with support for a S-expression-based query format. This commit is
> to add sfsexp as a Notmuch dependency and therefore to add S-exp support.
>
> Change-Id: Ic3b4a30b2672ad690d66b283e9bdc8e2197f97a7
> ---
>  gnu/packages/mail.scm | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
> index e0fbd0a5ff..2b5561f706 100644
> --- a/gnu/packages/mail.scm
> +++ b/gnu/packages/mail.scm
> @@ -81,6 +81,7 @@ (define-module (gnu packages mail)
>    #:use-module (gnu packages bash)
>    #:use-module (gnu packages bison)
>    #:use-module (gnu packages boost)
> +  #:use-module (gnu packages c)
>    #:use-module (gnu packages calendar)
>    #:use-module (gnu packages check)
>    #:use-module (gnu packages compression)
> @@ -1414,6 +1415,7 @@ (define-public notmuch
>                    (("/bin/sh") sh))))))))
>      (native-inputs
>       (list bash-completion
> +           git

Oh and it should also probably be put a few lines down where it's
indicated inputs for tests.

>             pkg-config
>             python
>             python-docutils
> @@ -1427,7 +1429,7 @@ (define-public notmuch
>             man-db
>             perl))
>      (inputs
> -     (list glib gmime talloc xapian zlib))
> +     (list glib gmime sfsexp talloc xapian zlib))
>      (home-page "https://notmuchmail.org/")
>      (synopsis "Thread-based email index, search, and tagging")
>      (description

-- 
Best regards,
Nicolas Graves

[bug#70390] QA review for 70390

[Nicolas Graves via Guix-patches via]

user guix
usertag 70390 + reviewed-looks-good
thanks

Guix QA review form submission:

git should be rewritten to git-minimal and inserted a few lines down instead. 
Otherwise LGTM.

Items marked as checked: Lint warnings, Package builds, Commit messages, New package licenses, New package tests, New package synopsis and descriptions

-- 
Best regards,
Nicolas Graves

[bug#70390] QA review for 70390

[Nicolas Graves via Guix-patches via]

On 2024-05-13 10:42, Nicolas Graves wrote:

> user guix
> usertag 70390 + reviewed-looks-good
> thanks
>
> Guix QA review form submission:
>
> git should be rewritten to git-minimal and inserted a few lines down
> instead.

And probably git-minimal/pinned, see https://issues.guix.gnu.org/70656
for instance.

> Otherwise LGTM.
>
> Items marked as checked: Lint warnings, Package builds, Commit messages, New package licenses, New package tests, New package synopsis and descriptions

-- 
Best regards,
Nicolas Graves

bug#70390: QA review for 70390

[Christopher Baines]

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

Nicolas Graves via Guix-patches via <guix-patches@gnu.org> writes:

> On 2024-05-13 10:42, Nicolas Graves wrote:
>
>> user guix
>> usertag 70390 + reviewed-looks-good
>> thanks
>>
>> Guix QA review form submission:
>>
>> git should be rewritten to git-minimal and inserted a few lines down
>> instead.
>
> And probably git-minimal/pinned, see https://issues.guix.gnu.org/70656
> for instance.
>
>> Otherwise LGTM.
>>
>> Items marked as checked: Lint warnings, Package builds, Commit messages, New package licenses, New package tests, New package synopsis and descriptions

Thanks both, I've tweaked the git input and pushed these patches to
master as b1de64812a0a9e30507fb1ea44611779149c32cc.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]