From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42547)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fFcfj-0002YZ-QP
	for guix-patches@gnu.org; Mon, 07 May 2018 05:43:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fFcfe-00046z-Tg
	for guix-patches@gnu.org; Mon, 07 May 2018 05:43:07 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:44086)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1fFcfe-00046b-Pw
	for guix-patches@gnu.org; Mon, 07 May 2018 05:43:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fFcfe-0000Gb-Go
	for guix-patches@gnu.org; Mon, 07 May 2018 05:43:02 -0400
Subject: [bug#31331] [PATCH 2/2] gnu: services: bitlbee: Add plugins.
Resent-Message-ID: <handler.31331.B31331.1525686127959@debbugs.gnu.org>
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
References: <20180501120535.13961-1-contact@parouby.fr>
	<20180501173827.14527-1-contact@parouby.fr>
Date: Mon, 07 May 2018 11:41:53 +0200
In-Reply-To: <20180501173827.14527-1-contact@parouby.fr> (Pierre-Antoine
	Rouby's message of "Tue, 1 May 2018 19:38:27 +0200")
Message-ID: <87in7zajku.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Pierre-Antoine Rouby <contact@parouby.fr>
Cc: 31331@debbugs.gnu.org

Hello!

Pierre-Antoine Rouby <contact@parouby.fr> skribis:

> * gnu/services/messaging.scm (bitlbee): Add plugins argument.

Please mention the changes to <bitlbee-configuration> and
=E2=80=98bitlbee-shepherd-service=E2=80=99.  (There=E2=80=99s no variable n=
amed =E2=80=98bitlbee=E2=80=99 in
this file, so the above message wouldn=E2=80=99t 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 =3D bitlbee
>    ConfigDir =3D /var/lib/bitlbee
>    DaemonInterface =3D " interface "
>    DaemonPort =3D " (number->string port) "
> -" extra-settings))))
> +  PluginDir =3D " (bitlbee-plugin-directory plugins) "/lib/bitlbee

I think you could inline the =E2=80=98directory-union=E2=80=99 call here; n=
o need to
define =E2=80=98bitlbee-plugin-directory=E2=80=99.

> @@ -860,6 +868,7 @@ a gateway between IRC and chat networks.")))
>=20=20
>  (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=E2=80=99.