From unknown Sun Jun 22 11:42:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31331] [PATCH 1/2] gnu: Add bitlbee-discord. Resent-From: Pierre-Antoine Rouby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 May 2018 15:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 31331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 31331@debbugs.gnu.org Cc: Pierre-Antoine Rouby X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.152518842321054 (code B ref -1); Tue, 01 May 2018 15:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 May 2018 15:27:03 +0000 Received: from localhost ([127.0.0.1]:45796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDXBG-0005TV-FM for submit@debbugs.gnu.org; Tue, 01 May 2018 11:27:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDU2q-0000xt-3p for submit@debbugs.gnu.org; Tue, 01 May 2018 08:06:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fDU2j-00020W-RV for submit@debbugs.gnu.org; Tue, 01 May 2018 08:06:02 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: ** X-Spam-Status: No, score=2.5 required=5.0 tests=BAYES_50,URIBL_BLACK autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:33080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fDU2j-00020R-O2 for submit@debbugs.gnu.org; Tue, 01 May 2018 08:06:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDU2i-0005Ka-Bk for guix-patches@gnu.org; Tue, 01 May 2018 08:06:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fDU2e-0001ye-C3 for guix-patches@gnu.org; Tue, 01 May 2018 08:06:00 -0400 Received: from 10.mo1.mail-out.ovh.net ([178.32.96.102]:45678) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fDU2e-0001xv-4s for guix-patches@gnu.org; Tue, 01 May 2018 08:05:56 -0400 Received: from player773.ha.ovh.net (unknown [10.109.122.86]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id 8C7F0F2147 for ; Tue, 1 May 2018 14:05:53 +0200 (CEST) Received: from localhost.localdomain (58.ip-213-32-91.eu [213.32.91.58]) (Authenticated sender: contact@parouby.fr) by player773.ha.ovh.net (Postfix) with ESMTPSA id 84E916000C5; Tue, 1 May 2018 14:05:50 +0200 (CEST) From: Pierre-Antoine Rouby Date: Tue, 1 May 2018 14:05:35 +0200 Message-Id: <20180501120535.13961-1-contact@parouby.fr> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Ovh-Tracer-Id: 6350356951825069138 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtgedruddtgedghedtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenuc Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -2.3 (--) X-Mailman-Approved-At: Tue, 01 May 2018 11:27:01 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/messaging.scm (bitlbee-discord): New variable. (bitlbee): Add 'install-lib' phase. --- gnu/packages/messaging.scm | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fd1c330ce..d6bd588cb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -14,6 +14,7 @@ ;;; Copyright =C2=A9 2017 Theodoros Foradis ;;; Copyright =C2=A9 2017 Rutger Helling ;;; Copyright =C2=A9 2018 Leo Famulari +;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby ;;; ;;; This file is part of GNU Guix. ;;; @@ -181,6 +182,9 @@ end-to-end encryption.") (add-after 'install 'install-etc (lambda* (#:key (make-flags '()) #:allow-other-keys) (zero? (apply system* "make" "install-etc" make-flags)))) + (add-after 'install-etc 'install-lib + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (zero? (apply system* "make" "install-dev" make-flags)))) (replace 'configure ;; bitlbee's configure script does not tolerate many of the ;; variable settings that Guix would pass to it. @@ -199,6 +203,52 @@ identi.ca and status.net).") (home-page "http://www.bitlbee.org/") (license (list license:gpl2+ license:bsd-2)))) =20 +(define-public bitlbee-discord + (package + (name "bitlbee-discord") + (version "0.4.1") + (source (origin + (method url-fetch) + (uri + (string-append + "https://github.com/sm00th/bitlbee-discord/" + "archive/" version ".tar.gz")) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bwqxlg6fwj3749y7w69n9jwsdzf5nl9xqiszbpv9k8x1422i1y1"))= )) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + (invoke "sh" "autogen.sh"))) + (add-before 'configure 'bash-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "configure" + (("\\$SHELL") (string-append (assoc-ref inputs "bash") + "/bin/sh"))))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (invoke "./configure" + (string-append "--with-plugindir=3D" + (assoc-ref outputs "out") + "/lib/bitlbee/"))))))) + (inputs `(("glib" ,glib))) + (native-inputs `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo) + ("libtool" ,libtool) + ("bitlbee" ,bitlbee) + ("bash" ,bash))) + (synopsis "IRC to instant messaging gateway discord plugin") + (description "This package is plugin for bitlbee IRC to other messag= ing +gateway.") + (home-page "http://www.bitlbee.org/") + (license license:gpl2+))) + (define-public hexchat (package (name "hexchat") --=20 2.17.0 From unknown Sun Jun 22 11:42:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31331] [PATCH 2/2] gnu: services: bitlbee: Add plugins. References: <20180501120535.13961-1-contact@parouby.fr> In-Reply-To: <20180501120535.13961-1-contact@parouby.fr> Resent-From: Pierre-Antoine Rouby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 May 2018 17:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 31331@debbugs.gnu.org Cc: Pierre-Antoine Rouby Received: via spool by 31331-submit@debbugs.gnu.org id=B31331.15251966341852 (code B ref 31331); Tue, 01 May 2018 17:44:01 +0000 Received: (at 31331) by debbugs.gnu.org; 1 May 2018 17:43:54 +0000 Received: from localhost ([127.0.0.1]:46025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDZJh-0000Tn-Se for submit@debbugs.gnu.org; Tue, 01 May 2018 13:43:54 -0400 Received: from 3.mo177.mail-out.ovh.net ([46.105.36.172]:43349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDZEl-0000ME-HX for 31331@debbugs.gnu.org; Tue, 01 May 2018 13:38:48 -0400 Received: from player158.ha.ovh.net (unknown [10.109.105.31]) by mo177.mail-out.ovh.net (Postfix) with ESMTP id 80C00AF37F for <31331@debbugs.gnu.org>; Tue, 1 May 2018 19:38:46 +0200 (CEST) Received: from localhost.localdomain (58.ip-213-32-91.eu [213.32.91.58]) (Authenticated sender: contact@parouby.fr) by player158.ha.ovh.net (Postfix) with ESMTPSA id 7690F620094; Tue, 1 May 2018 19:38:44 +0200 (CEST) From: Pierre-Antoine Rouby Date: Tue, 1 May 2018 19:38:27 +0200 Message-Id: <20180501173827.14527-1-contact@parouby.fr> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 11972256661094675461 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtgedruddtgedguddukecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecu X-Spam-Score: -0.0 (/) X-Mailman-Approved-At: Tue, 01 May 2018 13:43:53 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/messaging.scm (bitlbee): Add plugins argument. --- gnu/services/messaging.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index 80ffed0f2..d10fef590 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2018 Pierre-Antoine Rouby ;;; ;;; This file is part of GNU Guix. ;;; @@ -783,20 +784,27 @@ string, you could instantiate a prosody service like this: (default "127.0.0.1")) (port bitlbee-configuration-port (default 6667)) + (plugins bitlbee-plugins + (default '())) (extra-settings bitlbee-configuration-extra-settings (default ""))) +(define (bitlbee-plugin-directory plugins) + "Return a directory containing PLUGINS." + (directory-union "bitlbee-plugins" plugins)) + (define bitlbee-shepherd-service (match-lambda - (($ bitlbee interface port extra-settings) - (let ((conf (plain-file "bitlbee.conf" - (string-append " - [settings] + (($ 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 +" extra-settings))) (with-imported-modules (source-module-closure '((gnu build shepherd) @@ -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 "")) "Return a service that runs @url{http://bitlbee.org,BitlBee}, a daemon that acts as a gateway between IRC and chat networks. @@ -875,4 +884,5 @@ configuration file." (bitlbee-configuration (bitlbee bitlbee) (interface interface) (port port) + (plugins plugins) (extra-settings extra-settings)))) -- 2.17.0 From unknown Sun Jun 22 11:42:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31331] [PATCH 1/2] gnu: Add bitlbee-discord. Resent-From: Nils Gillmann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 May 2018 18:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Pierre-Antoine Rouby Cc: 31331@debbugs.gnu.org Received: via spool by 31331-submit@debbugs.gnu.org id=B31331.152528645832134 (code B ref 31331); Wed, 02 May 2018 18:41:02 +0000 Received: (at 31331) by debbugs.gnu.org; 2 May 2018 18:40:58 +0000 Received: from localhost ([127.0.0.1]:47310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDwgN-0008M5-8g for submit@debbugs.gnu.org; Wed, 02 May 2018 14:40:57 -0400 Received: from static.195.114.201.195.clients.your-server.de ([195.201.114.195]:53236 helo=conspiracy.of.n0.is) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDwgJ-0008Lu-3X for 31331@debbugs.gnu.org; Wed, 02 May 2018 14:40:50 -0400 Received: by conspiracy.of.n0.is (OpenSMTPD) with ESMTPSA id 18de2cf3 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Wed, 2 May 2018 18:40:44 +0000 (UTC) Date: Wed, 2 May 2018 18:41:12 +0000 From: Nils Gillmann Message-ID: <20180502184112.fi7dtxv2lzz3rxqi@abyayala> References: <20180501120535.13961-1-contact@parouby.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180501120535.13961-1-contact@parouby.fr> X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Pierre-Antoine, this package definition is promising but needs some last tweaks. I did not build it so far. Pierre-Antoine Rouby transcribed 3.3K bytes: > * gnu/packages/messaging.scm (bitlbee-discord): New variable. > (bitlbee): Add 'install-lib' phase. > --- > gnu/packages/messaging.scm | 50 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 50 insertions(+) > > diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm > index fd1c330ce..d6bd588cb 100644 > --- a/gnu/packages/messaging.scm > +++ b/gnu/packages/messaging.scm > @@ -14,6 +14,7 @@ > ;;; Copyright =?UTF-8?Q?=C2=A9?= 2017 Theodoros Foradis > ;;; Copyright =?UTF-8?Q?=C2=A9?= 2017 Rutger Helling > ;;; Copyright =?UTF-8?Q?=C2=A9?= 2018 Leo Famulari > +;;; Copyright =?UTF-8?Q?=C2=A9?= 2018 Pierre-Antoine Rouby > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -181,6 +182,9 @@ end-to-end encryption.") > (add-after 'install 'install-etc > (lambda* (#:key (make-flags '()) #:allow-other-keys) > (zero? (apply system* "make" "install-etc" make-flags)))) > + (add-after 'install-etc 'install-lib > + (lambda* (#:key (make-flags '()) #:allow-other-keys) > + (zero? (apply system* "make" "install-dev" make-flags)))) > (replace 'configure > ;; bitlbee's configure script does not tolerate many of the > ;; variable settings that Guix would pass to it. > @@ -199,6 +203,52 @@ identi.ca and status.net).") > (home-page "http://www.bitlbee.org/") > (license (list license:gpl2+ license:bsd-2)))) > > +(define-public bitlbee-discord > + (package > + (name "bitlbee-discord") > + (version "0.4.1") > + (source (origin > + (method url-fetch) > + (uri > + (string-append > + "https://github.com/sm00th/bitlbee-discord/" > + "archive/" version ".tar.gz")) [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: autogen.sh] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) Hi Pierre-Antoine, this package definition is promising but needs some last tweaks. I did not build it so far. Pierre-Antoine Rouby transcribed 3.3K bytes: > * gnu/packages/messaging.scm (bitlbee-discord): New variable. > (bitlbee): Add 'install-lib' phase. > --- > gnu/packages/messaging.scm | 50 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 50 insertions(+) > > diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm > index fd1c330ce..d6bd588cb 100644 > --- a/gnu/packages/messaging.scm > +++ b/gnu/packages/messaging.scm > @@ -14,6 +14,7 @@ > ;;; Copyright © 2017 Theodoros Foradis > ;;; Copyright © 2017 Rutger Helling > ;;; Copyright © 2018 Leo Famulari > +;;; Copyright © 2018 Pierre-Antoine Rouby > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -181,6 +182,9 @@ end-to-end encryption.") > (add-after 'install 'install-etc > (lambda* (#:key (make-flags '()) #:allow-other-keys) > (zero? (apply system* "make" "install-etc" make-flags)))) > + (add-after 'install-etc 'install-lib > + (lambda* (#:key (make-flags '()) #:allow-other-keys) > + (zero? (apply system* "make" "install-dev" make-flags)))) > (replace 'configure > ;; bitlbee's configure script does not tolerate many of the > ;; variable settings that Guix would pass to it. > @@ -199,6 +203,52 @@ identi.ca and status.net).") > (home-page "http://www.bitlbee.org/") > (license (list license:gpl2+ license:bsd-2)))) > > +(define-public bitlbee-discord > + (package > + (name "bitlbee-discord") > + (version "0.4.1") > + (source (origin > + (method url-fetch) > + (uri > + (string-append > + "https://github.com/sm00th/bitlbee-discord/" > + "archive/" version ".tar.gz")) Nitpick, I would write it like: + (uri + (string-append "https://github.com/sm00th/bitlbee-discord/" + "archive/" version ".tar.gz")) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "1bwqxlg6fwj3749y7w69n9jwsdzf5nl9xqiszbpv9k8x1422i1y1")))) > + (build-system gnu-build-system) > + (arguments > + `(#:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'autogen > + (lambda _ > + (invoke "sh" "autogen.sh"))) > + (add-before 'configure 'bash-path > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (substitute* "configure" > + (("\\$SHELL") (string-append (assoc-ref inputs "bash") > + "/bin/sh"))))) Is the configure.ac in this case special, or why doesn't it pick our SHELL that is already in the environment of the build chroot? > + (replace 'configure > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (invoke "./configure" > + (string-append "--with-plugindir=" > + (assoc-ref outputs "out") > + "/lib/bitlbee/"))))))) > + (inputs `(("glib" ,glib))) > + (native-inputs `(("pkg-config" ,pkg-config) > + ("autoconf" ,autoconf) > + ("automake" ,automake) > + ("texinfo" ,texinfo) > + ("libtool" ,libtool) > + ("bitlbee" ,bitlbee) Does the buildsystem of bitlbee-discord check for bitlbee, or why is this required? > + ("bash" ,bash))) > + (synopsis "IRC to instant messaging gateway discord plugin") It's a bitlbee plugin, how about: "Discord plugin for Bitlbee" > + (description "This package is plugin for bitlbee IRC to other messaging > +gateway.") You could write: "Bitblee-discord is a plugin for Bitlbee which provides access to servers running the Discord protocol" I'm not very well informed about Discord, so other people might know more. > + (home-page "http://www.bitlbee.org/") Here we use either the homepage, and if it doesn't exist we link to a webview of the sourcecode or its directory on an httpd where the source is, in this case you'd use "https://github.com/sm00th/bitlbee-discord/" > + (license license:gpl2+))) > + > (define-public hexchat > (package > (name "hexchat") > -- > 2.17.0 > > > > From unknown Sun Jun 22 11:42:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31331] [PATCH 1/2] gnu: Add bitlbee-discord. Resent-From: parouby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 May 2018 20:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nils Gillmann Cc: 31331@debbugs.gnu.org Received: via spool by 31331-submit@debbugs.gnu.org id=B31331.15252925208530 (code B ref 31331); Wed, 02 May 2018 20:22:01 +0000 Received: (at 31331) by debbugs.gnu.org; 2 May 2018 20:22:00 +0000 Received: from localhost ([127.0.0.1]:47372 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDyGF-0002DW-PT for submit@debbugs.gnu.org; Wed, 02 May 2018 16:21:59 -0400 Received: from 12.mo4.mail-out.ovh.net ([178.33.104.253]:46897) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDyGD-0002DN-Fw for 31331@debbugs.gnu.org; Wed, 02 May 2018 16:21:58 -0400 Received: from player697.ha.ovh.net (unknown [10.109.105.37]) by mo4.mail-out.ovh.net (Postfix) with ESMTP id 6F4E3169963 for <31331@debbugs.gnu.org>; Wed, 2 May 2018 22:21:56 +0200 (CEST) Received: from [10.8.0.6] (58.ip-213-32-91.eu [213.32.91.58]) (Authenticated sender: contact@parouby.fr) by player697.ha.ovh.net (Postfix) with ESMTPSA id C86C048008B; Wed, 2 May 2018 22:21:54 +0200 (CEST) References: <20180501120535.13961-1-contact@parouby.fr> <20180502184112.fi7dtxv2lzz3rxqi@abyayala> From: parouby Message-ID: Date: Wed, 2 May 2018 22:21:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180502184112.fi7dtxv2lzz3rxqi@abyayala> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Ovh-Tracer-Id: 2153846522876081157 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedthedrtddtgdduvdefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Nils, On 02/05/2018 20:41, Nils Gillmann wrote: >> + (string-append >> + "https://github.com/sm00th/bitlbee-discord/" >> + "archive/" version ".tar.gz")) > > Nitpick, I would write it like:> + (uri > + (string-append "https://github.com/sm00th/bitlbee-discord/" > + "archive/" version ".tar.gz")) Yes, it's true, my bad ! >> + (add-before 'configure 'bash-path >> + (lambda* (#:key inputs outputs #:allow-other-keys) >> + (substitute* "configure" >> + (("\\$SHELL") (string-append (assoc-ref inputs "bash") >> + "/bin/sh"))))) > > Is the configure.ac in this case special, or why doesn't it pick our SHELL > that is already in the environment of the build chroot? In this case, without modification the configure try to run '/bin/bash' and don't care about 'SHELL' environment variable. I don't found any other way. Any idea ? >> + (native-inputs `(("pkg-config" ,pkg-config) >> + ("autoconf" ,autoconf) >> + ("automake" ,automake) >> + ("texinfo" ,texinfo) >> + ("libtool" ,libtool) >> + ("bitlbee" ,bitlbee) > > Does the buildsystem of bitlbee-discord check for bitlbee, or why is this required? Yes it's need bitlbee lib and header for compilation (just like bitlbee-dev debian package). Thanks, -- Pierre-Antoine From unknown Sun Jun 22 11:42:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31331] [PATCH 1/2] gnu: Add bitlbee-discord. Resent-From: Nils Gillmann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 May 2018 20:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: parouby Cc: 31331@debbugs.gnu.org, Nils Gillmann Received: via spool by 31331-submit@debbugs.gnu.org id=B31331.15252930279356 (code B ref 31331); Wed, 02 May 2018 20:31:01 +0000 Received: (at 31331) by debbugs.gnu.org; 2 May 2018 20:30:27 +0000 Received: from localhost ([127.0.0.1]:47377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDyOQ-0002Qq-Kh for submit@debbugs.gnu.org; Wed, 02 May 2018 16:30:26 -0400 Received: from static.195.114.201.195.clients.your-server.de ([195.201.114.195]:53694 helo=conspiracy.of.n0.is) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDyOO-0002Qh-BJ for 31331@debbugs.gnu.org; Wed, 02 May 2018 16:30:25 -0400 Received: by conspiracy.of.n0.is (OpenSMTPD) with ESMTPSA id dce9168a (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Wed, 2 May 2018 20:30:22 +0000 (UTC) Date: Wed, 2 May 2018 20:30:51 +0000 From: Nils Gillmann Message-ID: <20180502203051.hdczlu5bc2wfgg6q@abyayala> References: <20180501120535.13961-1-contact@parouby.fr> <20180502184112.fi7dtxv2lzz3rxqi@abyayala> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) parouby transcribed 1.5K bytes: > Hi Nils, > > On 02/05/2018 20:41, Nils Gillmann wrote: > >> + (string-append > >> + "https://github.com/sm00th/bitlbee-discord/" > >> + "archive/" version ".tar.gz")) > > > > Nitpick, I would write it like:> + (uri > > + (string-append "https://github.com/sm00th/bitlbee-discord/" > > + "archive/" version ".tar.gz")) > > Yes, it's true, my bad ! > > >> + (add-before 'configure 'bash-path > >> + (lambda* (#:key inputs outputs #:allow-other-keys) > >> + (substitute* "configure" > >> + (("\\$SHELL") (string-append (assoc-ref inputs "bash") > >> + "/bin/sh"))))) > > > > Is the configure.ac in this case special, or why doesn't it pick our SHELL > > that is already in the environment of the build chroot? > > In this case, without modification the configure try to run '/bin/bash' > and don't care about 'SHELL' environment variable. > I don't found any other way. Any idea ? You could grep the guix source, folder gnu/packages, for cases where SHELL is set. Examples that come to my mind right now are in autotools.scm as well as gnuzilla.scm if I remember correctly. I would try setting the shell via environment variables or make/configure flags before patching in a file that I generated before. As a fallback that would be okay too, I think I did something similar to what you did in my Newmoon/Palemoon package. > >> + (native-inputs `(("pkg-config" ,pkg-config) > >> + ("autoconf" ,autoconf) > >> + ("automake" ,automake) > >> + ("texinfo" ,texinfo) > >> + ("libtool" ,libtool) > >> + ("bitlbee" ,bitlbee) > > > > Does the buildsystem of bitlbee-discord check for bitlbee, or why is this required? > > Yes it's need bitlbee lib and header for compilation (just like > bitlbee-dev debian package). I see. Okay. > Thanks, > -- > Pierre-Antoine From unknown Sun Jun 22 11:42:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31331] [PATCH 1/2] gnu: Add bitlbee-discord. Resent-From: Pierre-Antoine Rouby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 May 2018 15:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: gillmann@infotropique.org Cc: 31331@debbugs.gnu.org, Pierre-Antoine Rouby Received: via spool by 31331-submit@debbugs.gnu.org id=B31331.152553592510587 (code B ref 31331); Sat, 05 May 2018 15:59:01 +0000 Received: (at 31331) by debbugs.gnu.org; 5 May 2018 15:58:45 +0000 Received: from localhost ([127.0.0.1]:50796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fEza2-0002kZ-3z for submit@debbugs.gnu.org; Sat, 05 May 2018 11:58:45 -0400 Received: from 3.mo68.mail-out.ovh.net ([46.105.58.60]:46248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fEza0-0002kP-U9 for 31331@debbugs.gnu.org; Sat, 05 May 2018 11:58:37 -0400 Received: from player690.ha.ovh.net (unknown [10.109.108.55]) by mo68.mail-out.ovh.net (Postfix) with ESMTP id AC160E0226 for <31331@debbugs.gnu.org>; Sat, 5 May 2018 17:58:35 +0200 (CEST) Received: from localhost.localdomain (58.ip-213-32-91.eu [213.32.91.58]) (Authenticated sender: contact@parouby.fr) by player690.ha.ovh.net (Postfix) with ESMTPSA id 5A577540093; Sat, 5 May 2018 17:58:32 +0200 (CEST) From: Pierre-Antoine Rouby Date: Sat, 5 May 2018 17:57:51 +0200 Message-Id: <20180505155751.12539-1-contact@parouby.fr> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180502203051.hdczlu5bc2wfgg6q@abyayala> References: <20180502203051.hdczlu5bc2wfgg6q@abyayala> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 15324342159000220845 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedthedrtdejgdeljecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecu X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/messaging.scm (bitlbee-discord): New variable. (bitlbee): Add 'install-lib' phase. --- gnu/packages/messaging.scm | 47 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: autogen.sh] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [46.105.58.60 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) * gnu/packages/messaging.scm (bitlbee-discord): New variable. (bitlbee): Add 'install-lib' phase. --- gnu/packages/messaging.scm | 47 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fd1c330ce..6a953e7d1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Leo Famulari +;;; Copyright © 2018 Pierre-Antoine Rouby ;;; ;;; This file is part of GNU Guix. ;;; @@ -181,6 +182,9 @@ end-to-end encryption.") (add-after 'install 'install-etc (lambda* (#:key (make-flags '()) #:allow-other-keys) (zero? (apply system* "make" "install-etc" make-flags)))) + (add-after 'install-etc 'install-lib + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (zero? (apply system* "make" "install-dev" make-flags)))) (replace 'configure ;; bitlbee's configure script does not tolerate many of the ;; variable settings that Guix would pass to it. @@ -199,6 +203,49 @@ identi.ca and status.net).") (home-page "http://www.bitlbee.org/") (license (list license:gpl2+ license:bsd-2)))) +(define-public bitlbee-discord + (package + (name "bitlbee-discord") + (version "0.4.1") + (source (origin + (method url-fetch) + (uri + (string-append "https://github.com/sm00th/bitlbee-discord/" + "archive/" version ".tar.gz")) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bwqxlg6fwj3749y7w69n9jwsdzf5nl9xqiszbpv9k8x1422i1y1")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + (let ((sh (which "sh"))) + (substitute* "autogen.sh" (("/bin/sh") sh)) + (setenv "CONFIG_SHELL" sh) + (zero? (system* "./autogen.sh"))))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (invoke "./configure" + (string-append "--with-plugindir=" + (assoc-ref outputs "out") + "/lib/bitlbee/"))))))) + (inputs `(("glib" ,glib))) + (native-inputs `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo) + ("libtool" ,libtool) + ("bitlbee" ,bitlbee) ; Need ditlbee devel header + ("bash" ,bash))) + (synopsis "Discord plugin for Bitlbee") + (description "Bitlbee-discord is a plugin for Bitlbee witch provides +access to servers running the Discord protocol.") + (home-page "https://github.com/sm00th/bitlbee-discord/") + (license license:gpl2+))) + (define-public hexchat (package (name "hexchat") -- 2.17.0 From unknown Sun Jun 22 11:42:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31331] [PATCH 2/2] gnu: services: bitlbee: Add plugins. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 May 2018 09:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Pierre-Antoine Rouby Cc: 31331@debbugs.gnu.org Received: via spool by 31331-submit@debbugs.gnu.org id=B31331.1525686127959 (code B ref 31331); Mon, 07 May 2018 09:43:02 +0000 Received: (at 31331) by debbugs.gnu.org; 7 May 2018 09:42:07 +0000 Received: from localhost ([127.0.0.1]:51983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFcel-0000FO-3r for submit@debbugs.gnu.org; Mon, 07 May 2018 05:42:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFcej-0000Ew-R3 for 31331@debbugs.gnu.org; Mon, 07 May 2018 05:42:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFceZ-0003oo-Lc for 31331@debbugs.gnu.org; Mon, 07 May 2018 05:42:00 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47398) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFceZ-0003oj-Ht; Mon, 07 May 2018 05:41:55 -0400 Received: from [193.50.110.223] (port=44770 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fFceZ-0007gL-0p; Mon, 07 May 2018 05:41:55 -0400 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> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hello! Pierre-Antoine Rouby skribis: > * gnu/services/messaging.scm (bitlbee): Add plugins argument. Please mention the changes to 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 interface port extra-settings) > - (let ((conf (plain-file "bitlbee.conf" > - (string-append " > - [settings] > + (($ 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. From unknown Sun Jun 22 11:42:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31331] [PATCH 1/2] gnu: Add bitlbee-discord. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 May 2018 09:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Pierre-Antoine Rouby Cc: 31331@debbugs.gnu.org, gillmann@infotropique.org Received: via spool by 31331-submit@debbugs.gnu.org id=B31331.15256865611592 (code B ref 31331); Mon, 07 May 2018 09:50:02 +0000 Received: (at 31331) by debbugs.gnu.org; 7 May 2018 09:49:21 +0000 Received: from localhost ([127.0.0.1]:51987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFclk-0000Pc-UH for submit@debbugs.gnu.org; Mon, 07 May 2018 05:49:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52723) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFcli-0000PN-6l for 31331@debbugs.gnu.org; Mon, 07 May 2018 05:49:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFclZ-0007NK-PJ for 31331@debbugs.gnu.org; Mon, 07 May 2018 05:49:12 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFclZ-0007NF-M0; Mon, 07 May 2018 05:49:09 -0400 Received: from [193.50.110.223] (port=44812 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fFclZ-00089u-7u; Mon, 07 May 2018 05:49:09 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20180502203051.hdczlu5bc2wfgg6q@abyayala> <20180505155751.12539-1-contact@parouby.fr> Date: Mon, 07 May 2018 11:49:06 +0200 In-Reply-To: <20180505155751.12539-1-contact@parouby.fr> (Pierre-Antoine Rouby's message of "Sat, 5 May 2018 17:57:51 +0200") Message-ID: <87efinaj8t.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Pierre-Antoine Rouby skribis: > * gnu/packages/messaging.scm (bitlbee-discord): New variable. > (bitlbee): Add 'install-lib' phase. I made it two separate patches and applied. Thank you, and thanks Nils for the review! Ludo=E2=80=99. From unknown Sun Jun 22 11:42:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31331] [PATCH 2/2] gnu: services: bitlbee: Add plugins. Resent-From: Pierre-Antoine Rouby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 May 2018 14:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: ludo@gnu.org Cc: 31331@debbugs.gnu.org, Pierre-Antoine Rouby Received: via spool by 31331-submit@debbugs.gnu.org id=B31331.152596261615702 (code B ref 31331); Thu, 10 May 2018 14:31:01 +0000 Received: (at 31331) by debbugs.gnu.org; 10 May 2018 14:30:16 +0000 Received: from localhost ([127.0.0.1]:56619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fGmaF-00045C-KE for submit@debbugs.gnu.org; Thu, 10 May 2018 10:30:15 -0400 Received: from 8.mo2.mail-out.ovh.net ([188.165.52.147]:33044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fGmaD-000453-Vj for 31331@debbugs.gnu.org; Thu, 10 May 2018 10:30:14 -0400 Received: from player761.ha.ovh.net (unknown [10.109.108.17]) by mo2.mail-out.ovh.net (Postfix) with ESMTP id AFAA0131364 for <31331@debbugs.gnu.org>; Thu, 10 May 2018 16:30:12 +0200 (CEST) Received: from localhost.localdomain (58.ip-213-32-91.eu [213.32.91.58]) (Authenticated sender: contact@parouby.fr) by player761.ha.ovh.net (Postfix) with ESMTPSA id B2D1A48009E; Thu, 10 May 2018 16:30:09 +0200 (CEST) From: Pierre-Antoine Rouby Date: Thu, 10 May 2018 16:29:23 +0200 Message-Id: <20180510142923.4132-1-contact@parouby.fr> X-Mailer: git-send-email 2.17.0 In-Reply-To: <87in7zajku.fsf@gnu.org> References: <87in7zajku.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 6301661781147202740 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedthedrudejgdejkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecu X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/messaging.scm (): Add plugins argument. (bitlbee-shepherd-service): Update config file. (bitlbee-service): Add plugins argument. --- doc/guix.texi | 3 +++ gnu/services/messaging.scm | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 87892fc89..b939097a8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14880,6 +14880,9 @@ 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{extra-settings} (default: @code{""}) Configuration snippet added as-is to the BitlBee configuration file. @end table diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index 80ffed0f2..0db086834 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2018 Pierre-Antoine Rouby ;;; ;;; This file is part of GNU Guix. ;;; @@ -783,20 +784,24 @@ string, you could instantiate a prosody service like this: (default "127.0.0.1")) (port bitlbee-configuration-port (default 6667)) + (plugins bitlbee-plugins + (default '())) (extra-settings bitlbee-configuration-extra-settings (default ""))) (define bitlbee-shepherd-service (match-lambda - (($ bitlbee interface port extra-settings) - (let ((conf (plain-file "bitlbee.conf" - (string-append " + (($ 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 = " (directory-union "bitlbee-plugins" plugins) "/lib/bitlbee +" extra-settings))) (with-imported-modules (source-module-closure '((gnu build shepherd) @@ -860,6 +865,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 "")) "Return a service that runs @url{http://bitlbee.org,BitlBee}, a daemon that acts as a gateway between IRC and chat networks. @@ -875,4 +881,5 @@ configuration file." (bitlbee-configuration (bitlbee bitlbee) (interface interface) (port port) + (plugins plugins) (extra-settings extra-settings)))) -- 2.17.0 From unknown Sun Jun 22 11:42:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31331] [PATCH 2/2] gnu: services: bitlbee: Add plugins. Resent-From: Pierre-Antoine Rouby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 May 2018 14:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: ludo@gnu.org Cc: 31331@debbugs.gnu.org, Pierre-Antoine Rouby Received: via spool by 31331-submit@debbugs.gnu.org id=B31331.152596309616374 (code B ref 31331); Thu, 10 May 2018 14:39:01 +0000 Received: (at 31331) by debbugs.gnu.org; 10 May 2018 14:38:16 +0000 Received: from localhost ([127.0.0.1]:56624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fGmi0-0004G1-Gx for submit@debbugs.gnu.org; Thu, 10 May 2018 10:38:16 -0400 Received: from 1.mo69.mail-out.ovh.net ([178.33.251.173]:44069) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fGmhy-0004Fs-1W for 31331@debbugs.gnu.org; Thu, 10 May 2018 10:38:14 -0400 Received: from player761.ha.ovh.net (unknown [10.109.120.77]) by mo69.mail-out.ovh.net (Postfix) with ESMTP id C9C53149D4 for <31331@debbugs.gnu.org>; Thu, 10 May 2018 16:38:12 +0200 (CEST) Received: from localhost.localdomain (58.ip-213-32-91.eu [213.32.91.58]) (Authenticated sender: contact@parouby.fr) by player761.ha.ovh.net (Postfix) with ESMTPSA id 23A244800A3; Thu, 10 May 2018 16:38:10 +0200 (CEST) From: Pierre-Antoine Rouby Date: Thu, 10 May 2018 16:37:58 +0200 Message-Id: <20180510143758.4267-1-contact@parouby.fr> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180510142923.4132-1-contact@parouby.fr> References: <20180510142923.4132-1-contact@parouby.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 6436769768517874868 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedthedrudejgdejlecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecu X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * doc/guix.texi (Bitlbee Service): Add plugins. * gnu/services/messaging.scm (): Add plugins argument. (bitlbee-shepherd-service): Update config file. (bitlbee-service): Add plugins argument. --- doc/guix.texi | 3 +++ gnu/services/messaging.scm | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 87892fc89..b939097a8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14880,6 +14880,9 @@ 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{extra-settings} (default: @code{""}) Configuration snippet added as-is to the BitlBee configuration file. @end table diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index 80ffed0f2..0db086834 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2018 Pierre-Antoine Rouby ;;; ;;; This file is part of GNU Guix. ;;; @@ -783,20 +784,24 @@ string, you could instantiate a prosody service like this: (default "127.0.0.1")) (port bitlbee-configuration-port (default 6667)) + (plugins bitlbee-plugins + (default '())) (extra-settings bitlbee-configuration-extra-settings (default ""))) (define bitlbee-shepherd-service (match-lambda - (($ bitlbee interface port extra-settings) - (let ((conf (plain-file "bitlbee.conf" - (string-append " + (($ 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 = " (directory-union "bitlbee-plugins" plugins) "/lib/bitlbee +" extra-settings))) (with-imported-modules (source-module-closure '((gnu build shepherd) @@ -860,6 +865,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 "")) "Return a service that runs @url{http://bitlbee.org,BitlBee}, a daemon that acts as a gateway between IRC and chat networks. @@ -875,4 +881,5 @@ configuration file." (bitlbee-configuration (bitlbee bitlbee) (interface interface) (port port) + (plugins plugins) (extra-settings extra-settings)))) -- 2.17.0 From unknown Sun Jun 22 11:42:15 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Pierre-Antoine Rouby Subject: bug#31331: closed (Re: [PATCH 2/2] gnu: services: bitlbee: Add plugins.) Message-ID: References: <87sh6ztft1.fsf@gnu.org> <20180501120535.13961-1-contact@parouby.fr> X-Gnu-PR-Message: they-closed 31331 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 31331@debbugs.gnu.org Date: Thu, 10 May 2018 20:30:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1525984202-15218-1" This is a multi-part message in MIME format... ------------=_1525984202-15218-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #31331: [PATCH 1/2] gnu: Add bitlbee-discord. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 31331@debbugs.gnu.org. --=20 31331: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D31331 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1525984202-15218-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 31331-done) by debbugs.gnu.org; 10 May 2018 20:29:55 +0000 Received: from localhost ([127.0.0.1]:56902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fGsCJ-0003wx-Fn for submit@debbugs.gnu.org; Thu, 10 May 2018 16:29:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fGsCI-0003wm-2h for 31331-done@debbugs.gnu.org; Thu, 10 May 2018 16:29:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGsCB-0005qN-Rh for 31331-done@debbugs.gnu.org; Thu, 10 May 2018 16:29:49 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39186) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGsCB-0005qI-Lx; Thu, 10 May 2018 16:29:47 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=55894 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fGsCB-0002MS-A9; Thu, 10 May 2018 16:29:47 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Pierre-Antoine Rouby Subject: Re: [PATCH 2/2] gnu: services: bitlbee: Add plugins. References: <20180510142923.4132-1-contact@parouby.fr> <20180510143758.4267-1-contact@parouby.fr> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 21 =?utf-8?Q?Flor=C3=A9al?= an 226 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu 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> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 31331-done Cc: 31331-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) --=-=-= Content-Type: text/plain Hello, Pierre-Antoine Rouby skribis: > * doc/guix.texi (Bitlbee Service): Add plugins. > * gnu/services/messaging.scm (): 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. --=-=-=-- ------------=_1525984202-15218-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 1 May 2018 15:27:03 +0000 Received: from localhost ([127.0.0.1]:45796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDXBG-0005TV-FM for submit@debbugs.gnu.org; Tue, 01 May 2018 11:27:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDU2q-0000xt-3p for submit@debbugs.gnu.org; Tue, 01 May 2018 08:06:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fDU2j-00020W-RV for submit@debbugs.gnu.org; Tue, 01 May 2018 08:06:02 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: ** X-Spam-Status: No, score=2.5 required=5.0 tests=BAYES_50,URIBL_BLACK autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:33080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fDU2j-00020R-O2 for submit@debbugs.gnu.org; Tue, 01 May 2018 08:06:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDU2i-0005Ka-Bk for guix-patches@gnu.org; Tue, 01 May 2018 08:06:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fDU2e-0001ye-C3 for guix-patches@gnu.org; Tue, 01 May 2018 08:06:00 -0400 Received: from 10.mo1.mail-out.ovh.net ([178.32.96.102]:45678) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fDU2e-0001xv-4s for guix-patches@gnu.org; Tue, 01 May 2018 08:05:56 -0400 Received: from player773.ha.ovh.net (unknown [10.109.122.86]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id 8C7F0F2147 for ; Tue, 1 May 2018 14:05:53 +0200 (CEST) Received: from localhost.localdomain (58.ip-213-32-91.eu [213.32.91.58]) (Authenticated sender: contact@parouby.fr) by player773.ha.ovh.net (Postfix) with ESMTPSA id 84E916000C5; Tue, 1 May 2018 14:05:50 +0200 (CEST) From: Pierre-Antoine Rouby To: guix-patches@gnu.org Subject: [PATCH 1/2] gnu: Add bitlbee-discord. Date: Tue, 1 May 2018 14:05:35 +0200 Message-Id: <20180501120535.13961-1-contact@parouby.fr> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Ovh-Tracer-Id: 6350356951825069138 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtgedruddtgedghedtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenuc Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Tue, 01 May 2018 11:27:01 -0400 Cc: Pierre-Antoine Rouby X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/messaging.scm (bitlbee-discord): New variable. (bitlbee): Add 'install-lib' phase. --- gnu/packages/messaging.scm | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fd1c330ce..d6bd588cb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -14,6 +14,7 @@ ;;; Copyright =C2=A9 2017 Theodoros Foradis ;;; Copyright =C2=A9 2017 Rutger Helling ;;; Copyright =C2=A9 2018 Leo Famulari +;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby ;;; ;;; This file is part of GNU Guix. ;;; @@ -181,6 +182,9 @@ end-to-end encryption.") (add-after 'install 'install-etc (lambda* (#:key (make-flags '()) #:allow-other-keys) (zero? (apply system* "make" "install-etc" make-flags)))) + (add-after 'install-etc 'install-lib + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (zero? (apply system* "make" "install-dev" make-flags)))) (replace 'configure ;; bitlbee's configure script does not tolerate many of the ;; variable settings that Guix would pass to it. @@ -199,6 +203,52 @@ identi.ca and status.net).") (home-page "http://www.bitlbee.org/") (license (list license:gpl2+ license:bsd-2)))) =20 +(define-public bitlbee-discord + (package + (name "bitlbee-discord") + (version "0.4.1") + (source (origin + (method url-fetch) + (uri + (string-append + "https://github.com/sm00th/bitlbee-discord/" + "archive/" version ".tar.gz")) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bwqxlg6fwj3749y7w69n9jwsdzf5nl9xqiszbpv9k8x1422i1y1"))= )) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + (invoke "sh" "autogen.sh"))) + (add-before 'configure 'bash-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "configure" + (("\\$SHELL") (string-append (assoc-ref inputs "bash") + "/bin/sh"))))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (invoke "./configure" + (string-append "--with-plugindir=3D" + (assoc-ref outputs "out") + "/lib/bitlbee/"))))))) + (inputs `(("glib" ,glib))) + (native-inputs `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo) + ("libtool" ,libtool) + ("bitlbee" ,bitlbee) + ("bash" ,bash))) + (synopsis "IRC to instant messaging gateway discord plugin") + (description "This package is plugin for bitlbee IRC to other messag= ing +gateway.") + (home-page "http://www.bitlbee.org/") + (license license:gpl2+))) + (define-public hexchat (package (name "hexchat") --=20 2.17.0 ------------=_1525984202-15218-1--