From patchwork Thu Jan 25 17:13:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 59397 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 75B5F27BBE9; Thu, 25 Jan 2024 17:14:27 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 9B1CE27BBE2 for ; Thu, 25 Jan 2024 17:14:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT3Iz-00069h-BX; Thu, 25 Jan 2024 12:14:21 -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 1rT3It-000651-Dq for guix-patches@gnu.org; Thu, 25 Jan 2024 12:14:17 -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 1rT3Ia-0002x5-FS for guix-patches@gnu.org; Thu, 25 Jan 2024 12:14:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rT3Ig-0003Rn-15; Thu, 25 Jan 2024 12:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65034] [PATCH v3 core-updates 1/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 17:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 65034@debbugs.gnu.org Cc: Hilton Chain , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 65034-submit@debbugs.gnu.org id=B65034.170620283313208 (code B ref 65034); Thu, 25 Jan 2024 17:14:01 +0000 Received: (at 65034) by debbugs.gnu.org; 25 Jan 2024 17:13:53 +0000 Received: from localhost ([127.0.0.1]:49101 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT3IW-0003Qy-Hm for submit@debbugs.gnu.org; Thu, 25 Jan 2024 12:13:52 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:54780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT3IT-0003Qj-P7 for 65034@debbugs.gnu.org; Thu, 25 Jan 2024 12:13:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706202787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PpHYV1Eye/YrrJiLjKsYRZs9rt72/NYHkDXhpVG6Tac=; b=aaks9Cu4uN42/T1wc2/RPoCSPuBkWju8EoMFKHk4YC4WtJvGzSoSk7JWZK/KudRcuBYRWC Njfxp2NUksKoanm0/pKh/OOSnw0+K6ctUZUrNHw+nFJkvVpjb83VARFu3xuV6dAxqzEj1r jo15d89kUtzM+il3/PR/P+5nvRwm5MRtSbmP3bj84pRVrsw2a3jgdrHgvQ+UVZplQDRkBB Z3AwKCT+ijlRkujIYZhBI08xBYEA1mr5RG0ZxoCMtpCouvcNvVHEhgwkE5Otvjfp75NA+Y Hf9Wr7eKEjBiyzAdTLQLWZM1nfRP81fKpZz/v7YNPCxlKw+521Sw53RxVLQy5w== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Fri, 26 Jan 2024 01:13:17 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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 * gnu/packages/golang.scm (go-google-golang-org-protobuf): Update to 1.31.0. [arguments]: Build Go packages and run tests. [propagated-inputs]: Remove go-github-com-golang-protobuf-proto. --- gnu/packages/golang.scm | 57 +++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 8 deletions(-) -- 2.41.0 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e7306a585c..cb08ddae19 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8260,7 +8260,7 @@ (define-public go-github-com-golang-protobuf-proto (define-public go-google-golang-org-protobuf (package (name "go-google-golang-org-protobuf") - (version "1.28.0") + (version "1.31.0") (source (origin (method git-fetch) (uri (git-reference @@ -8269,16 +8269,57 @@ (define-public go-google-golang-org-protobuf (file-name (git-file-name name version)) (sha256 (base32 - "1nzcc4qc00afi24nb7nlnwyzvvr6b8s8qdrn1sw085nygh2y2x8r")))) + "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0")))) (build-system go-build-system) (arguments (list #:import-path "google.golang.org/protobuf" - #:tests? #f ; source-only package - #:phases #~(modify-phases %standard-phases - ;; source-only package - (delete 'build)))) - (propagated-inputs (list go-github-com-google-go-cmp-cmp - go-github-com-golang-protobuf-proto)) + ;; XXX: Workaround for go-build-system's lack of Go modules support + #:phases + #~(let ((go-packages '("proto" + "encoding/protojson" + "encoding/prototext" + "encoding/protowire" + "reflect/protoreflect" + "reflect/protoregistry" + "reflect/protodesc" + "reflect/protopath" + "reflect/protorange" + "testing/protocmp" + "testing/protopack" + "testing/prototest" + "types/dynamicpb" + "types/known/anypb" + "types/known/timestamppb" + "types/known/durationpb" + "types/known/wrapperspb" + "types/known/structpb" + "types/known/fieldmaskpb" + "types/known/apipb" + "types/known/typepb" + "types/known/sourcecontextpb" + "types/known/emptypb" + "types/descriptorpb" + "types/pluginpb" + "compiler/protogen" + "cmd/protoc-gen-go"))) + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key import-path build-flags #:allow-other-keys) + (for-each + (lambda (pkg) + ((assoc-ref %standard-phases 'build) + #:import-path (format #f "~a/~a" import-path pkg) + #:build-flags build-flags)) + go-packages))) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (for-each + (lambda (pkg) + ((assoc-ref %standard-phases 'check) + #:tests? tests? + #:import-path (format #f "~a/~a" import-path pkg))) + go-packages))))))) + (propagated-inputs (list go-github-com-google-go-cmp-cmp)) (home-page "https://google.golang.org/protobuf") (synopsis "Go library for Protocol Buffers") (description From patchwork Thu Jan 25 17:13:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 59398 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 969D927BBEA; Thu, 25 Jan 2024 17:14:47 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 2BECD27BBE2 for ; Thu, 25 Jan 2024 17:14:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT3Ix-00068r-EQ; Thu, 25 Jan 2024 12:14:19 -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 1rT3It-00064z-Ar for guix-patches@gnu.org; Thu, 25 Jan 2024 12:14:17 -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 1rT3Ib-0002xA-MW for guix-patches@gnu.org; Thu, 25 Jan 2024 12:14:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rT3Ig-0003Rv-Fx; Thu, 25 Jan 2024 12:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65034] [PATCH v3 core-updates 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 17:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 65034@debbugs.gnu.org Cc: Hilton Chain , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 65034-submit@debbugs.gnu.org id=B65034.170620283713227 (code B ref 65034); Thu, 25 Jan 2024 17:14:02 +0000 Received: (at 65034) by debbugs.gnu.org; 25 Jan 2024 17:13:57 +0000 Received: from localhost ([127.0.0.1]:49104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT3Ia-0003RF-Tu for submit@debbugs.gnu.org; Thu, 25 Jan 2024 12:13:57 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:39646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT3IV-0003Qq-ID for 65034@debbugs.gnu.org; Thu, 25 Jan 2024 12:13:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706202789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=juO1ep5WRTYkNPDeToIEBqmjMqBUtXsCa4gu8PAIfVQ=; b=vQ04nc/N6oxrhgpNHe0IYw3wRj+Kq9sdGx4F8DL+6Ww68KPhLDdYyC2WeYe9pYdDjlbvId KnuzH3/an6HJciKf5iWrRdyHDngDkCZVpPi9nJVukZKVuehqG++IomK7TzodaJMeaF1+ig KuvDvyWNF2+onNCas+d14V1kq/pvyZCryNjgEzdmU7CZmo/QIz68TtirY5hoSFDFL8pYGY fCFXE5qZEuWgNjuR0D6OcTK2vfy91guGYWH9rXyUXNIyE9RvKLpBOTZZxdAbhpeMOyB1g0 f+AuiMJ/uOZ5JyIb+qYPqsmMJ6ervgRilh6cGwsO5gzLVJFlgneYhF8BsJooYw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Fri, 26 Jan 2024 01:13:18 +0800 Message-ID: <3c9a235e51d515dce1fc269a5c021a2bb65b1732.1706202176.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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 * gnu/packages/golang.scm (go-github-com-golang-protobuf-proto): Update to 1.5.3. [arguments]: Enable tests. [propagated-inputs]: Add go-google-golang-org-protobuf. --- gnu/packages/golang.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.41.0 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cb08ddae19..eaa2b7d305 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8235,7 +8235,7 @@ (define-public gotestsum (define-public go-github-com-golang-protobuf-proto (package (name "go-github-com-golang-protobuf-proto") - (version "1.3.1") + (version "1.5.3") (source (origin (method git-fetch) (uri (git-reference @@ -8244,13 +8244,13 @@ (define-public go-github-com-golang-protobuf-proto (file-name (git-file-name name version)) (sha256 (base32 - "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl")))) + "03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i")))) (build-system go-build-system) (arguments '(#:import-path "github.com/golang/protobuf/proto" - #:unpack-path "github.com/golang/protobuf" - ;; Requires unpackaged golang.org/x/sync/errgroup - #:tests? #f)) + #:unpack-path "github.com/golang/protobuf")) + (propagated-inputs + (list go-google-golang-org-protobuf)) (synopsis "Go support for Protocol Buffers") (description "This package provides Go support for the Protocol Buffers data serialization format.") From patchwork Thu Jan 25 17:13:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 59396 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 6D97327BBE9; Thu, 25 Jan 2024 17:14:24 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,TVD_SPACE_RATIO, URIBL_BLOCKED autolearn=no 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 4D81027BBE2 for ; Thu, 25 Jan 2024 17:14:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT3Iw-00068B-UN; Thu, 25 Jan 2024 12:14:18 -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 1rT3It-000652-GI for guix-patches@gnu.org; Thu, 25 Jan 2024 12:14:17 -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 1rT3Ib-0002x6-3Q for guix-patches@gnu.org; Thu, 25 Jan 2024 12:14:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rT3Ig-0003S2-UB; Thu, 25 Jan 2024 12:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65034] [PATCH v3 core-updates 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 17:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 65034@debbugs.gnu.org Cc: Hilton Chain , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 65034-submit@debbugs.gnu.org id=B65034.170620283813233 (code B ref 65034); Thu, 25 Jan 2024 17:14:02 +0000 Received: (at 65034) by debbugs.gnu.org; 25 Jan 2024 17:13:58 +0000 Received: from localhost ([127.0.0.1]:49106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT3Ib-0003RK-CK for submit@debbugs.gnu.org; Thu, 25 Jan 2024 12:13:57 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:39654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT3IX-0003R5-9o for 65034@debbugs.gnu.org; Thu, 25 Jan 2024 12:13:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706202790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fjdr3HpSEXcALnf5RxI53g5VO/XQUtwEb55p4bTJRaA=; b=ffamfST5v0u4B1AeZABmJWh+MkGxC/Z84RDlQZOOejueoun2jrYLnQySmvfGLp/tiGypfS BV/IFQmgN78I8qwy402DT8exZL2yhf67BL2v7pWBHA+8sSgEgkut08wt/Ic+0+iipBPj54 qDX/vYwfCjZxh/SoCv/uK+lwgSi69kCOST1DAx1m67hs3GAKBlr1yJUMBUWDX7Q0kU4Fvw iX7l+6bVM+aga7oigVwxrgoqKL3haWUh/yLimkVgmVYrmw26MMy3t33TQ6ypwQW+SaF7E2 9DSc04dIq/yMK14dzfLxp4jc3FS3oSlpTOnOls/77LRE3ttM+NvZO9cPyQAcFw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Fri, 26 Jan 2024 01:13:19 +0800 Message-ID: <6d1b2746c4dcf2646cedbea047071b731de0f0c6.1706202176.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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 * gnu/packages/golang.scm (go-github-com-golang-protobuf-proto): Rename to... (go-github-com-golang-protobuf): ... this. [arguments]<#:import-path>: Set to "github.com/golang/protobuf". <#:unpack-path>: Remove argument. <#:phases>: Build all Go packages and run tests for them. (go-github-com-quic-go-quic-go,go-github-com-prometheus-common) (go-github-com-prometheus-client-golang,go-github-com-onsi-gomega) [propagated-inputs]: Adjust accordingly. * gnu/packages/syncthing.scm (go-github-com-prometheus-client-model) (go-github-com-matttproud-golang-protobuf-extensions-pbutil) [propagated-inputs]: Likewise. Change-Id: I0efa2deaac2cb2bcd2c11f8791bdf320a56cf729 --- gnu/packages/golang.scm | 46 +++++++++++++++++++++++++++++++------- gnu/packages/syncthing.scm | 4 ++-- 2 files changed, 40 insertions(+), 10 deletions(-) -- 2.41.0 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index eaa2b7d305..b90b31e7ac 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7477,7 +7477,7 @@ (define-public go-github-com-quic-go-quic-go go-golang-org-x-crypto go-github-com-cheekybits-genny go-github-com-marten-seemann-chacha20 - go-github-com-golang-protobuf-proto + go-github-com-golang-protobuf go-golang-org-x-crypto go-golang-org-x-exp go-golang-org-x-net @@ -8232,9 +8232,9 @@ (define-public gotestsum (home-page "https://github.com/gotestyourself/gotestsum") (license license:asl2.0))) -(define-public go-github-com-golang-protobuf-proto +(define-public go-github-com-golang-protobuf (package - (name "go-github-com-golang-protobuf-proto") + (name "go-github-com-golang-protobuf") (version "1.5.3") (source (origin (method git-fetch) @@ -8247,8 +8247,38 @@ (define-public go-github-com-golang-protobuf-proto "03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/golang/protobuf/proto" - #:unpack-path "github.com/golang/protobuf")) + (list #:import-path "github.com/golang/protobuf" + ;; XXX: Workaround for go-build-system's lack of Go modules support + #:phases + #~(let ((go-packages '("proto" + "jsonpb" + "ptypes" + "ptypes/any" + "ptypes/empty" + "ptypes/timestamp" + "ptypes/duration" + "ptypes/wrappers" + "ptypes/struct" + "protoc-gen-go/descriptor" + "protoc-gen-go/plugin" + "protoc-gen-go"))) + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key import-path build-flags #:allow-other-keys) + (for-each + (lambda (pkg) + ((assoc-ref %standard-phases 'build) + #:import-path (format #f "~a/~a" import-path pkg) + #:build-flags build-flags)) + go-packages))) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (for-each + (lambda (pkg) + ((assoc-ref %standard-phases 'check) + #:tests? tests? + #:import-path (format #f "~a/~a" import-path pkg))) + go-packages))))))) (propagated-inputs (list go-google-golang-org-protobuf)) (synopsis "Go support for Protocol Buffers") @@ -9893,7 +9923,7 @@ (define-public go-github-com-prometheus-common ;; Source-only package (delete 'build)))) (propagated-inputs - (list go-github-com-golang-protobuf-proto + (list go-github-com-golang-protobuf go-github-com-matttproud-golang-protobuf-extensions-pbutil go-github-com-prometheus-client-model)) (synopsis "Prometheus metrics") @@ -9950,7 +9980,7 @@ (define-public go-github-com-prometheus-client-golang (delete 'build)))) (propagated-inputs (list go-github-com-beorn7-perks-quantile - go-github-com-golang-protobuf-proto + go-github-com-golang-protobuf go-github-com-prometheus-client-model go-github-com-prometheus-common go-github-com-prometheus-procfs @@ -12679,7 +12709,7 @@ (define-public go-github-com-onsi-gomega ;; Unless we disable the tests, we have a circular dependency on ;; ginkgo/v2. #:tests? #f)) - (propagated-inputs (list go-github-com-golang-protobuf-proto + (propagated-inputs (list go-github-com-golang-protobuf go-golang-org-x-net go-golang-org-x-sys go-golang-org-x-text diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index c18b70eb4b..bc0960d379 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -831,7 +831,7 @@ (define-public go-github-com-prometheus-client-model ;; Source-only package (delete 'build)))) (propagated-inputs - (list go-github-com-golang-protobuf-proto)) + (list go-github-com-golang-protobuf)) (synopsis "Data model artifacts for Prometheus") (description "This package provides data model artifacts for Prometheus.") (home-page "https://github.com/prometheus/client_model") @@ -859,7 +859,7 @@ (define-public go-github-com-matttproud-golang-protobuf-extensions-pbutil '(#:import-path "github.com/matttproud/golang_protobuf_extensions/pbutil" #:unpack-path "github.com/matttproud/golang_protobuf_extensions")) (propagated-inputs - (list go-github-com-golang-protobuf-proto)) + (list go-github-com-golang-protobuf)) (synopsis "Streaming Protocol Buffers in Go") (description "This package provides various Protocol Buffer extensions for the Go language, namely support for record length-delimited