X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/462ca0bbb73206569073814dd8daa7e2b6a2a048..f8072794e4b3cc4e812bd8f52551ab34be206f0e:/gnu/packages/mail.scm diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7bbf00ccf5..a408c84dfb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -8,27 +8,30 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016, 2017 Troy Sankey -;;; Copyright © 2016, 2017, 2018 ng0 +;;; Copyright © 2016, 2017, 2018 Nikita ;;; Copyright © 2016 Clément Lassieur -;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2018 Marius Bakke ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Kyle Meyer ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2017, 2018 Rene Saavedra -;;; Copyright © 2018, 2019 Pierre Langlois +;;; Copyright © 2017, 2018, 2020 Rene Saavedra +;;; Copyright © 2018, 2019, 2020 Pierre Langlois ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Gábor Boskovits -;;; Copyright © 2018, 2019 Ricardo Wurmus +;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Justus Winter +;;; Copyright © 2020 Eric Brown ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,11 +84,13 @@ #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages flex) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages kerberos) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages libunistring) + #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) #:use-module (gnu packages lsof) #:use-module (gnu packages lua) @@ -144,14 +149,14 @@ (define-public mailutils (package (name "mailutils") - (version "3.8") + (version "3.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mailutils/mailutils-" version ".tar.xz")) (sha256 (base32 - "1wkn9ch664477r4d8jk9153w5msljsbj99907k7zgzpmywbs6ba7")))) + "1g1xf2lal04nsnf1iym9n9n0wxjpqbcr9nysxpm98v4pniinqwsz")))) (build-system gnu-build-system) (arguments `(#:phases @@ -166,7 +171,8 @@ ;; Tests try to invoke 'mda' such that it looks up the ;; 'root' user, which does not exist in the build ;; environment. - (substitute* "mda/tests/testsuite" + (substitute* '("mda/mda/tests/testsuite" + "mda/lmtpd/tests/testsuite") (("root <") "nobody <") (("spool/root") "spool/nobody") (("root@localhost") "nobody@localhost")) @@ -217,12 +223,12 @@ #:parallel-tests? #f)) (native-inputs - `(("perl" ,perl))) ;for 'gylwrap' - (inputs - `(("dejagnu" ,dejagnu) - ("m4" ,m4) + `(("perl" ,perl) ;for 'gylwrap' ("texinfo" ,texinfo) - ("guile" ,guile-2.2) + ("dejagnu" ,dejagnu))) + (inputs + `(("m4" ,m4) + ("guile" ,guile-3.0) ("gsasl" ,gsasl) ("gnutls" ,gnutls) ("ncurses" ,ncurses) @@ -246,14 +252,17 @@ software.") ;; Libraries are under LGPLv3+, and programs under GPLv3+. (list gpl3+ lgpl3+)))) -(define-public guile3.0-mailutils +(define-public guile2.2-mailutils (package (inherit mailutils) - (name "guile3.0-mailutils") + (name "guile2.2-mailutils") (inputs - `(("guile" ,guile-3.0) + `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs mailutils)))))) +(define-public guile3.0-mailutils + (deprecated-package "guile3.0-mailutils" mailutils)) + (define-public nullmailer (package (name "nullmailer") @@ -338,7 +347,7 @@ to run without any changes.") (define-public fetchmail (package (name "fetchmail") - (version "6.4.1") + (version "6.4.5") (source (origin (method url-fetch) @@ -346,21 +355,14 @@ to run without any changes.") (version-major+minor version) "/" "fetchmail-" version ".tar.xz")) (sha256 - (base32 "1859wvfc9fq72mwp4njdiy0x89hnddlfr3nix71qqglcs0fz2crz")))) + (base32 "073bjh8qbvww7f5gbd6pq640qspi7dc6cjndvm0h2jcl0a90c3yk")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) (arguments `(#:configure-flags (list (string-append "--with-ssl=" - (assoc-ref %build-inputs "openssl"))) - #:phases - (modify-phases %standard-phases - (add-before 'check 'create-test-environment - (lambda _ - ;; Fix ‘Cannot find absolute path for user's home directory’. - (setenv "HOME" "/tmp") - #t))))) + (assoc-ref %build-inputs "openssl"))))) (home-page "https://www.fetchmail.info/") (synopsis "Remote-mail retrieval and forwarding utility") (description @@ -380,17 +382,17 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "1.13.2") + (version "1.14.2") (source (origin (method url-fetch) (uri (list - (string-append "ftp://ftp.mutt.org/pub/mutt/mutt-" - version ".tar.gz") (string-append "https://bitbucket.org/mutt/mutt/downloads/" - "mutt-" version ".tar.gz"))) + "mutt-" version ".tar.gz") + (string-append "http://ftp.mutt.org/pub/mutt/mutt-" + version ".tar.gz"))) (sha256 (base32 - "0x4yfvk8415p80h9an242n6q3b43mw6mnnczh95zd3j0zwdr6wrg")) + "0cdcls0x6f2w99hkjz48hxhnx86w3bnyxzibchdc9yspih770bz2")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs @@ -414,8 +416,8 @@ aliasing facilities to work just as they would on normal mail.") "--with-sasl" "--with-sqlite3" ; required for Autocrypt "--with-idn2" ; recommended for Autocrypt - ;; so that mutt does not check whether the path - ;; exists, which it does not in the chroot + ;; So that mutt does not check whether the path + ;; exists, which it does not in the chroot. "--with-mailpath=/var/mail"))) (home-page "http://www.mutt.org/") (synopsis "Mail client") @@ -427,7 +429,7 @@ operating systems.") (define-public neomutt (package (name "neomutt") - (version "20191207") + (version "20200313") (source (origin (method git-fetch) @@ -436,7 +438,7 @@ operating systems.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "147yjpqnsbfy01fhsflxlixk0985r91a6bjmqq3cwmf7gka3sihm")))) + (base32 "1k4k07l6h5krc3fx928qvdq3ssw9fxn95aj7k885xlckd2i1lnb5")))) (build-system gnu-build-system) (inputs `(("cyrus-sasl" ,cyrus-sasl) @@ -521,7 +523,7 @@ It adds a large amount of new and improved features to mutt.") (define-public gmime (package (name "gmime") - (version "3.2.6") + (version "3.2.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gmime/" @@ -529,7 +531,7 @@ It adds a large amount of new and improved features to mutt.") "/gmime-" version ".tar.xz")) (sha256 (base32 - "05s7qjrxbj010q016pmdqdq73gz8vl4hv29kwaign0j8gi61kzxb")))) + "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -673,7 +675,7 @@ repository and Maildir/IMAP as LOCAL repository.") ("ruby" ,ruby))) ; to set GEM_PATH so ruby-sqlite3 is found at runtime (build-system gnu-build-system) (arguments - (let ((elisp-dir "/share/emacs/site-lisp/guix.d/mew") + (let ((elisp-dir "/share/emacs/site-lisp") (icon-dir "/share/mew")) `(#:modules ((guix build gnu-build-system) (guix build utils) @@ -709,22 +711,21 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.2.0") + (version "1.4.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" - "download/" (version-major+minor version) "/" + "download/" version "/" "mu-" version ".tar.xz")) (sha256 (base32 - "0fh5bxvhjqv1p9z783lym8y1k3p4jcc3wg6wf7zl8s6w8krcfd7n")))) + "0vww8n7r6pfl4jyijhzas3fpdl6v1ndhc99zr1fsamjldxqpxk5m")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ; for gtester ("emacs" ,emacs-minimal) ("tzdata" ,tzdata-for-tests))) ; for mu/test/test-mu-query.c - ;; TODO: Add webkit and gtk to build the mug GUI. (inputs `(("xapian" ,xapian) ("guile" ,guile-2.2) @@ -752,13 +753,14 @@ security functionality including PGP, S/MIME, SSH, and SSL.") "guile/mu/Makefile.in") (("share/guile/site/2.0/") "share/guile/site/2.2/")) #t)) - (add-after 'patch-configure 'fix-date-tests - ;; Loosen test tolerances to prevent failures caused by daylight - ;; saving time (DST). See: https://github.com/djcb/mu/issues/1214. + (add-after 'unpack 'patch-bin-sh-in-tests (lambda _ - (substitute* "lib/parser/test-utils.cc" - (("\\* 60 \\* 60, 1 },") - "* 60 * 60, 3600 + 1 },")) + (substitute* '("guile/tests/test-mu-guile.c" + "mu/test-mu-cmd.c" + "mu/test-mu-cmd-cfind.c" + "mu/test-mu-query.c" + "mu/test-mu-threads.c") + (("/bin/sh") (which "sh"))) #t)) (add-before 'install 'fix-ffi (lambda* (#:key outputs #:allow-other-keys) @@ -790,53 +792,6 @@ messages you need; in addition, it allows you to view messages, extract attachments, create new maildirs, and so on.") (license gpl3+))) -(define mumimu - ;; This is a fork of mu for use in Mumi that stores message bug IDs in its - ;; database. It also renames the library to "mumimu" to avoid confusion. - (let ((commit "6b42431052c7cc9a2e147938e1b67f14a93e4ee5") - (revision "2")) - (package - (inherit mu) - (name "mumimu") - (version (git-version (package-version mu) revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.elephly.net/software/mumimu.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "044scxmjrckidqx935yza3aqnjyzrmhyvgx2gs2jyf68hl2qzb89")))) - (arguments - (substitute-keyword-arguments (package-arguments mu) - ((#:tests? anything '()) - #f) - ((#:phases phases) - `(modify-phases ,phases - (replace 'patch-configure - (lambda _ (delete-file "autogen.sh") #t)) - (replace 'fix-ffi - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "guile/mumimu.scm" - (("\"libguile-mu\"") - (format #f "\"~a/lib/libguile-mumimu\"" - (assoc-ref outputs "out")))) - #t)) - (delete 'install-emacs-autoloads))) - ((#:configure-flags flags) - '("--disable-gtk" - "--disable-webkit" - "--disable-mu4e")))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("glib" ,glib "bin") - ("tzdata" ,tzdata-for-tests) - ("texinfo" ,texinfo)))))) - (define-public alot (package (name "alot") @@ -1072,6 +1027,38 @@ and search library.") (define-public python2-notmuch (package-with-python2 python-notmuch)) +(define-public muchsync + (package + (name "muchsync") + (version "5") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.muchsync.org/src/" + "muchsync-" version ".tar.gz")) + (sha256 + (base32 "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb")))) + (build-system gnu-build-system) + (native-inputs + `(("ghc-pandoc" ,ghc-pandoc) + ("pkg-config" ,pkg-config))) + (inputs + `(("libcrypto" ,openssl) + ("notmuch" ,notmuch) + ("sqlite" ,sqlite) + ("xapian" ,xapian))) + (home-page "http://www.muchsync.org/") + (synopsis "Synchronize notmuch mail across machines") + (description + "Muchsync brings Notmuch to all of your computers by synchronizing your +mail messages and Notmuch tags across machines. The protocol is heavily +pipelined to work efficiently over high-latency networks such as mobile +broadband. Muchsync supports arbitrary pairwise synchronization among +replicas. A version-vector-based algorithm allows it to exchange only the +minimum information necessary to bring replicas up to date regardless of which +pairs have previously synchronized.") + (license gpl2+))) + (define-public getmail (package (name "getmail") @@ -1125,13 +1112,7 @@ useful features.") ("expat" ,expat) ("zlib" ,zlib))) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (setenv "NOCONFIGURE" "true") - (invoke "sh" "autogen.sh")))) - #:configure-flags + '(#:configure-flags '("--disable-static" "--disable-db"))) (home-page "https://www.etpan.org/libetpan.html") (synopsis "Portable middleware for email access") @@ -1150,7 +1131,7 @@ MailCore 2.") (method url-fetch) (uri (string-append "https://ftp.heanet.ie/mirrors/" "ftp.xemacs.org/aux/" - name "-" version ".tar.gz")) + "compface-" version ".tar.gz")) (sha256 (base32 "09b89wg63hg502hsz592cd2h87wdprb1dq1k1y07n89hym2q56d6")))) @@ -1160,13 +1141,13 @@ MailCore 2.") (synopsis "Portrait image compressor") (description "This package takes your 48x48x1 portrait image and compresses it.") - (home-page "http://www.cs.indiana.edu/pub/faces/") + (home-page "https://legacy.cs.indiana.edu/ftp/faces/") (license (x11-style "file://README")))) (define-public claws-mail (package (name "claws-mail") - (version "3.17.4") + (version "3.17.5") (source (origin (method url-fetch) (uri (string-append @@ -1174,7 +1155,7 @@ compresses it.") ".tar.xz")) (sha256 (base32 - "00mfhaac16sv67rwiq98hr4nl5zmd1h2afswwwksdcsi3q9x23jr")))) + "1gjrmdmhc7zzilrlss9yl86ybv9sra8v0qi7mkwv7d9azidx5kns")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("bogofilter" ,bogofilter) @@ -1228,14 +1209,14 @@ which can add many functionalities to the base client.") (define-public msmtp (package (name "msmtp") - (version "1.8.7") + (version "1.8.10") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/msmtp/releases/" "/msmtp-" version ".tar.xz")) (sha256 - (base32 "1waiiksa57byb7gvx1zmh6srvl6r8rvwqklk0slb3iaf4kfbqlws")))) + (base32 "041g921rdjiv8bapp61gp4rylq8cckfkcwzyh8bs7xwxs4wpzfna")))) (build-system gnu-build-system) (inputs `(("libsecret" ,libsecret) @@ -1262,6 +1243,10 @@ which can add many functionalities to the base client.") (install-file (string-append msmtpq "/msmtp-queue") bin) (install-file (string-append msmtpq "/README.msmtpq") doc) (install-file "scripts/vim/msmtp.vim" vimfiles) + ;; Don't rely on netcat being in the PATH to test for a + ;; connection, instead try tp ing debian.org. + (substitute* (string-append bin "/msmtpq") + (("EMAIL_CONN_TEST=n") "EMAIL_CONN_TEST=p")) #t)))))) (synopsis "Simple and easy to use SMTP client with decent sendmail compatibility") @@ -1274,7 +1259,7 @@ delivery.") (define-public exim (package (name "exim") - (version "4.93.0.4") + (version "4.94") (source (origin (method url-fetch) @@ -1288,7 +1273,7 @@ delivery.") (string-append "https://ftp.exim.org/pub/exim/exim4/old/" file-name)))) (sha256 - (base32 "01g4sfycv13glnmfrapwhjbdw6z1z7w5bwjldxjmglwfw5p3czak")))) + (base32 "1nsb2i5mqxfz1sl1bmbxmpb2qiaf3wffhfiw4j9vfpagy3xfhzpp")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb-5.3) ; ‘#error Version 6 and later BDB API is not supported’ @@ -1380,7 +1365,7 @@ facilities for checking incoming mail.") (define-public dovecot (package (name "dovecot") - (version "2.3.10") + (version "2.3.10.1") (source (origin (method url-fetch) @@ -1388,19 +1373,27 @@ facilities for checking incoming mail.") (version-major+minor version) "/" "dovecot-" version ".tar.gz")) (sha256 - (base32 "1ibiz3k2flablkcqbkvfzsjnq5b5kxximhcrplflsjl57mr88ca7")))) + (base32 "035idr2j81s5mngnhd58rih79dhwwak7q01mqbx3rcmi4cpychk6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("openssl" ,openssl) - ("zlib" ,zlib) - ("bzip2" ,bzip2) + `(("bzip2" ,bzip2) + ("libsodium" ,libsodium) ; extra password algorithms + ;; FIXME: The 'test-backtrace' tests fail on arm when using glibc's + ;; backtrace_symbol() function so fallback to using libunwind. + ,@(if (target-arm?) + `(("libunwind" ,libunwind)) + '()) + ("linux-pam" ,linux-pam) + ("lz4" ,lz4) + ("openssl" ,openssl) ("sqlite" ,sqlite) - ("linux-pam" ,linux-pam))) + ("zlib" ,zlib))) (arguments `(#:configure-flags '("--sysconfdir=/etc" - "--localstatedir=/var") + "--localstatedir=/var" + "--with-sqlite") ; not auto-detected #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-file-names @@ -1514,8 +1507,8 @@ using libsodium sealed boxes. (home-page "https://github.com/LuckyFellow/dovecot-libsodium-plugin") (synopsis "Libsodium password hashing schemes plugin for Dovecot") (description - "@code{dovecot-libsodium-plugin} provides libsodium password -hashing schemes plugin for @code{Dovecot}.") + "@code{dovecot-libsodium-plugin} provides a libsodium password +hashing scheme (such as scrypt) plug-in for @code{Dovecot}.") (license gpl3+)))) (define-public isync @@ -1915,26 +1908,26 @@ maintained.") (define-public khard (package (name "khard") - (version "0.15.1") + (version "0.16.1") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "18ba2xgfq8sw0bg6xmlfjpizid1hkzgswcfcc54gl21y2dwfda2w")))) + "0fg4qh5gzki5wg958wlpc8a2icnk74gzg33lqxjm755cfnjng7qd")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'install 'install-doc + (add-after 'install 'install-completions (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/khard"))) - (copy-recursively "misc/khard" doc) + (zsh (string-append out "/share/zsh/site-functions"))) + (copy-recursively "misc/zsh" zsh) #t)))))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) - (propagated-inputs + (inputs `(("python-atomicwrites" ,python-atomicwrites) ("python-configobj" ,python-configobj) ("python-pyyaml" ,python-pyyaml) @@ -2166,14 +2159,14 @@ converts them to maildir format directories.") (define-public mpop (package (name "mpop") - (version "1.4.7") + (version "1.4.9") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/mpop/releases/" "mpop-" version ".tar.xz")) (sha256 - (base32 "0c6n5afn9pr4p7gxkv462lysrw52w9fhvavzm99c78dcp9dj5xnk")))) + (base32 "0hinmyd4lipy9wi3grwm72vv6xrpf4m08i9g9nlxzxnwfanw885q")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls))) @@ -2298,14 +2291,14 @@ transfer protocols.") (define-public opensmtpd (package (name "opensmtpd") - (version "6.6.4p1") + (version "6.7.1p1") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "opensmtpd-" version ".tar.gz")) (sha256 - (base32 "1kyph9ycq0j21dl9n1sq5fns9p4gckdi0fmnf8awrcwrdcm9dyg2")))) + (base32 "1jh8vxfajm1mvp1v5yh6llrhjzv0n9fgab88mlwllwqynhcfjy3l")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb) @@ -2629,7 +2622,7 @@ on the fly. Both programs are written in C and are very fast.") (define-public swaks (package (name "swaks") - (version "20181104.0") + (version "20190914.0") (source (origin (method url-fetch) @@ -2638,7 +2631,7 @@ on the fly. Both programs are written in C and are very fast.") version ".tar.gz")) (sha256 (base32 - "0n1yd27xcyb1ylp5gln3yv5gzi9r377hjy1j32367kgb3247ygq2")))) + "12awq5z4sdd54cxprj834zajxhkpy4jwhzf1fhigcx1zbhdaacsp")))) (build-system perl-build-system) (inputs `(("perl-net-dns" ,perl-net-dns) @@ -2681,7 +2674,7 @@ operators and scripters.") ;; Upstream doesn't use git tags, but does ‘tag’ their releases in the ;; commit message. Hence the lack of GIT-VERSIONing despite using a commit ;; ID below. Don't forget to update it… - (version "2.21.99999") + (version "2.22") (source (origin (method git-fetch) @@ -2691,10 +2684,10 @@ operators and scripters.") ;; http://alpine.freeiz.com/alpine/readme/README.patches (uri (git-reference (url "http://repo.or.cz/alpine.git") - (commit "abeb2c25935ef8c75f1e5deef0f81276754dc975"))) + (commit "b50297779a4becb9ceca9c6b5b375d526fe3df78"))) (file-name (git-file-name name version)) (sha256 - (base32 "0rqgbw08a5lj41dkp82aq480lqkc4bnxagna7wpqffi821n8gkwz")) + (base32 "06js44fvdl7l33hfd4lsxpcd1cz3c0h796cswyzz0lkrzx89yl48")) (modules '((guix build utils))) (snippet '(begin @@ -2703,7 +2696,8 @@ operators and scripters.") #t)))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CC=gcc") + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target))) #:configure-flags (list (string-append "--with-ssl-include-dir=" (assoc-ref %build-inputs "openssl") "/include/openssl") @@ -2720,6 +2714,13 @@ operators and scripters.") "--with-date-stamp=Thu 1 Jan 01:00:01 CET 1970") #:phases (modify-phases %standard-phases + (add-after 'unpack 'assume-shadow-passwords + ;; Alpine's configure script confuses ‘shadow password support’ with + ;; ‘/etc/shadow exists in the build environment’. It does not. + (lambda _ + (substitute* "configure" + (("test -f /etc/shadow") "true")) + #t)) (add-after 'unpack 'make-reproducible (lambda _ ;; This removes time-dependent code to make alpine reproducible. @@ -2751,14 +2752,14 @@ tools and applications: (define-public balsa (package (name "balsa") - (version "2.5.7") + (version "2.6.1") (source (origin (method url-fetch) (uri (string-append "https://pawsa.fedorapeople.org/balsa/" - name "-" version ".tar.bz2")) + "balsa-" version ".tar.bz2")) (sha256 - (base32 "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx")))) + (base32 "1xkxx801p7sbfkn0bh3cz85wra4xf1z1zhjqqc80z1z1nln7fhb4")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -2776,7 +2777,7 @@ tools and applications: `(("cyrus-sasl" ,cyrus-sasl) ("enchant" ,enchant) ("gdk-pixbuf" ,gdk-pixbuf) - ("gmime" ,gmime-2.6) + ("gmime" ,gmime) ("gnutls" ,gnutls) ("gpgme" ,gpgme) ("gtk+" ,gtk+) @@ -2784,7 +2785,9 @@ tools and applications: ("gtkspell3" ,gtkspell3) ("libcanberra" ,libcanberra) ("libesmtp" ,libesmtp) + ("libical" ,libical) ("libnotify" ,libnotify) + ("libsecret" ,libsecret) ("openldap" ,openldap) ("sqlite" ,sqlite) ("webkitgtk" ,webkitgtk))) @@ -2960,11 +2963,11 @@ replacement for the @code{urlview} program.") (license gpl2+))) (define-public mumi - (let ((commit "a933a62a4b8528b416319759b9985db80f3fce14") - (revision "6")) + (let ((commit "5a578328199bab51a147fbadbce12c8d06959ed6") + (revision "2")) (package (name "mumi") - (version (git-version "0.0.0" revision commit)) + (version (git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2973,7 +2976,7 @@ replacement for the @code{urlview} program.") (file-name (git-file-name name version)) (sha256 (base32 - "0vlda7vjzpd942iz5vb471hj7ypml5gwl9s1am92klv6nk2vnvcx")))) + "0hngv82gd19l4q7nnbf97r120z1yagsmkp0x3lc8haza5q4mc12c")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -3002,13 +3005,16 @@ replacement for the @code{urlview} program.") (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))) #t)))))) (inputs - `(("guile-debbugs" ,guile-debbugs) - ("guile-email" ,guile-email) + `(("guile-email" ,guile-email) + ("guile-fibers" ,guile-fibers) + ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-3) + ("guile-redis" ,guile-redis) ("guile-syntax-highlight" ,guile-syntax-highlight) - ("gnutls" ,gnutls) ;needed to talk to https://debbugs.gnu.org - ("guile" ,guile-2.2) - ("mumimu" ,mumimu))) ;'mumimu' executable recorded in (mumi config) + ("guile-webutils" ,guile-webutils) + ("guile-xapian" ,guile-xapian) + ("guile" ,guile-3.0) + ("mailutils" ,mailutils))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -3127,3 +3133,35 @@ related tools to process winmail.dat files.") complement or replace traditional mailing lists. Readers may read via NNTP, Atom feeds or HTML archives.") (license agpl3+)))) + +(define-public sylpheed + (package + (name "sylpheed") + (version "3.7.0") + (source (origin + (method url-fetch) + (uri (string-append "https://sylpheed.sraoss.jp/sylpheed/v3.7/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("bogofilter" ,bogofilter) + ("compface" ,compface) + ("gnupg" ,gnupg-1) + ("gpgme" ,gpgme) + ("gtk+-2.0" ,gtk+-2) + ("gtkspell" ,gtkspell3) + ("libnsl" ,libnsl) + ("openldap" ,openldap) + ("openssl" ,openssl))) + (home-page "https://sylpheed.sraoss.jp/en/") + (synopsis "Lightweight GTK+ email client") + (description + "Sylpheed is a simple, lightweight but featureful, and easy-to-use e-mail +client. Sylpheed provides intuitive user-interface. Sylpheed is also +designed for keyboard-oriented operation.") + (license gpl2+)))