From 008b1aecf763d6ae508f58414157d2a528799e6f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 31 Mar 2020 10:36:12 +0200 Subject: gnu: mumi: Update to 0.0.0-8.9f66dbc. * gnu/packages/mail.scm (mumi): Update to 0.0.0-8.9f66dbc. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fca0ed9b78..e174050acc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2968,8 +2968,8 @@ (define-public tnef (license gpl2+))) (define-public mumi - (let ((commit "6653e2d525b945fcd671dbfbf7b42cc588a1cf4b") - (revision "7")) + (let ((commit "9f66dbc6231e2a884f76fa9913a0461887476116") + (revision "8")) (package (name "mumi") (version (git-version "0.0.0" revision commit)) @@ -2981,7 +2981,7 @@ (define-public mumi (file-name (git-file-name name version)) (sha256 (base32 - "0h1q61yl01hm7wygv1bv47ncg7l7gcw7aq8ny61g3hr1acsqysjf")))) + "15k7bvvna1iiflg3x97jzyxjd5n30c6158z467ihj0sjxk94pbra")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 4e839a83de7eca6e48e57c0c563c732b24337302 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 19:17:33 +0200 Subject: gnu: gmime: Update to 3.2.7. * gnu/packages/mail.scm (gmime): Update to 3.2.7. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e174050acc..89de6a16b9 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -522,7 +522,7 @@ (define-public neomutt (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/" @@ -530,7 +530,7 @@ (define-public gmime "/gmime-" version ".tar.xz")) (sha256 (base32 - "05s7qjrxbj010q016pmdqdq73gz8vl4hv29kwaign0j8gi61kzxb")))) + "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 11ef009e7adfb53f8e76723655ff5433fe6dbadb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 31 Mar 2020 17:50:51 +0200 Subject: gnu: mumi: Update to 0.0.0-9.5fdbc3e. * gnu/packages/mail.scm (mumi): Update to 0.0.0-9.5fdbc3e. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 89de6a16b9..36b94f409f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2968,8 +2968,8 @@ (define-public tnef (license gpl2+))) (define-public mumi - (let ((commit "9f66dbc6231e2a884f76fa9913a0461887476116") - (revision "8")) + (let ((commit "5fdbc3e717b8ed4bfef83294ed26361eb21c20c1") + (revision "9")) (package (name "mumi") (version (git-version "0.0.0" revision commit)) @@ -2981,7 +2981,7 @@ (define-public mumi (file-name (git-file-name name version)) (sha256 (base32 - "15k7bvvna1iiflg3x97jzyxjd5n30c6158z467ihj0sjxk94pbra")))) + "18zyj2npvy8qg6g3l0xb2srlcp84x7p783fsw5ka6v3acxri62h1")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 284b27c5aeadb257dd8c0a33f3486c1c1eba8255 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Apr 2020 04:27:55 +0200 Subject: gnu: mumi: Update to 0.0.0-10.f7d6a54. * gnu/packages/mail.scm (mumi): Update to 0.0.0-10.f7d6a54. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 36b94f409f..7fb9a02a9a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2968,8 +2968,8 @@ (define-public tnef (license gpl2+))) (define-public mumi - (let ((commit "5fdbc3e717b8ed4bfef83294ed26361eb21c20c1") - (revision "9")) + (let ((commit "f7d6a54769f5540d498ff51a8c7fccbfcddc5bfb") + (revision "10")) (package (name "mumi") (version (git-version "0.0.0" revision commit)) @@ -2981,7 +2981,7 @@ (define-public mumi (file-name (git-file-name name version)) (sha256 (base32 - "18zyj2npvy8qg6g3l0xb2srlcp84x7p783fsw5ka6v3acxri62h1")))) + "0m2qlr08yghkq1kpf5p8nscdy6gz75pp8r696vg7nanqxsx480aj")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 92dae7a6050a6998ecfd6cadfbc3efffe6e80927 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Apr 2020 06:07:08 +0200 Subject: gnu: mumi: Update to 0.0.0-11.0e9af8d. * gnu/packages/mail.scm (mumi): Update to 0.0.0-11.0e9af8d. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7fb9a02a9a..0cb3eddf15 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2968,8 +2968,8 @@ (define-public tnef (license gpl2+))) (define-public mumi - (let ((commit "f7d6a54769f5540d498ff51a8c7fccbfcddc5bfb") - (revision "10")) + (let ((commit "0e9af8d11246eb08152a9bcbc3d04703963b756c") + (revision "11")) (package (name "mumi") (version (git-version "0.0.0" revision commit)) @@ -2981,7 +2981,7 @@ (define-public mumi (file-name (git-file-name name version)) (sha256 (base32 - "0m2qlr08yghkq1kpf5p8nscdy6gz75pp8r696vg7nanqxsx480aj")))) + "0q5x33gc8gi8w7cjphdmhdyfa62b89mcbmj068yd5jxqx8sn4hlw")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 24a3eb9084701f63f468ba207eeb0dc6788bf267 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Thu, 2 Apr 2020 01:22:24 +0200 Subject: gnu: mailutils: Make some inputs native. * gnu/packages/mail.scm (mailutils)[inputs]: Move dejagnu from here... [native-inputs]: ...to here. Signed-off-by: Mathieu Othacehe --- gnu/packages/mail.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 0cb3eddf15..ed14360066 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -218,11 +219,11 @@ (define-public mailutils #:parallel-tests? #f)) (native-inputs - `(("perl" ,perl))) ;for 'gylwrap' - (inputs - `(("dejagnu" ,dejagnu) - ("m4" ,m4) + `(("perl" ,perl) ;for 'gylwrap' ("texinfo" ,texinfo) + ("dejagnu" ,dejagnu))) + (inputs + `(("m4" ,m4) ("guile" ,guile-2.2) ("gsasl" ,gsasl) ("gnutls" ,gnutls) -- cgit v1.2.3 From 9ec27360af620fcbab8139e4d8963cccddda2b55 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Fri, 3 Apr 2020 10:06:46 +0200 Subject: gnu: Add muchsync. * gnu/packages/mail.scm (muchsync): New variable. --- gnu/packages/mail.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ed14360066..2d0e25655f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Justus Winter ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,6 +83,7 @@ (define-module (gnu packages mail) #: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) @@ -1074,6 +1076,38 @@ (define-public python-notmuch (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") -- cgit v1.2.3 From f00f52a1fb5ac08f8059dffcd60d36adcda06603 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Apr 2020 08:35:02 +0200 Subject: gnu: mumi: Update to 0.0.0-12.bb2fe92. * gnu/packages/mail.scm (mumi): Update to 0.0.0-12.bb2fe92. [inputs]: Add guile-gcrypt, guile-redis, guile-webutils, mailutils. * gnu/services/web.scm (): New record type. (mumi-configuration, mumi-configuration?, mumi-configuration-mumi, mumi-configuration-mailer?, mumi-configuration-sender, mumi-configuration-smtp): New procedures. (mumi-shepherd-services): Accept configuration; adjust start commands; add Shepherd service for mumi mailer. (mumi-service-type): Pass default configuration. * doc/guix.texi (Web Services): Update documentation. --- doc/guix.texi | 24 +++++++++++++++++ gnu/packages/mail.scm | 10 ++++--- gnu/services/web.scm | 75 +++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 86 insertions(+), 23 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/doc/guix.texi b/doc/guix.texi index 67cedaec1b..12094e0feb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20686,6 +20686,30 @@ but it also fetches and indexes mail retrieved from Debbugs. This is the service type for Mumi. @end defvr +@deftp {Data Type} mumi-configuration +Data type representing the Mumi service configuration. This type has the +following fields: + +@table @asis +@item @code{mumi} (default: @code{mumi}) +The Mumi package to use. + +@item @code{mailer?} (default: @code{#true}) +Whether to enable or disable the mailer component. + +@item @code{mumi-configuration-sender} +The email address used as the sender for comments. + +@item @code{mumi-configuration-smtp} +A URI to configure the SMTP settings for Mailutils. This could be +something like @code{sendmail:///path/to/bin/msmtp} or any other URI +supported by Mailutils. @xref{SMTP Mailboxes, SMTP Mailboxes,, +mailutils, GNU@tie{}Mailutils}. + +@end table +@end deftp + + @subsubheading FastCGI @cindex fastcgi @cindex fcgiwrap diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2d0e25655f..a4dab88fb2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3003,8 +3003,8 @@ (define-public tnef (license gpl2+))) (define-public mumi - (let ((commit "0e9af8d11246eb08152a9bcbc3d04703963b756c") - (revision "11")) + (let ((commit "bb2fe926b496dc44f783430ab16f5219bae36e81") + (revision "12")) (package (name "mumi") (version (git-version "0.0.0" revision commit)) @@ -3016,7 +3016,7 @@ (define-public mumi (file-name (git-file-name name version)) (sha256 (base32 - "0q5x33gc8gi8w7cjphdmhdyfa62b89mcbmj068yd5jxqx8sn4hlw")))) + "0azqrnkcwnh903f3ap8injhld3jicxdjzbbdi56ax46gjahr1rw3")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -3047,11 +3047,15 @@ (define-public mumi (inputs `(("guile-debbugs" ,guile-debbugs) ("guile-email" ,guile-email) + ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-3) + ("guile-redis" ,guile-redis) ("guile-sqlite3" ,guile-sqlite3) ("guile-syntax-highlight" ,guile-syntax-highlight) + ("guile-webutils" ,guile-webutils) ("gnutls" ,gnutls) ;needed to talk to https://debbugs.gnu.org ("guile" ,guile-2.2) + ("mailutils" ,mailutils) ("mumimu" ,mumimu))) ;'mumimu' executable recorded in (mumi config) (native-inputs `(("autoconf" ,autoconf) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index fa5c34d5af..c73ff5ebfc 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -262,6 +262,14 @@ (define-module (gnu services web) patchwork-virtualhost patchwork-service-type + + mumi-configuration + mumi-configuration? + mumi-configuration-mumi + mumi-configuration-mailer? + mumi-configuration-sender + mumi-configuration-smtp + mumi-service-type)) ;;; Commentary: @@ -1678,6 +1686,14 @@ (define patchwork-service-type ;;; Mumi. ;;; +(define-record-type* + mumi-configuration make-mumi-configuration + mumi-configuration? + (mumi mumi-configuration-mumi (default mumi)) + (mailer? mumi-configuration-mailer? (default #t)) + (sender mumi-configuration-sender) + (smtp mumi-configuration-smtp)) + (define %mumi-activation (with-imported-modules '((guix build utils)) #~(begin @@ -1702,25 +1718,43 @@ (define %mumi-accounts (home-directory "/var/empty") (shell (file-append shadow "/sbin/nologin"))))) -(define (mumi-shepherd-services mumi) - (list (shepherd-service - (provision '(mumi)) - (documentation "Mumi bug-tracking web interface.") - (requirement '(networking)) - (start #~(make-forkexec-constructor - '(#$(file-append mumi "/bin/mumi")) - #:user "mumi" #:group "mumi" - #:log-file "/var/log/mumi.log")) - (stop #~(make-kill-destructor))) - (shepherd-service - (provision '(mumi-worker)) - (documentation "Mumi bug-tracking web interface.") - (requirement '(networking)) - (start #~(make-forkexec-constructor - '(#$(file-append mumi "/bin/mumi") "--worker") - #:user "mumi" #:group "mumi" - #:log-file "/var/log/mumi.worker.log")) - (stop #~(make-kill-destructor))))) +(define (mumi-shepherd-services config) + (match config + (($ mumi mailer? sender smtp) + (list (shepherd-service + (provision '(mumi)) + (documentation "Mumi bug-tracking web interface.") + (requirement '(networking)) + (start #~(make-forkexec-constructor + `(#$(file-append mumi "/bin/mumi") "web" + ,@(if mailer? '() '("--disable-mailer"))) + #:user "mumi" #:group "mumi" + #:log-file "/var/log/mumi.log")) + (stop #~(make-kill-destructor))) + (shepherd-service + (provision '(mumi-worker)) + (documentation "Mumi bug-tracking web interface database worker.") + (requirement '(networking)) + (start #~(make-forkexec-constructor + '(#$(file-append mumi "/bin/mumi") "worker") + #:user "mumi" #:group "mumi" + #:log-file "/var/log/mumi.worker.log")) + (stop #~(make-kill-destructor))) + (shepherd-service + (provision '(mumi-mailer)) + (documentation "Mumi bug-tracking web interface mailer.") + (requirement '(networking)) + (start #~(make-forkexec-constructor + `(#$(file-append mumi "/bin/mumi") "mailer" + ,@(if sender + (list (string-append "--sender=" sender)) + '()) + ,@(if smtp + (list (string-append "--smtp=" smtp)) + '())) + #:user "mumi" #:group "mumi" + #:log-file "/var/log/mumi.mailer.log")) + (stop #~(make-kill-destructor))))))) (define mumi-service-type (service-type @@ -1734,4 +1768,5 @@ (define mumi-service-type mumi-shepherd-services))) (description "Run Mumi, a Web interface to the Debbugs bug-tracking server.") - (default-value mumi))) + (default-value + (mumi-configuration)))) -- cgit v1.2.3 From 00e075def43be92d5052c5eb831315f521ae8dde Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Apr 2020 13:47:16 +0200 Subject: gnu: mumi: Update to 0.0.0-13.1fee105. * gnu/packages/mail.scm (mumi): Update to 0.0.0-13.1fee105. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a4dab88fb2..75747f3482 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3003,8 +3003,8 @@ (define-public tnef (license gpl2+))) (define-public mumi - (let ((commit "bb2fe926b496dc44f783430ab16f5219bae36e81") - (revision "12")) + (let ((commit "1fee105324ff9a1bd776c1244a280f4ab6ae2161") + (revision "13")) (package (name "mumi") (version (git-version "0.0.0" revision commit)) @@ -3016,7 +3016,7 @@ (define-public mumi (file-name (git-file-name name version)) (sha256 (base32 - "0azqrnkcwnh903f3ap8injhld3jicxdjzbbdi56ax46gjahr1rw3")))) + "03liks9yavagy12sqkdvhils9s0903qi52zgszp1g98p819r0djl")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 5bd109b81122ed642bc66cb574d48cc9f45c0cab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Apr 2020 15:29:44 +0200 Subject: gnu: mumi: Update to 0.0.0-14.ab53797. * gnu/packages/mail.scm (mumi): Update to 0.0.0-14.ab53797. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 75747f3482..528db7cac7 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3003,8 +3003,8 @@ (define-public tnef (license gpl2+))) (define-public mumi - (let ((commit "1fee105324ff9a1bd776c1244a280f4ab6ae2161") - (revision "13")) + (let ((commit "ab53797fbd5ecb3c076cc7bdfdbb284840abc15f") + (revision "14")) (package (name "mumi") (version (git-version "0.0.0" revision commit)) @@ -3016,7 +3016,7 @@ (define-public mumi (file-name (git-file-name name version)) (sha256 (base32 - "03liks9yavagy12sqkdvhils9s0903qi52zgszp1g98p819r0djl")))) + "13hy4k0swh7afr57rnxr6vnqw5llwd1jqg90fz7710s4v4z51q2v")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 5c08ae30ee46f69397cd3b358b203349ecc7c877 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Apr 2020 16:28:13 +0200 Subject: gnu: mumi: Update to 0.0.0-15.c85015d. * gnu/packages/mail.scm (mumi): Update to 0.0.0-15.c85015d. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 528db7cac7..a6ed776db1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3003,8 +3003,8 @@ (define-public tnef (license gpl2+))) (define-public mumi - (let ((commit "ab53797fbd5ecb3c076cc7bdfdbb284840abc15f") - (revision "14")) + (let ((commit "c85015dac8110bd7a4c37375b9eb05ebeadedf74") + (revision "15")) (package (name "mumi") (version (git-version "0.0.0" revision commit)) @@ -3016,7 +3016,7 @@ (define-public mumi (file-name (git-file-name name version)) (sha256 (base32 - "13hy4k0swh7afr57rnxr6vnqw5llwd1jqg90fz7710s4v4z51q2v")))) + "05nma73kqnva6ci92aq8jb3718ry5dz3sd64ibpxn5w77z5kpwr7")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3