Merge branch 'master' into emacs-team

1 files changed, 6 insertions, 20 deletions

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 75dc60744a..91b318c2ce 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -648,7 +648,7 @@ operating systems.")
 (define-public neomutt
   (package
     (name "neomutt")
-    (version "20220429")
+    (version "20230517")
     (source
      (origin
        (method git-fetch)
@@ -657,7 +657,7 @@ operating systems.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "106m6al48m22gl8848z8d0hsg2qiaz74vgy4f37hycl4v5d3n5ic"))))
+        (base32 "0kjllp2scgmpkl8yd0hwz6jmm98hr2r7qkb75ps9753fl96i4bfn"))))
     (build-system gnu-build-system)
     (inputs
      (list cyrus-sasl
@@ -802,7 +802,7 @@ It adds a large amount of new and improved features to mutt.")
            vala
            which))                      ; to find libtool, &c.
     (inputs (list glib gpgme zlib))
-    (home-page "http://spruce.sourceforge.net/gmime/")
+    (home-page "https://spruce.sourceforge.net/gmime/")
     (synopsis "MIME message parser and creator library")
     (description
      "GMime provides a core library and set of utilities which may be used for
@@ -810,20 +810,6 @@ the creation and parsing of messages using the Multipurpose Internet Mail
 Extension (MIME).")
     (license (list license:lgpl2.1+ license:gpl2+ license:gpl3+))))
 
-;; Some packages are not ready for GMime 3 yet.
-(define-public gmime-2.6
-  (package
-    (inherit gmime)
-    (version "2.6.23")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/gmime/"
-                                  (version-major+minor version)
-                                  "/gmime-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0slzlzcr3h8jikpz5a5amqd0csqh2m40gdk910ws2hnaf5m6hjbi"))))))
-
 (define-public altermime
   (package
     (name "altermime")
@@ -4091,8 +4077,8 @@ It is a replacement for the @command{urlview} program.")
     (license license:gpl2+)))
 
 (define-public mumi
-  (let ((commit "85d5efb4367b9178eb7093e3ebca760745de0753")
-        (revision "2"))
+  (let ((commit "2453a5a6686c035854e4d523b8faa8c47405bd76")
+        (revision "3"))
     (package
       (name "mumi")
       (version (git-version "0.0.5" revision commit))
@@ -4104,7 +4090,7 @@ It is a replacement for the @command{urlview} program.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0yn8dfj3krqwfsdn888vbv903kfa7clmbj2xxin263zqcyzc3alq"))))
+                  "0dq87qn77c6qganhck048qxq5ghj3fh2v604f87hwv530lxifabr"))))
       (build-system gnu-build-system)
       (arguments
        (list