diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-02-03 14:39:49 +0100 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-02-03 14:39:49 +0100 |
commit | e6c847defb6cb25c65172dec46a322e5d3d45088 (patch) | |
tree | 3d249dce1a1f58fcb3c83a41eaf9e1525d7b112e /gnu/packages/mail.scm | |
parent | 3aef72ec5bf1027bc557daab7010848d80711a28 (diff) | |
parent | 179bb57d2532ee6b81791e078b0f782cbf88cb84 (diff) | |
download | guix-e6c847defb6cb25c65172dec46a322e5d3d45088.tar.gz guix-e6c847defb6cb25c65172dec46a322e5d3d45088.zip |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/mail.scm')
-rw-r--r-- | gnu/packages/mail.scm | 157 |
1 files changed, 77 insertions, 80 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4466e5e6d9..76f379a710 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Justus Winter <justus@sequoia-pgp.org> ;;; Copyright © 2020 Eric Brown <ecbrown@ericcbrown.com> -;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020, 2021, 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021 Alexey Abramov <levenson@mmer.org> ;;; Copyright © 2020 Tim Gesthuizen <tim.gesthuizen@yahoo.de> @@ -109,6 +109,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages groff) #:use-module (gnu packages gsasl) @@ -1373,17 +1374,14 @@ invoking @command{notifymuch} from the post-new hook.") (define-public notmuch (package (name "notmuch") - (version "0.37") + (version "0.38.2") (source (origin (method url-fetch) (uri (string-append "https://notmuchmail.org/releases/notmuch-" version ".tar.xz")) (sha256 - (base32 "1xl64xh0ijfkx265lcj9cqv1wkzha8gsn9jn4fw4xgvqigr6sxhf")) - (patches - ;; Output for some tests varies slightly in Emacs 29. - (search-patches "notmuch-emacs-test-output.patch")))) + (base32 "0zll3s39s065pl9228xpklkjklllkyb3bf1szh0fw0rbfkjfp0jj")))) (build-system gnu-build-system) (arguments (list @@ -1440,6 +1438,7 @@ ing, and tagging large collections of email messages.") (arguments (list #:exclude #~(cons* "make-deps.el" "rstdoc.el" %default-exclude) + #:include #~(cons* "notmuch-logo.svg" %default-include) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'chdir @@ -4105,80 +4104,78 @@ It is a replacement for the @command{urlview} program.") (license license:gpl2+))) (define-public mumi - (let ((commit "2453a5a6686c035854e4d523b8faa8c47405bd76") - (revision "3")) - (package - (name "mumi") - (version (git-version "0.0.5" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/guix/mumi.git/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0dq87qn77c6qganhck048qxq5ghj3fh2v604f87hwv530lxifabr")))) - (build-system gnu-build-system) - (arguments - (list - #:modules '((guix build gnu-build-system) - ((guix build guile-build-system) - #:select (target-guile-effective-version)) - (guix build utils)) - #:imported-modules `((guix build guile-build-system) - ,@%gnu-build-system-modules) - - #:configure-flags '(list "--localstatedir=/var") - - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'install-picocss - (lambda* (#:key inputs #:allow-other-keys) - (let ((pico (dirname (search-input-file inputs "/scss/pico.scss")))) - (mkdir-p "assets/pico/scss") - (copy-recursively pico "assets/pico/scss")))) - (add-after 'install 'wrap-executable - (lambda _ - (let* ((bin (string-append #$output "/bin")) - (version (target-guile-effective-version)) - (scm (string-append #$output "/share/guile/site/" version)) - (go (string-append #$output "/lib/guile/" version - "/site-ccache"))) - (wrap-program (string-append bin "/mumi") - `("GUILE_LOAD_PATH" ":" prefix - (,scm ,(getenv "GUILE_LOAD_PATH"))) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))))))) - (inputs - (list bash-minimal - guile-email - guile-fibers - guile-gcrypt - guile-gnutls - guile-json-4 - guile-kolam - guile-redis - guile-syntax-highlight - guile-webutils - guile-xapian - guile-3.0 - mailutils)) - (native-inputs - (list autoconf automake pkg-config sassc - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/picocss/pico.git") - (commit "3052db4bd3439e236479dc0f98069f7d3b559486"))) - (file-name (git-file-name "pico" "1.5.6")) - (sha256 - (base32 - "1gs1li48hqizx7lc4n2fdxn9i2v4vafkqpza7svvfpcamfz29jpi"))))) - (home-page "https://git.savannah.gnu.org/cgit/guix/mumi.git/") - (synopsis "Debbugs web interface") - (description "Mumi is a Debbugs web interface.") - (license license:agpl3+)))) + (package + (name "mumi") + (version "0.0.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/guix/mumi.git/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z556pxsz0zx95gd5b4hwkmwcvf3jyz7njkb3zwbhrwnpgygnbyl")))) + (build-system gnu-build-system) + (arguments + (list + #:modules '((guix build gnu-build-system) + ((guix build guile-build-system) + #:select (target-guile-effective-version)) + (guix build utils)) + #:imported-modules `((guix build guile-build-system) + ,@%gnu-build-system-modules) + + #:configure-flags '(list "--localstatedir=/var") + + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'install-picocss + (lambda* (#:key inputs #:allow-other-keys) + (let ((pico (dirname (search-input-file inputs "/scss/pico.scss")))) + (mkdir-p "assets/pico/scss") + (copy-recursively pico "assets/pico/scss")))) + (add-after 'install 'wrap-executable + (lambda _ + (let* ((bin (string-append #$output "/bin")) + (version (target-guile-effective-version)) + (scm (string-append #$output "/share/guile/site/" version)) + (go (string-append #$output "/lib/guile/" version + "/site-ccache"))) + (wrap-program (string-append bin "/mumi") + `("GUILE_LOAD_PATH" ":" prefix + (,scm ,(getenv "GUILE_LOAD_PATH"))) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix + (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))))))) + (inputs + (list bash-minimal + guile-email + guile-fibers + guile-gcrypt + guile-gnutls + guile-json-4 + guile-kolam + guile-redis + guile-syntax-highlight + guile-webutils + guile-xapian + guile-3.0 + mailutils)) + (native-inputs + (list autoconf automake pkg-config sassc + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/picocss/pico.git") + (commit "3052db4bd3439e236479dc0f98069f7d3b559486"))) + (file-name (git-file-name "pico" "1.5.6")) + (sha256 + (base32 + "1gs1li48hqizx7lc4n2fdxn9i2v4vafkqpza7svvfpcamfz29jpi"))))) + (home-page "https://git.savannah.gnu.org/cgit/guix/mumi.git/") + (synopsis "Debbugs web interface") + (description "Mumi is a Debbugs web interface.") + (license license:agpl3+))) (define-public ytnef (package |