From: ludo@gnu.org (Ludovic Courtès)
To: Pierre-Antoine Rouby <contact@parouby.fr>
Cc: 31331@debbugs.gnu.org
Subject: [bug#31331] [PATCH 2/2] gnu: services: bitlbee: Add plugins.
Date: Mon, 07 May 2018 11:41:53 +0200 [thread overview]
Message-ID: <87in7zajku.fsf@gnu.org> (raw)
In-Reply-To: <20180501173827.14527-1-contact@parouby.fr> (Pierre-Antoine Rouby's message of "Tue, 1 May 2018 19:38:27 +0200")
Hello!
Pierre-Antoine Rouby <contact@parouby.fr> skribis:
> * gnu/services/messaging.scm (bitlbee): Add plugins argument.
Please mention the changes to <bitlbee-configuration> and
‘bitlbee-shepherd-service’. (There’s no variable named ‘bitlbee’ in
this file, so the above message wouldn’t work.)
> (port bitlbee-configuration-port
> (default 6667))
> + (plugins bitlbee-plugins
> + (default '()))
Please update doc/guix.texi to mention the new field.
> +(define (bitlbee-plugin-directory plugins)
> + "Return a directory containing PLUGINS."
> + (directory-union "bitlbee-plugins" plugins))
> +
> (define bitlbee-shepherd-service
> (match-lambda
> - (($ <bitlbee-configuration> bitlbee interface port extra-settings)
> - (let ((conf (plain-file "bitlbee.conf"
> - (string-append "
> - [settings]
> + (($ <bitlbee-configuration> bitlbee interface port
> + plugins extra-settings)
> + (let ((conf (mixed-text-file "bitlbee.conf"
> + " [settings]
> User = bitlbee
> ConfigDir = /var/lib/bitlbee
> DaemonInterface = " interface "
> DaemonPort = " (number->string port) "
> -" extra-settings))))
> + PluginDir = " (bitlbee-plugin-directory plugins) "/lib/bitlbee
I think you could inline the ‘directory-union’ call here; no need to
define ‘bitlbee-plugin-directory’.
> @@ -860,6 +868,7 @@ a gateway between IRC and chat networks.")))
>
> (define* (bitlbee-service #:key (bitlbee bitlbee) ;deprecated
> (interface "127.0.0.1") (port 6667)
> + (plugins '())
> (extra-settings ""))
You can omit this bit because this procedure is deprecated.
Could you send an updated patch?
Thank you!
Ludo’.
next prev parent reply other threads:[~2018-05-07 9:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-01 12:05 [bug#31331] [PATCH 1/2] gnu: Add bitlbee-discord Pierre-Antoine Rouby
2018-05-01 17:38 ` [bug#31331] [PATCH 2/2] gnu: services: bitlbee: Add plugins Pierre-Antoine Rouby
2018-05-07 9:41 ` Ludovic Courtès [this message]
2018-05-10 14:29 ` Pierre-Antoine Rouby
2018-05-10 14:37 ` Pierre-Antoine Rouby
2018-05-10 20:29 ` bug#31331: " Ludovic Courtès
2018-05-02 18:41 ` [bug#31331] [PATCH 1/2] gnu: Add bitlbee-discord Nils Gillmann
2018-05-02 20:21 ` parouby
2018-05-02 20:30 ` Nils Gillmann
2018-05-05 15:57 ` Pierre-Antoine Rouby
2018-05-07 9:49 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87in7zajku.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=31331@debbugs.gnu.org \
--cc=contact@parouby.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).