From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id WFE4CgicKmfGYgAA62LTzQ:P1 (envelope-from ) for ; Tue, 05 Nov 2024 22:28:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id WFE4CgicKmfGYgAA62LTzQ (envelope-from ) for ; Tue, 05 Nov 2024 23:28:24 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=DgZNOn2N; dkim=fail ("headers rsa verify failed") header.d=cyberdimension.org header.s=dkim header.b=NezDBLPF; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1730845703; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=tCgAT32AdWOrbcwOTi9yzan4P+/h1vuDGwpuU3ujPFg=; b=GhtA1XDAX8AzYnhDrKtw7wYZvVSwfa2wxYOCcgBRfsz52wOsQVzL8QyEAuBN0mB2HctAJ+ 6vZ84/Uzw9089EcK0l/QhDwEP0lL60aD8IlGxZ30zRBHal3GjQiXO57IUU+mIMEvqWKfQn 3lFf0bMAyqgpCZdgrbX3UidHtci89jMJ+qX7eM+3xqKwYTLF9A9qgyiQAyHjo/YOwvMyA2 BL68HfwmUJZFnDauCNNVWQWZG+R2IuAOlfigag5jfovBpLlyT3XGSuRNIXRvuLrgjCM+L9 YrLv1wwvKajSk2iPse8iRpDtqnyEFmQrpPiWJth6t+D5h3eebPzoMNdptARCqA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1730845703; a=rsa-sha256; cv=none; b=JGOY2RBybd9qQjXQm08yIMyiVclQozHl2N8nkW3nJItwfwbc+3oAOl88gEkVLqzOIIZDGt u5McPebU4OcSC1mSew2p+LeCSIRYmJ8MlEMX4Iw297D6ilEaA3I7RKT/X59oIQORxSvNqF YitXned03nWLjNNVdGTCCbvvsGWfLEo9Obm4dMXzqdUU9zkmd6NKBqvviYMjO1kkqU5NZ4 xaczG4Cp5WzC/g8rmWNBN56VTA9LwRgmixRGuULE78tXHFee3ru94y85YkAOUc5H8dTKul NI90k9afvWH8bc6NAvbUEdYN7winpXXzL5ARONZpD23iB1WS3cXyDcR8eMOj+g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=DgZNOn2N; dkim=fail ("headers rsa verify failed") header.d=cyberdimension.org header.s=dkim header.b=NezDBLPF; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 244438748B for ; Tue, 05 Nov 2024 23:28:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8S1t-0004V0-Rs; Tue, 05 Nov 2024 17:28:05 -0500 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 1t8S1q-0004UF-RU for guix-patches@gnu.org; Tue, 05 Nov 2024 17:28:03 -0500 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 1t8S1q-0000bi-Ie for guix-patches@gnu.org; Tue, 05 Nov 2024 17:28:02 -0500 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:In-Reply-To:References:Subject; bh=tCgAT32AdWOrbcwOTi9yzan4P+/h1vuDGwpuU3ujPFg=; b=DgZNOn2NUGUOgLCcNMX60CKZsOuLHQddAtFeZiYpP8GeqzG+28LmoxYQJ171NS+O9s5P+nt+jW6ppxYbdMmUlyLMgUfiyBgeWWiGcQXycXqkOOpp6xHcLCaXKvzvd9fENgnsDxl8iGm2Exo+sfvjTNqoNJW5edVpgP929bkMFVVEby02PHTu4lnWuCLzNbZk14FHmvbxHX1UwmclKBqsPvy6xr1LQ0PCptIKj5FpDC0u+hAxZ79DvpiAv8F2ZYJrW6h5UwsEXOvnIii8FWr8VgdqWONOfvtjtwfSk+JTetAnbI4/07y7jmCeBLi4QSwSKOa0WWPW6dvCQIWJU2Uiww==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t8S1p-0002Ct-So for guix-patches@gnu.org; Tue, 05 Nov 2024 17:28:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74049] [PATCH v2] gnu: matterbridge: Unbundle most golang.org dependencies. References: <20241027181255.4680-1-GNUtoo@cyberdimension.org> In-Reply-To: <20241027181255.4680-1-GNUtoo@cyberdimension.org> Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Nov 2024 22:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74049 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74049@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli Received: via spool by 74049-submit@debbugs.gnu.org id=B74049.17308456688463 (code B ref 74049); Tue, 05 Nov 2024 22:28:01 +0000 Received: (at 74049) by debbugs.gnu.org; 5 Nov 2024 22:27:48 +0000 Received: from localhost ([127.0.0.1]:38267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8S1b-0002CQ-9a for submit@debbugs.gnu.org; Tue, 05 Nov 2024 17:27:48 -0500 Received: from cyberdimension.org ([79.143.250.36]:58822 helo=rockpro64.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8S1X-0002CF-Sh for 74049@debbugs.gnu.org; Tue, 05 Nov 2024 17:27:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=BoPtKn/3PI9+x1T N2bDIN3o+sjjtWKlWYGdA++PhEEc=; h=date:subject:cc:to:from; d=cyberdimension.org; b=NezDBLPF1JNN2JT3k1FDpdiZ7X2z04LuqexsGvtiqdwKsc WkjvU9PpS5BV/7iQVVfqBWUv4ejhtZBOainVkQ/Oo/lZ0edU/a8lReGswpqPEMXKSmaZc2 b6Z36R16rPssKdI1YFnEGPzUDSHv+sdJOGS5DXq5cmrsFkraXrUwnw2B83lUzl+3CR+QlP Y4bdjlBRaVivrNiANa3qoSzFRQbM361BPbstTLG+xuhHPVh8/0/FeLvOMhrsvf7b1HAOug R79KpGy0fX+79nyq72IZ7g6gkIIC23/s7wXcPekzAqvKBCkvLqtuSSpJ0rgBP21SuYcqAt 7xsWChlfjtscmUBQ== Received: from localhost.localdomain (localhost [127.0.0.1]) by rockpro64.cyberdimension.org (OpenSMTPD) with ESMTP id 93839646; Tue, 5 Nov 2024 22:27:39 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Tue, 5 Nov 2024 23:27:36 +0100 Message-ID: <20241105222737.12926-1-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.74 X-Spam-Score: -3.74 X-Migadu-Queue-Id: 244438748B X-Migadu-Scanner: mx13.migadu.com X-TUID: jaMxw+ctM3on The vendor/golang.org/x/net and vendor/github.com/russross/blackfriday dependencies were kept because removing any of them results 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 --- ChangeLog v1->v2: * Updated copyrights in messaging.scm. * Unbundled all I could with the existing Guix packages and the commit message was updated accordingly. * Added comments to group the dependencies together as there are lots of dependencies. --- gnu/packages/messaging.scm | 140 ++++++++++++++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c482cd469e..f2d7dd90fb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2020, 2021 Robert Karszniewicz ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Maxime Devos -;;; Copyright © 2021, 2023 Denis 'GNUtoo' Carikli +;;; Copyright © 2021, 2023-2024 Denis 'GNUtoo' Carikli ;;; Copyright © 2021, 2024 Vinicius Monego ;;; Copyright © 2021 jgart ;;; Copyright © 2022 Aleksandr Vityazev @@ -96,6 +96,9 @@ (define-module (gnu packages messaging) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) + #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-compression) + #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) #:use-module (gnu packages gperf) @@ -3302,6 +3305,69 @@ (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 + '(;; golang.org + "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" + ;; google.golang.org + "vendor/google.golang.org/protobuf/" + ;; gopkg.in + "vendor/gopkg.in/ini.v1" + "vendor/gopkg.in/yaml.v2" + "vendor/gopkg.in/yaml.v3" + "vendor/gopkg.in/natefinch" + ;; filippo.io + "vendor/filippo.io" + ;; uber.org + "vendor/go.uber.org/atomic" + "vendor/go.uber.org/multierr" + "vendor/go.uber.org/zap" + ;; github.com + "vendor/github.com/blang" + "vendor/github.com/d5" + "vendor/github.com/davecgh" + "vendor/github.com/dustin" + "vendor/github.com/vmihailenco/tagparser" + "vendor/github.com/francoispqt" + "vendor/github.com/fsnotify" + "vendor/github.com/go-asn1-ber" + "vendor/github.com/golang" + "vendor/github.com/golang-jwt" + "vendor/github.com/google/uuid" + "vendor/github.com/gorilla/websocket" + "vendor/github.com/hashicorp" + "vendor/github.com/json-iterator" + "vendor/github.com/klauspost" + "vendor/github.com/jpillora" + "vendor/github.com/kballard" + "vendor/github.com/magiconair" + "vendor/github.com/mattn/go-colorable" + "vendor/github.com/mattn/go-isatty" + "vendor/github.com/mattn/go-runewidth" + "vendor/github.com/minio/sha256-simd" + "vendor/github.com/mitchellh" + "vendor/github.com/modern-go" + "vendor/github.com/opentracing" + "vendor/github.com/pelletier" + "vendor/github.com/pkg" + "vendor/github.com/rivo" + "vendor/github.com/sirupsen" + "vendor/github.com/skip2" + "vendor/github.com/spf13" + "vendor/github.com/stretchr" + "vendor/github.com/subosito" + "vendor/github.com/valyala/bytebufferpool" + "vendor/github.com/pmezard" + "vendor/github.com/mgutz/ansi"))) (sha256 (base32 "0939fiy7z53izznfhlr7c6vaskbmkbj3ncb09fzx5dmz9cjngy80")))) @@ -3309,6 +3375,78 @@ (define-public matterbridge (arguments (list #:import-path "github.com/42wim/matterbridge")) + (inputs (list + ;; golang.org + 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 + ;; google.golang.org + go-google-golang-org-protobuf + ;; gopkg.in + go-gopkg-in-ini-v1 + go-gopkg-in-yaml-v2 + go-gopkg-in-yaml-v3 + go-gopkg-in-natefinch-lumberjack.v2 + ;; filippo.io + go-filippo-io-edwards25519 + ;; uber.org + go-go-uber-org-atomic + go-go-uber-org-multierr + go-go-uber-org-zap + ;; github.com + go-github-com-blang-semver + go-github-com-d5-tengo-v2 + go-github-com-davecgh-go-spew + go-github-com-dustin-go-humanize + go-github-com-vmihailenco-tagparser + go-github-com-francoispqt-gojay + go-github-com-fsnotify-fsnotify + go-github-com-go-asn1-ber-asn1-ber + go-github-com-golang-protobuf + go-github-com-golang-jwt-jwt + go-github-com-google-uuid + go-github-com-gorilla-websocket + go-github-com-hashicorp-hcl + go-github-com-hashicorp-errwrap + go-github-com-hashicorp-golang-lru + go-github-com-hashicorp-go-multierror + go-github-com-json-iterator-go + go-github-com-klauspost-cpuid-v2 + go-github-com-klauspost-compress + go-github-com-jpillora-backoff + go-github-com-kballard-go-shellquote + go-github-com-magiconair-properties + go-github-com-mattn-go-colorable + go-github-com-mattn-go-isatty + go-github-com-mattn-go-runewidth + go-github-com-minio-sha256-simd + go-github-com-mitchellh-go-homedir + go-github-com-mitchellh-mapstructure + go-github-com-modern-go-reflect2 + go-github-com-modern-go-concurrent + go-github-com-opentracing-opentracing-go + go-github-com-pelletier-go-toml + go-github-com-pelletier-go-toml-v2 + go-github-com-pkg-errors + go-github-com-rivo-uniseg + go-github-com-sirupsen-logrus + go-github-com-skip2-go-qrcode + go-github-com-spf13-pflag + go-github-com-spf13-jwalterweatherman + go-github-com-spf13-cast + go-github-com-spf13-afero + go-github-com-spf13-viper + go-github-com-stretchr-testify + go-github-com-subosito-gotenv + go-github-com-valyala-bytebufferpool + go-github-com-pmezard-go-difflib + go-github-com-mgutz-ansi)) (synopsis "Bridge together various messaging networks and protocols") (description "Relays messages between different channels from various base-commit: 78ffa637313f61a4fec06e5f1e41595f0e79b9eb -- 2.46.0