From unknown Tue Sep 09 22:28:45 2025 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.4 (-) 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: -2.4 (--) 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 -- 2.46.0 From unknown Tue Sep 09 22:28:45 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74049] [PATCH v1] 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: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Oct 2024 20:28:02 +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.17300608723554 (code B ref 74049); Sun, 27 Oct 2024 20:28:02 +0000 Received: (at 74049) by debbugs.gnu.org; 27 Oct 2024 20:27:52 +0000 Received: from localhost ([127.0.0.1]:46490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t59rb-0000vG-Ro for submit@debbugs.gnu.org; Sun, 27 Oct 2024 16:27:52 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:54278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t59rY-0000ux-Ij for 74049@debbugs.gnu.org; Sun, 27 Oct 2024 16:27:49 -0400 Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-37d49a7207cso2682337f8f.0 for <74049@debbugs.gnu.org>; Sun, 27 Oct 2024 13:27:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730060767; x=1730665567; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=XnSRW4HLqyN/KsFgR04/OZxLS2voKtuXlc76UiYcix8=; b=CcNGWX1W+GvP9I9ThxnXjEqz1kHOTVpvdFvH7APJ0vDr9m7O5na+DhgpJ9DHWjdNSO sjOYegk3SNGirFNhoAcVy6QNZspyoMmoxdG9g9kNIlW8np1Jr/EPp24ie5t/D2+e1PcH +58X+1ytbzM9KHUIWxWLDhMYvCibEHOKe3U9WcfVhGlQRM25izZd/YjOYVh1SbS7n32b 0Z02b5PCnymC31GbiZWX18BHtX4Xcsz9QmsQH4Vh2p9jutF7yHy8X04w4OEYasb4iA3g 3ZljMBULw59LCm5sR2t+247ZqijksARE/4Mh2KSJhLcslI1upzxmOTs9TU69yVgt1oMI wyJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730060767; x=1730665567; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=XnSRW4HLqyN/KsFgR04/OZxLS2voKtuXlc76UiYcix8=; b=HtsXnod3DG9mSN8NY2BBjN7Ag+e9UeWNe3E/qHyWJBnEKtMVpzY4GuLuWNONAxmbEh NMmV434Kpb/Btqt3WhWfYR6G7npcV/SmxuwgMgCoA3WIMETyFOSHSI2O+8N2TL/VDQaH aKgqeOCmtv4vYhtNv2RmTigF9GzGGBLvs79+de9msHVLbbLxMwCncC0DOyQ2rl5HjEED TZ5rsoI5RM949TiKGXkE0RhliznhCm6Q2UMw+Zdh1uKXBdH4uT4hccGbBHEh69+iDmDg xsRwg5upCgOknvXChSVpQjdki7jjmXk4QCcpyOJNtnFLhc9zDFkhWSNx+0SV5+epjuxo gG8w== X-Gm-Message-State: AOJu0YwF9KjT0kxVlLdkzEf2M6YmNJfqYqKdwUD2K9dgBanBIBE+Zij/ gPIfY49jkyh7i3epJWvFC0Q9gHhGPNbzH3G21QvZHH0RsMyLfBlO X-Google-Smtp-Source: AGHT+IFOKJJ5yLfGNUzqBEU13p/RavdNS56LLBLlRp9VXoUj9nqVUibL+XIpmk54BhUrBrPD/fDw0A== X-Received: by 2002:a05:6000:10a:b0:374:ca16:e09b with SMTP id ffacd0b85a97d-380610f448amr4439645f8f.9.1730060767036; Sun, 27 Oct 2024 13:26:07 -0700 (PDT) Received: from guxtil (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38058b70bcdsm7613261f8f.82.2024.10.27.13.26.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 13:26:06 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 27 Oct 2024 20:26:03 +0000 Message-ID: <87iktduwbo.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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 (-) --=-=-= Content-Type: text/plain Hi, Thanks for the initiation of unbundeling process for materbridge! A general comments for Golang packages which is just final binary, you may apply "#:install-source? #f" parameter which mean do not place source of the project into store and just move produced binary. Also for the final binary all build inputs may be placed to "native-inputs" they will never be used elsewhere after the install phase. While you are keen to unbundle let's pick up as many as we can. You may also add some other inputs which are available already: - filippo.io/edwards25519 - go.uber.org/multierr - gopkg.in/ini.v1 - gopkg.in/natefinch/lumberjack.v2 - gopkg.in/natefinch/lumberjack.v2 - gopkg.in/yaml.v2 - gopkg.in/yaml.v3 - google.golang.org/protobuf - github.com/hashicorp ;; all of them are available - github.com/golang/protobuf - github.com/fatih/color - github.com/google/uuid - github.com/gorilla/websocket - github.com/pkg/errors Basically we targeting to have just the first level of dependentices in "native-inputs" as seen in . Please take a look if removing them from vendor and adding them to native-inputs still keeps the build green. Thanks for your time. -- Oleg --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmceodsACgkQdtcnv/Ys 0rWq+hAAySQPbH6Bg5Ua6ijazcJOVufuUqq3DTjjIxgMgNV/vUpVkU7ha6Jwsn8O MpCX5I/RFUudY1JQO+NiPg/MkGictP7T2lhwD/LnFMt5qqsV0KpRoSrHuK0jLJYI q9WA/i59AhRjn/LScAv5cZzXSE2RpIz7lpuaOSMwBibhedGBWPB9mnfYyMHIzqMV dylE9yh/GU6sTZgCTQmqPYB6aVudiLkIigGudplISnilczcXQj8yDNirblFtKext pF3/8LUG4OSQ+bsViqhNaXEMQdBjTKLzcKewZgnAE4BohQ02g2lrEmStNXohTtbt chVO1KBlyPUj5+5kYjLTuOQl2onzIL/zBKJTjmoCFRLVbUGMC+YIFL/bffuEsl55 dUcCsQu7id7ecCRD8n+7Bxqv12Yey1ufY6NZrJZMMvQ73WiZ2ygqUNpUsKCWTYuc u+58SGk7VPkfVX+nqcmN1tG3Izel+aGaK5CeVLgTUY2+xsbQG8FodHlrKSX0K011 CB82WBSIAiUCs37vXwUliPif/tcAbwzIw0nzbr1a0txeB+O0N5AVZ4iZSSSLiC3/ frUgdNzoGJW2bdOkHeEru8zA7CB2zErjyi5YxtWiHYFVEEJZkZv1g7h3BcplDbQv hv3rh00U+/lgI7UE6jdwcqKKpFcIU4hjysfmMZIP3NBsSKfjp9I= =Jc37 -----END PGP SIGNATURE----- --=-=-=-- From unknown Tue Sep 09 22:28:45 2025 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: Mon, 28 Oct 2024 13:17: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: Sharlatan Hellseher Cc: 74049@debbugs.gnu.org Received: via spool by 74049-submit@debbugs.gnu.org id=B74049.173012136330733 (code B ref 74049); Mon, 28 Oct 2024 13:17:01 +0000 Received: (at 74049) by debbugs.gnu.org; 28 Oct 2024 13:16:03 +0000 Received: from localhost ([127.0.0.1]:52920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5PbH-0007zc-2B for submit@debbugs.gnu.org; Mon, 28 Oct 2024 09:16:03 -0400 Received: from cyberdimension.org ([79.143.250.36]:41344 helo=rockpro64.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5PbD-0007z7-E4 for 74049@debbugs.gnu.org; Mon, 28 Oct 2024 09:16:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=h6+biB4EOrxoWf3 mQRgSayrGDNo6p6YnuuCHVEkoTV8=; h=references:in-reply-to:subject:cc:to: from:date; d=cyberdimension.org; b=P3nJyn/i1dKdi7OMMf2uX4UcvGEA9KKR4Tj WAQ6zfxUAkXDeCTGjsJwlLUSlr65h2PO4fvd2pdJm/HEqVgqcG0UNTRgmb8L9419VuIvQz VPyKtwtgoNPu8QtTX1SeB6rNq5r9/qi75u97uOoouRh2+lZGlUO+bLevbAMck7cFS9LshB xyOCkokEVJLBlDOWgFwq1n6q6uzWZtoOjlsodQoV7daKYJ0GljIBq88TUVzEIXNuW6h+ba 0sZFPjkZecd+PZkQ2rnrVF9TdahQCX2guHLi3ndJRpsJH6jM4GhpzinjpfrE8iB27ktPUq hVGpA+kxLevk4dVlEtl8HAZ/pQA== Received: from primarylaptop.localdomain (localhost [127.0.0.1]) by rockpro64.cyberdimension.org (OpenSMTPD) with ESMTP id 4bdeb902; Mon, 28 Oct 2024 13:15:18 +0000 (UTC) Date: Mon, 28 Oct 2024 14:00:01 +0100 From: Denis 'GNUtoo' Carikli Message-ID: <20241028140001.1d996969@primarylaptop.localdomain> In-Reply-To: <87iktduwbo.fsf@gmail.com> References: <87iktduwbo.fsf@gmail.com> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/mVHXOzM/sN//9tgH604Z0rU"; protocol="application/pgp-signature"; micalg=pgp-sha512 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 (-) --Sig_/mVHXOzM/sN//9tgH604Z0rU Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Sun, 27 Oct 2024 20:26:03 +0000 Sharlatan Hellseher wrote: > Thanks for the initiation of unbundeling process for materbridge! Thanks a lot for the review. > A general comments for Golang packages which is just final binary, you > may apply "#:install-source? #f" parameter which mean do not place > source of the project into store and just move produced binary. Thanks, I'll do that in a newer patch. > Also for the final binary all build inputs may be placed to > "native-inputs" they will never be used elsewhere after the install > phase. Right, I just copied a bit what was done in the example I followed, so that might need to be fixed as well. Using inputs didn't look right to me but it was done in this way so I assumed that there was a good reason for it (I tried unbundling long time ago and it didn't work at the time, but maybe I was just unlucky). > While you are keen to unbundle let's pick up as many as we can. You > may also add some other inputs which are available already: I was already unsure about the patch I sent. In the v2 should I do it all at once in a single patch or should I split the work across multiple patches? The advantage of the former is that it becomes easier to bisect issues. The downside is that if the granularity is too small, I fear that we'll end up with hundreds of patches.=20 So I also think it's a good idea to agree on how to make these changes before doing more and more patches. For instance you could validate one patch (without necessarily pushing it) so I could use that as a blueprint for the next ones and not have to redo all the work for so many patches. Here I picked something in between where I grouped the unbundling of dependencies by selecting something they had in common, but I've no idea if it's the right way to do it. Also note that I ran the resulting binary, but without feeding it a configuration. I'll do a more complete test later on as tests are quite expensive: I need to install Guix on the production server, update it, build the matterbridge package, and uninstall guix after that to reduce the attack surface. > - filippo.io/edwards25519 > - go.uber.org/multierr > - gopkg.in/ini.v1 > - gopkg.in/natefinch/lumberjack.v2 > - gopkg.in/natefinch/lumberjack.v2 > - gopkg.in/yaml.v2 > - gopkg.in/yaml.v3 > - google.golang.org/protobuf > - github.com/hashicorp ;; all of them are available > - github.com/golang/protobuf > - github.com/fatih/color > - github.com/google/uuid > - github.com/gorilla/websocket > - github.com/pkg/errors Thanks, I found some of them like the protobuf one but I didn't add them in my patch yet. > Basically we targeting to have just the first level of dependentices > in "native-inputs" as seen in > . OK, I didn't look at that yet, I just started looking at what was in vendor/ with a script and made a patch with the group that is closer to the language (golang). > Please take a look if removing them from vendor and adding them to > native-inputs still keeps the build green. Thanks for the additional list, I'll definitely do that. Denis. --Sig_/mVHXOzM/sN//9tgH604Z0rU Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEeC+d2+Nrp/PU3kkGX138wUF34mMFAmcfitEACgkQX138wUF3 4mODkw//eevg70/gkJxGnTZUBwasdGgEc5U1s8d2eSVOEL+uWM2SurQXLCcpxxIM a143IVYVkX0MzSbdQuXcLxc5xzd2pNio/3uVOfZulLPX5BW0LielD+ktLkwPjNC4 E8G2HNFEWA9pHjsbpEr9OliFCq74EHDjF7sVrEZar5Q7QDs315pC66QGpkEc4wll 8ly4S1ws+nGu5OpAD9kHNezUlPt9m+qO5qEBBT0+KbfC249owPP8jUXJGxjGW/mp yhbeZ0ecuuDeZLTQ6rfPPEN5Jj4OyUDcmeb9oWiD0awKRof5YzmXomb1Qdw+CRgO iNjLw4QYT+oDb/cyFlkJtrXc2iEWvoDBqgIqdivHU4Pv6plQbUoGw4uCKKVu2a29 FaYO2LnRLpJzCyTZpglKQXIQc4au7IG8VYJLyoGXTmvfbn0Ni2cs4CQL8kgUjmaL b4bLKHeV3RIFhry7zs4P0IcKyHnzCw1M3SKP1h5puzQJX0XwecYTQEK2pdpy6p3i 7zptp7dBtUXFz+kGLlZ3e2y2tsq8dNHH6LT0SMzuNvA5PZSyJYkzEN82UqieKa6Q IRkWphyY8BQpcFemXyp1/uueO5LFvX6GCsp85hT1s+LYBRL9gIeeD/K47WHWwe/C hCeW/CcdCIWoDpYEgeG5FwcqsO7CsfuUyPndQG2vhTyWl+dUTKM= =dxUf -----END PGP SIGNATURE----- --Sig_/mVHXOzM/sN//9tgH604Z0rU-- From unknown Tue Sep 09 22:28:45 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74049] [PATCH v1] 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: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Oct 2024 21:58:02 +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.173015266727509 (code B ref 74049); Mon, 28 Oct 2024 21:58:02 +0000 Received: (at 74049) by debbugs.gnu.org; 28 Oct 2024 21:57:47 +0000 Received: from localhost ([127.0.0.1]:54968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5XkA-00079c-VX for submit@debbugs.gnu.org; Mon, 28 Oct 2024 17:57:47 -0400 Received: from mail-wm1-f52.google.com ([209.85.128.52]:60876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5Xk9-00079N-Gp for 74049@debbugs.gnu.org; Mon, 28 Oct 2024 17:57:46 -0400 Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-431ac30d379so11686845e9.1 for <74049@debbugs.gnu.org>; Mon, 28 Oct 2024 14:57:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730152600; x=1730757400; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=OUDY2L5ZVpflGNRByRWqD2IbhVJpg5PwlcZmJZX+dj0=; b=D8HPXsOBz8pTlBmoUk1siyAbWkW2X1aNhrde7FN0oBUo7/pfpXO+M9zHkshnE/Shx/ VIJeOgF0aNPxVaw2P+LGSxVP3/l082uHVXUjyCJelB+8g6eyLcAkV8Z5vmYgVRsrl2Cy E2O7xtY4PdYmu7pxze3UnXy2zIgCRnIFcUzrr4o9/MgE/mhFE7eR/Ia8EgZZX0yGmJEP nSU/lYzHH/aAiYCInsyeaKTb91DsCJstUo1xo/KCECtY66h+ss7JJYSsnubzdSd+L02j D993Qqump4Vr/uu3pStyuDxNhc5v+yp8o42VEcmozcV1YcSm8xyYEnyMR0D5tMUD+mMl VB4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730152600; x=1730757400; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=OUDY2L5ZVpflGNRByRWqD2IbhVJpg5PwlcZmJZX+dj0=; b=PvLVYEyLlx42Bg21XWyKgdiTgp3vaiF1wJ5aaQQ2yhh42RmWGu/f3AJmOnlyng7T+P 9xBPz9cmixtXxqihTg3uOQ1UgmL2v/QKr8VMCxb2+r8N7rGlzl7AiJXX6YSfwqEj4fyO 42CNFztGW7Xvnmc7DbwbjZ0B/QZ5vjfAWznwUq065dC2wrDMcoepJRlXtXPcTLtBGHy6 I34oyTUaWECkJLnrj3PH7qDBDA3gZgG/lI0P6vfJpBf6FE/8ho7byg+4vYouuSwRpGrm AyXyJrsKlxQRh/OZwSOGy+umkE+zBsjq6fwZuJHliTghlFHYRCeN/eO8CEphxymMhsZp 19cQ== X-Gm-Message-State: AOJu0YzO2lCB454s/WnNnTfsHxZQ0WtEJaF9V4asZNxuf9FKifWb/4tJ Tvt41RJOqRquHsyhGI/+TecPYNHfyU8knnvXhzpXgjBX7eMCHvP57Jj7CI+T X-Google-Smtp-Source: AGHT+IHTNtOkUxTv2/oRgJ/K1GSodKQS4YD8GRaZVojIsLWBC8r+TsBFZZa4WLJ2lkiksu9Xz3ZhUQ== X-Received: by 2002:a05:600c:4fc5:b0:42f:75cd:2566 with SMTP id 5b1f17b1804b1-4319ac77208mr85148455e9.2.1730152599499; Mon, 28 Oct 2024 14:56:39 -0700 (PDT) Received: from guxtil (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4318b567868sm154744945e9.24.2024.10.28.14.56.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 14:56:38 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 28 Oct 2024 21:56:36 +0000 Message-ID: <87frofvqln.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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 (-) --=-=-= Content-Type: text/plain Hi Denis, > I was already unsure about the patch I sent. In the v2 should I do it > all at once in a single patch or should I split the work across multiple > patches? I would suggest to think about the flow, let's say: * Unbundle as many as possible first, and make it as a single patch (which should pass build, test, lint etc.) * Review the massive dependence tree and split it in some sort of logical blocks/future series which should be self contain and build individually or when series applied as a whole. * Start unwind it slowly let's say by 8-12 packages per series, making sure each series may be apply directly on current master and may be built. We may reduce amount of noise to bug-tracker and keep on track with unbundle process without too much stress and time requiring to review 100++ series To keep you in a peas of mind - you are not alone in that hard work and your efforts will be enforced by others who updates/unbunle Golang packages the more we have the less effort we need to apply to unbunle as some of the package may be reused. In short, keep eye on current master and go-team branches and do rebate/pul often. I'm waiting for my turne to merge go-team and will continue on the work with unbundling kubo which will bring about 300 packages. Some neat-pick give a try to use "guix import go --recursive " on go-team branch which has much better performance than available in current master. -- Thanks, Oleg --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmcgCJQACgkQdtcnv/Ys 0rWD8RAAgCzHilrgp6IFo82qJviaKMeQrmEiXPt/LY8dLUJ7Du+s0uZ2+E+R6xOZ GGoUSxC+kJkl4gCQu/grrrEmah/XPTRxyTBitvaNc46+Y4Pe2VN25MA9PAhjEjc+ EutDcNLNJ+pbjAgjGoNACNdiIhdzbU5t+6bi7Jz2MKn9dfU9dM95mLUAQ87Sw0XH f5yQSSe3nJYKiBsTJEK1fCVbOBFLo0+mVp7Pq06RlyoQ4m0lTwUi+mRmz8ERw4Q3 fVazukVmIXvVHO/lOSkmNZKo4dCNrmCTlIT/UFbB5BcYbtQwWwV53Cn4AkuBeDZZ 47UDjxMJFQXqehXtnY+QRDISBwCpfcZ0uCs72orWPngnzm9jvC0x0G2TvWbtSRbN gYM0EvAhq64SczRUOjqT4dvhfQU4DfYlamcpB4jNPex5rvFFF3/AAx8uEWyFCwJd T9z3K5DzPN33B1uONqbkgQNz6d59HGgEsnE9+wAwye1P6DHYn9C0zQV6zA+ebuIF pDCPWfUZz2L7wRozWpRpb52Aw3W4HpL3AN+RdmaTQtVvycbJ0tz5jccI8JlTfsVB R+frJLWGT2rsxRKVxqgTBiHT/AqFJv2e/kTgYTJdG1qwMGnphMRiIonwFP3npVuc TjESplVKHOMqZLC8TP7nYL4SDqj0xqiQ01pTsLMOOKwLHXKLKKA= =27XJ -----END PGP SIGNATURE----- --=-=-=-- From unknown Tue Sep 09 22:28:45 2025 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-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 (-) 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 From unknown Tue Sep 09 22:28:45 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: Denis 'GNUtoo' Carikli Subject: bug#74049: closed ([PATCH v1] gnu: matterbridge: Unbundle most golang.org dependencies.) Message-ID: References: <874j43juwj.fsf@gmail.com> <20241027181255.4680-1-GNUtoo@cyberdimension.org> X-Gnu-PR-Message: they-closed 74049 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74049@debbugs.gnu.org Date: Tue, 19 Nov 2024 12:02:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1732017722-7764-1" This is a multi-part message in MIME format... ------------=_1732017722-7764-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #74049: [PATCH v1] gnu: matterbridge: Unbundle most golang.org dependencies. 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 74049@debbugs.gnu.org. --=20 74049: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74049 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1732017722-7764-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 74049-done) by debbugs.gnu.org; 19 Nov 2024 12:01:23 +0000 Received: from localhost ([127.0.0.1]:41356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDMv4-00020I-OG for submit@debbugs.gnu.org; Tue, 19 Nov 2024 07:01:23 -0500 Received: from mail-wr1-f54.google.com ([209.85.221.54]:58870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDMv2-000205-Gs for 74049-done@debbugs.gnu.org; Tue, 19 Nov 2024 07:01:21 -0500 Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-382442b7d9aso752737f8f.1 for <74049-done@debbugs.gnu.org>; Tue, 19 Nov 2024 04:01:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732017614; x=1732622414; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=XjEDobQOhzsHoMYfjV23IScbDKXreuJXFJLBnErgs8w=; b=Mt2LHMakKiKC4zsf7bHTbQkeHa9Yhi+lVVXXfjKNjFncyEUYaiwC4i6Y0kyZ1mDMoF fxslVSKydFO0FbVHvJjLby/8CaWrSpcuB/yn1xjisvQAnPwJpKOVOBhNyKYHJfXks61w Tvqh7a1En2kd1H412IhqI2njm0hksx4x8KQsxR2CUb5oWqHoWJEuEhzA5IJigF1SswCj nIQm9lPafpS43WQrSjbfKn2EOpvYFK3mppwy8r8uZH5x+cgbNmREN1STqo9fo/bRvjep R509f9mODajrng/8Nn+7YtLyBHHhCbtFuRd6IJbXulMyEqpIRTtBN+tO1Pe8QuhFY4X0 6Ugw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732017614; x=1732622414; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=XjEDobQOhzsHoMYfjV23IScbDKXreuJXFJLBnErgs8w=; b=Fs7sScJOSeSGwuEsLeQWISLP90WOGQeQdp+SXJJuSOCZ2p71nnnqRyHE6TN0lg+lZ3 crOzseuyh8oteU69BeMoqNXhzaCywfhvnCuFaIlg8MGRz44V4Uh2wdFlN3QC2bOdh1NV xJQCVQK6/2LkH0uRuO0IDUT1gGsSK8mFdseN/WxwSBPz3JWDnj/UN3xzAhk9U3smojAE r/oQklK5Ta4Gpzy4Utwzo7/nI6fnEHF/V5eniULv8yvhCvPI6Cg+WfOx306p6hL0/VWI wxIwRqM1DmdmRPFP+aBq28bOB8ouHcx40+ANOc90sxPqZKfj9IFj2qP8x1GLq95McfaJ na6Q== X-Gm-Message-State: AOJu0YxklfULgaRGnw/QgvdicEBLEW5Yjv1nqrnHs6nWIJI63665qeND BVPzBmORbRINRS98uQO9+mJskpjhKFWuPr6WdvX5BuPNqFVGyI2TNJcYHki/mPI= X-Google-Smtp-Source: AGHT+IG33cgVs1Xu8AaTQoDJ0PteZrPki7jtoUie8K6Rn7RWrrqg6hrz0Z/wOp98ZZdjSYt8yAwuhw== X-Received: by 2002:a05:6000:402c:b0:37d:50e1:b3d3 with SMTP id ffacd0b85a97d-38225905999mr11461937f8f.20.1732017614335; Tue, 19 Nov 2024 04:00:14 -0800 (PST) Received: from guxtil (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-382406adeedsm8019444f8f.109.2024.11.19.04.00.13 for <74049-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2024 04:00:13 -0800 (PST) From: Sharlatan Hellseher To: 74049-done@debbugs.gnu.org Subject: [PATCH v1] gnu: matterbridge: Unbundle most golang.org dependencies. Date: Tue, 19 Nov 2024 12:00:12 +0000 Message-ID: <874j43juwj.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74049-done 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 (-) --=-=-= Content-Type: text/plain Hi, I've adjusted the patch a litle by adding embeded file search for "golang.org/x/net" and fix build with "github.com/russross/blackfriday". Pushed as cdf968ae86..1dd7a47b65 to master. -- Oleg --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmc8fcwACgkQdtcnv/Ys 0rXXtRAAmIwdlZ3UZJF6JvR9OPsm+mW6KeklJrnpt+dZQWXgZCD3Ik7N5TFK5VmW gP3II/IWfw8m7HG9B3aJXOfFYIBKqqzY7D68RKqjR4gaGXzxc6CoFKyUh4V6N8Fm uWyckKwVAgEUQs9I9HzglKO0EeUYaf90K5aUFo+/vjKs1P/dT8Q3tict/2KTSj+/ L1Pb8L48fpYV0xNO9mlpkSKb+gudjzYfwrqYh4BPwq8xZZf8gIxW6/NaWTYNIE/U 3Br99eTMa8EU8mLUJWbMdUPEPKHG7rTZh+6l2T/sZhL8Bi/gpYM4GEf2vMKZYGiN olRB1u721JRjTJpjo5+6r64PtPyl3/6K4nx4CFE8E/lyYSJF7yV9TKeJjXEnaHG/ BVfqJUx/grSPC06Ef5JtG6j9llK1FBvKYJkHxlOFiy7o8q61IIapmfd0m1lLfuWN uf71tHfsgJZp+pW9DyimSyUNxCdPMMp4//YyluI9rnjQwUZ/cqbbEIuzo8T0Kk4G o6i206v43dM/EhEyb8Ghuq1OE9GtNregBO5MJMqvVZA3T8mkrtZX/GzvRB4PBqVk FuZFcITAueeJdtI503XuUxxjy8Aqb1Gbrc5uX7g0efoNuXGiQvEhveQI51mXuWPL qq94HQIkfq+IYRSZKCeZWTjQJ0PGalqMcDcvut69kLiDGgZeMYo= =WVtO -----END PGP SIGNATURE----- --=-=-=-- ------------=_1732017722-7764-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org, Sharlatan Hellseher Subject: [PATCH v1] gnu: matterbridge: Unbundle most golang.org dependencies. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Denis 'GNUtoo' Carikli 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: -2.4 (--) 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 -- 2.46.0 ------------=_1732017722-7764-1--