From cd67838b9f0a161a1031eacb3e721bdbf78edf81 Mon Sep 17 00:00:00 2001
From: Herman Rimm <herman@rimm.ee>
Date: Tue, 30 Jan 2024 16:24:54 +0100
Subject: [PATCH] gnu: Add rust-notmuch-0.8.

* gnu/packages/crates-io.scm (rust-notmuch-0.8): Add variable.
(rust-notmuch-0.6): Inherit from rust-notmuch-0.8.

Change-Id: I7d0db16ab65a816e3696bb3d25c472a325175e81
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/crates-io.scm | 62 +++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3111278dca..305baf6508 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40840,8 +40840,45 @@ notification library.")
        (("rust-tempfile" ,rust-tempfile-3))))
     (license license:cc0)))
 
+(define-public rust-notmuch-0.8
+  (package
+    (name "rust-notmuch")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "notmuch" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0i6xc7lv10m2sq6vlpjr5wxmlxihvd0v4f5if75r2kwz8ji12pg2"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+                 (substitute* "Cargo.toml"
+                   ;; Use a newer maildir.
+                   (("version = \"0.3.2\"") "version = \"0.5.0\""))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-from-variants" ,rust-from-variants-0.6)
+        ("rust-libc" ,rust-libc-0.2))
+       #:cargo-development-inputs
+       (("rust-dirs" ,rust-dirs-1)
+        ("rust-gethostname" ,rust-gethostname-0.2)
+        ("rust-lettre" ,rust-lettre-0.9)
+        ("rust-lettre-email" ,rust-lettre-email-0.9)
+        ("rust-maildir" ,rust-maildir-0.5)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (native-inputs (list pkg-config))
+    (inputs (list openssl notmuch))
+    (home-page "https://github.com/vhdirk/notmuch-rs")
+    (synopsis "Rust interface and bindings for Notmuch")
+    (description
+     "This crate provides a Rust interface and bindings for Notmuch.")
+    (license license:gpl3+)))
+
 (define-public rust-notmuch-0.6
   (package
+    (inherit rust-notmuch-0.8)
     (name "rust-notmuch")
     (version "0.6.0")
     (source
@@ -40850,8 +40887,12 @@ notification library.")
        (uri (crate-uri "notmuch" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "19q93iyvx4liksm09mhq9ibm8zj7i3dizc1s40f916z0kbpn9k5w"))))
-    (build-system cargo-build-system)
+        (base32 "19q93iyvx4liksm09mhq9ibm8zj7i3dizc1s40f916z0kbpn9k5w"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+                 (substitute* "Cargo.toml"
+                   ;; Use a newer maildir.
+                   (("version = \"0.3.2\"") "version = \"0.5.0\""))))))
     (arguments
      `(#:tests? #f         ;see https://github.com/vhdirk/notmuch-rs/issues/35
        #:cargo-inputs
@@ -40863,22 +40904,7 @@ notification library.")
         ("rust-lettre" ,rust-lettre-0.9)
         ("rust-lettre-email" ,rust-lettre-email-0.9)
         ("rust-maildir" ,rust-maildir-0.5)
-        ("rust-tempfile" ,rust-tempfile-3))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-maildir-version
-           (lambda* _
-             (substitute* "Cargo.toml"
-               (("version = \"0.3.2\"") "version = \"0.5.0\"")))))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list openssl notmuch))
-    (home-page "https://github.com/vhdirk/notmuch-rs")
-    (synopsis "Rust interface and bindings for Notmuch")
-    (description
-     "This crate provides a Rust interface and bindings for Notmuch.")
-    (license license:gpl3+)))
+        ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-ntapi-0.4
   (package