From patchwork Thu Feb 24 20:40:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 37450 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 616B127BBE9; Thu, 24 Feb 2022 20:41:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 10A6727BBEA for ; Thu, 24 Feb 2022 20:41:11 +0000 (GMT) Received: from localhost ([::1]:46440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNKvG-0004vT-6k for patchwork@mira.cbaines.net; Thu, 24 Feb 2022 15:41:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNKv8-0004vJ-HO for guix-patches@gnu.org; Thu, 24 Feb 2022 15:41:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNKv8-0006k5-7M for guix-patches@gnu.org; Thu, 24 Feb 2022 15:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nNKv7-00031f-Oo for guix-patches@gnu.org; Thu, 24 Feb 2022 15:41:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54148] [PATCH] gnu: matterbridge: update to 1.24.0 Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Feb 2022 20:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54148 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54148@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164573523311583 (code B ref -1); Thu, 24 Feb 2022 20:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Feb 2022 20:40:33 +0000 Received: from localhost ([127.0.0.1]:50537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNKue-00030l-M9 for submit@debbugs.gnu.org; Thu, 24 Feb 2022 15:40:32 -0500 Received: from lists.gnu.org ([209.51.188.17]:36900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNKud-00030e-KX for submit@debbugs.gnu.org; Thu, 24 Feb 2022 15:40:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNKud-0004rA-DW for guix-patches@gnu.org; Thu, 24 Feb 2022 15:40:31 -0500 Received: from cyberdimension.org ([80.67.179.20]:33698 helo=gnutoo.cyberdimension.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1nNKua-0006eN-Be for guix-patches@gnu.org; Thu, 24 Feb 2022 15:40:30 -0500 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id ac2a5e76; Thu, 24 Feb 2022 20:39:24 +0000 (UTC) Received: from primarylaptop.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 111ac028; Thu, 24 Feb 2022 20:39:24 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Thu, 24 Feb 2022 21:40:48 +0100 Message-Id: <20220224204048.25280-1-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Received-SPF: pass client-ip=80.67.179.20; envelope-from=GNUtoo@cyberdimension.org; helo=gnutoo.cyberdimension.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/messaging.scm (matterbridge): Update to 1.24.0. Signed-off-by: Denis 'GNUtoo' Carikli --- gnu/packages/messaging.scm | 59 ++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 779d37fdd7..d23ec998db 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -3109,23 +3109,52 @@ (define-public zulip-term (define-public matterbridge (package (name "matterbridge") - (version "1.22.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/42wim/matterbridge") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "07rgdc4v043fhzsalmlhickqizk6xjlpjkzn6l5v9ryp5gmv580z")))) - (build-system go-build-system) + (version "1.24.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/42wim/matterbridge") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cd70x9685162c0imdici1ipl9lziq700wzyb5bsg610wfak3ms7")))) + ;; Using the go-build-system results in the same error message + ;; than in the bug 1551[1]. So we fix it by running go build + ;; manually in the git repository as-is as this is the solution + ;; given to that bug by the matterbridge developers. + ;; [1]https://github.com/42wim/matterbridge/issues/1551 + (build-system gnu-build-system) (arguments - `(#:import-path "github.com/42wim/matterbridge" - #:unpack-path "github.com/42wim/matterbridge")) + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (setenv "GOCACHE" + (string-append (getcwd) "/go-build")) + (setenv "GOBIN" + (string-append (assoc-ref %outputs "out") "/bin")) + (invoke "go" "build" "-v" "-x"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "GOCACHE" + (string-append (getcwd) "/go-build")) + (setenv "GOBIN" + (string-append (assoc-ref %outputs "out") + "/bin")) + (invoke "go" "test" "-v" "-x")))) + (replace 'install + (lambda _ + (setenv "GOCACHE" + (string-append (getcwd) "/go-build")) + (setenv "GOBIN" + (string-append (assoc-ref %outputs "out") "/bin")) + (invoke "go" "install" "-v" "-x")))))) + (native-inputs (list go)) (synopsis "Bridge together various messaging networks and protocols") - (description "Relays messages between different channels from various + (description + "Relays messages between different channels from various messaging networks and protocols. So far it supports mattermost, IRC, gitter, xmpp, slack, discord, telegram, rocketchat, twitch, ssh-chat, zulip, whatsapp, keybase, matrix, microsoft teams, nextcloud, mumble, vk and more with REST