From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53868)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fGsCR-0001vY-TP
	for guix-patches@gnu.org; Thu, 10 May 2018 16:30:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fGsCQ-0005xR-UB
	for guix-patches@gnu.org; Thu, 10 May 2018 16:30:03 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:49006)
	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 1fGsCQ-0005ww-R9
	for guix-patches@gnu.org; Thu, 10 May 2018 16:30:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fGsCQ-0003xi-Ko
	for guix-patches@gnu.org; Thu, 10 May 2018 16:30:02 -0400
Subject: bug#31331: [PATCH 2/2] gnu: services: bitlbee: Add plugins.
Resent-To: guix-patches@gnu.org
Resent-Message-ID: <handler.31331.D31331.152598419515192.done@debbugs.gnu.org>
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
References: <20180510142923.4132-1-contact@parouby.fr>
	<20180510143758.4267-1-contact@parouby.fr>
Date: Thu, 10 May 2018 22:29:46 +0200
In-Reply-To: <20180510143758.4267-1-contact@parouby.fr> (Pierre-Antoine
	Rouby's message of "Thu, 10 May 2018 16:37:58 +0200")
Message-ID: <87sh6ztft1.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
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-done@debbugs.gnu.org

--=-=-=
Content-Type: text/plain

Hello,

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

> * doc/guix.texi (Bitlbee Service): Add plugins.
> * gnu/services/messaging.scm (<bitlbee-configuration>): Add plugins argument.
>   (bitlbee-shepherd-service): Update config file.
>   (bitlbee-service): Add plugins argument.

Applied with these minor changes:


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline

diff --git a/doc/guix.texi b/doc/guix.texi
index 1acff10dc..637c9c3f4 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14985,8 +14985,8 @@ networking interface.
 @item @code{package} (default: @code{bitlbee})
 The BitlBee package to use.
 
-@item @code{plugins} (default: @code{plugins})
-The BitlBee plugins package to use.
+@item @code{plugins} (default: @code{'()})
+List of plugin packages to use---e.g., @code{bitlbee-discord}.
 
 @item @code{extra-settings} (default: @code{""})
 Configuration snippet added as-is to the BitlBee configuration file.
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index c5ad96cc0..4b7e724a7 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -872,7 +872,6 @@ a gateway between IRC and chat networks.")))
 
 (define* (bitlbee-service #:key (bitlbee bitlbee) ;deprecated
                           (interface "127.0.0.1") (port 6667)
-                          (plugins '())
                           (extra-settings ""))
   "Return a service that runs @url{http://bitlbee.org,BitlBee}, a daemon that
 acts as a gateway between IRC and chat networks.
@@ -888,5 +887,4 @@ configuration file."
            (bitlbee-configuration
             (bitlbee bitlbee)
             (interface interface) (port port)
-            (plugins plugins)
             (extra-settings extra-settings))))

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable


Thank you!

Ludo=E2=80=99.

--=-=-=--