From patchwork Sun Oct 27 18:12:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 69540 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 0672F27BBEA; Sun, 27 Oct 2024 18:13:51 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham 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 4013527BBE2 for ; Sun, 27 Oct 2024 18:13:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t57ld-00033d-L7; Sun, 27 Oct 2024 14:13:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t57lZ-000336-CX for guix-patches@gnu.org; Sun, 27 Oct 2024 14:13:29 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t57lX-0006u1-OY for guix-patches@gnu.org; Sun, 27 Oct 2024 14:13:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=n/hVDRswo9+OMUszDVKS6t/w81RejuV9J56csH8K73c=; b=BfJ6RFKNdc89/14kMI3cFSRqbzUILZ25d+jrLiE5soscrLmAGtsuKJbqzRbnLgVHmjWujO8H/fxXa5KO6JDlKcym9QdMseOBULrtTXcLRkOnxOcJdhwOJFpJFmkDw1Mwv8hP+gipzjSW8VjyNBaD1KPj5BaS+IILgulQVt+h+fuOhEnavdVVwk4Dxq3gETMfUoOCHAt31Pf/4rODTuoLK2pF6owWvW7eXlmmDkbcU7ngfel1tVu6P165eItUmCF+6z0o7KvIVX+CtZTOsHcayUBYiCffisRBTmyLtn9Avt/rzZRtpbc9wtlKnXkb12LCdZAN60c3N3nj3Vreq8Bg3g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t57m6-00030q-JC for guix-patches@gnu.org; Sun, 27 Oct 2024 14:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74049] [PATCH v1] gnu: matterbridge: Unbundle most golang.org dependencies. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Oct 2024 18:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74049 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74049@debbugs.gnu.org, sharlatanus@gmail.com Cc: Denis 'GNUtoo' Carikli X-Debbugs-Original-To: guix-patches@gnu.org, Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.173005282911543 (code B ref -1); Sun, 27 Oct 2024 18:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Oct 2024 18:13:49 +0000 Received: from localhost ([127.0.0.1]:46167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t57lt-000307-CP for submit@debbugs.gnu.org; Sun, 27 Oct 2024 14:13:49 -0400 Received: from lists.gnu.org ([209.51.188.17]:41368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t57lr-000300-Kx for submit@debbugs.gnu.org; Sun, 27 Oct 2024 14:13:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t57lI-0002zB-8t for guix-patches@gnu.org; Sun, 27 Oct 2024 14:13:12 -0400 Received: from cyberdimension.org ([2001:678:938:3ff::36] helo=rockpro64.cyberdimension.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1t57lG-0006sn-3d for guix-patches@gnu.org; Sun, 27 Oct 2024 14:13:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=BYi+MDXM1/AVlBK dP5KbeiAaLI4Zp9gInENFGpqFzYQ=; h=date:subject:cc:to:from; d=cyberdimension.org; b=ahn0+pTWVCcNBxW9vzROxn8DHCXNFmPnAZIBI30+2n0aHy g09kYqCr4h85zZqLgJkkCjq4SSV1j/YOcO5p16MYRgAxdqTVmvzMJswzB5xNjTRPbTWj1o gjeUG7FiLEeJwljHNXTg+ohH6AeOC1G3a2//3eRtTvtSg89dPR6rlQMF8eL3Yw3a3+vNYA cn0GapE2X17gutD5YlN/Ph/CaG5Nxdl36fxYB6IUxv4dH/0vG4kGyCqvolP+KzmVjQfweY q9AnQbsX0j8+FUeSeYxnSOkxb1YYOgL5uDV9UG2VEsrxvdgmbz4k6G/hqjik9AZNbr0WEw ACANKXA5qKAXJ6rg== Received: from localhost.localdomain (localhost [127.0.0.1]) by rockpro64.cyberdimension.org (OpenSMTPD) with ESMTP id 73c5ffda; Sun, 27 Oct 2024 18:13:06 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Sun, 27 Oct 2024 19:12:46 +0100 Message-ID: <20241027181255.4680-1-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2001:678:938:3ff::36; envelope-from=GNUtoo@cyberdimension.org; helo=rockpro64.cyberdimension.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The vendor/golang.org/x/net dependency was kept because removing it redults in a compilation failure: %exception #<&invoke-error program: "go" arguments: ("install" "-v" "-x" "-ldflags=-s -w" "-trimpath" "github.com/42wim/matterbridge") exit-status: 1 term-signal: #f stop-signal: #f> * gnu/packages/messaging.scm (matterbridge) [source]: Add snippet removing the unbundled dependencies. [arguments]: Add new unbundled dependencies. Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: I67afeff8721833d34a54fd52684a4acbcbcaf179 --- gnu/packages/messaging.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c482cd469e..86f6ff0e04 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -3302,6 +3302,19 @@ (define-public matterbridge (url "https://github.com/42wim/matterbridge") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet '(for-each delete-file-recursively + ;; TODO: unbundle the rest as well + '("vendor/golang.org/x/crypto" + "vendor/golang.org/x/image" + "vendor/golang.org/x/mod" + "vendor/golang.org/x/oauth2" + "vendor/golang.org/x/sys" + "vendor/golang.org/x/term" + "vendor/golang.org/x/text" + "vendor/golang.org/x/time" + "vendor/golang.org/x/tools"))) + (sha256 (base32 "0939fiy7z53izznfhlr7c6vaskbmkbj3ncb09fzx5dmz9cjngy80")))) @@ -3309,6 +3322,15 @@ (define-public matterbridge (arguments (list #:import-path "github.com/42wim/matterbridge")) + (inputs (list go-golang-org-x-crypto + go-golang-org-x-image + go-golang-org-x-mod + go-golang-org-x-oauth2 + go-golang-org-x-sys + go-golang-org-x-term + go-golang-org-x-text + go-golang-org-x-time + go-golang-org-x-tools)) (synopsis "Bridge together various messaging networks and protocols") (description "Relays messages between different channels from various