From patchwork Thu Aug 3 08:47:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52465 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 41EBC27BBEB; Thu, 3 Aug 2023 09:49:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, 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 4D46B27BBE2 for ; Thu, 3 Aug 2023 09:49:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRU11-0006c7-3x; Thu, 03 Aug 2023 04:49:03 -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 1qRU10-0006bk-1f for guix-patches@gnu.org; Thu, 03 Aug 2023 04:49:02 -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 1qRU0z-00044p-Q9 for guix-patches@gnu.org; Thu, 03 Aug 2023 04:49:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qRU0z-00038Z-MS for guix-patches@gnu.org; Thu, 03 Aug 2023 04:49:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65034] [PATCH 1/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Aug 2023 08:49: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 To: 65034@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 65034-submit@debbugs.gnu.org id=B65034.169105248811791 (code B ref 65034); Thu, 03 Aug 2023 08:49:01 +0000 Received: (at 65034) by debbugs.gnu.org; 3 Aug 2023 08:48:08 +0000 Received: from localhost ([127.0.0.1]:50828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRU07-000344-HM for submit@debbugs.gnu.org; Thu, 03 Aug 2023 04:48:07 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:59562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRU05-00033k-Ua for 65034@debbugs.gnu.org; Thu, 03 Aug 2023 04:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691052481; 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=zaQzYk/rzKSqKQhEk3T3mJb4OWZ3BcqDWHrfn/GEZnU=; b=vefUf1OIkL8XL7YHieB4nl4Ijg74IP2jXgInjb+guDjQpBkdDH4pzybnAaui6GjKcW58pA La1LrUDiheJ97b0KjGTYpT4+fvaY5NR/q0TY/YpgEzWWYuPIhvJcH+Tz+9vSQdvUMw0C6b 22t88gkoERQ7UJunPSz0Eb6zJIphYFW7tnqzILImL4mR81IEYWOOHzK3eUJJ44nZJBQJqq HFTfj5/AEKRwM9KUgBYR/JHWIIkVNzXVm0jiftChGR0R8dtWx9Eih8thMrBHIhCpMLhhqf Mo99sRC/UfY95f88ixrt41b3doEg9g+9NGRzCTS9rCJQdY8ERpTPyUllaTIHVA== Date: Thu, 3 Aug 2023 16:47:35 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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 | 56 +++++++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 8 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ea6aadbe80..51bc717064 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8433,7 +8433,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 @@ -8442,16 +8442,56 @@ (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)) + #: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 Aug 3 08:47:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52467 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 7EF0227BBEA; Thu, 3 Aug 2023 09:49:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, 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 D486827BBE2 for ; Thu, 3 Aug 2023 09:49:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRU11-0006cA-EW; Thu, 03 Aug 2023 04:49:03 -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 1qRU10-0006bs-GV for guix-patches@gnu.org; Thu, 03 Aug 2023 04:49:02 -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 1qRU10-000451-8R for guix-patches@gnu.org; Thu, 03 Aug 2023 04:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qRU10-00038h-5O for guix-patches@gnu.org; Thu, 03 Aug 2023 04:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65034] [PATCH 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Aug 2023 08:49: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 To: 65034@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 65034-submit@debbugs.gnu.org id=B65034.169105249011815 (code B ref 65034); Thu, 03 Aug 2023 08:49:02 +0000 Received: (at 65034) by debbugs.gnu.org; 3 Aug 2023 08:48:10 +0000 Received: from localhost ([127.0.0.1]:50831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRU09-00034U-U2 for submit@debbugs.gnu.org; Thu, 03 Aug 2023 04:48:10 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:52184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRU08-00034F-Ee for 65034@debbugs.gnu.org; Thu, 03 Aug 2023 04:48:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691052485; 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=cTYBJ+BV+yh4disj+kDmPXLcD20EoliEsd/krugAtHo=; b=Joy0OGZg1ITjit2ycGf7ePDfgVvlOHJk3Enzb/sJz5nXwOPlpRNQAEwIGTKWyF57BJ+OAG BbU9+lYA+YBlhwKcDN5MiqeVgh/hgc8AG9wxrymEjbRDkpdMzxdRzryvlOBbkTdBr2ZtlI SmUH4yGeTyZwxbn7SIzw9EA4e5cL0bkNdFuHjRm3fNfmZKjpWNOAjCA/Pf1F/JhLG5L1uW +P5okN45TQ00idmQp9t/+rPfhTepcchgL0uEnLu9pglKxBnN4v0kH+AHRKeD1NAEJZ0qiL tUkFTtby12X1yiBKZ1J4XVG7aGsEPw2Py2SI3Ma1t97lY45F6s7lPdQKHKokiA== Date: Thu, 3 Aug 2023 16:47:36 +0800 Message-ID: <11e7c41a7723c7ad219c627231300f94f1e86086.1691046970.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 51bc717064..25690f6665 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8408,7 +8408,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 @@ -8417,13 +8417,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 Aug 3 08:47:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52466 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 8208427BBEA; Thu, 3 Aug 2023 09:49:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, 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 7D66E27BBE2 for ; Thu, 3 Aug 2023 09:49:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRU13-0006ei-8f; Thu, 03 Aug 2023 04:49:05 -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 1qRU10-0006bz-TH for guix-patches@gnu.org; Thu, 03 Aug 2023 04:49:02 -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 1qRU10-000457-LH for guix-patches@gnu.org; Thu, 03 Aug 2023 04:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qRU10-00038o-I1 for guix-patches@gnu.org; Thu, 03 Aug 2023 04:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65034] [PATCH 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: guix-patches@gnu.org Resent-Date: Thu, 03 Aug 2023 08:49: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 To: 65034@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 65034-submit@debbugs.gnu.org id=B65034.169105249411857 (code B ref 65034); Thu, 03 Aug 2023 08:49:02 +0000 Received: (at 65034) by debbugs.gnu.org; 3 Aug 2023 08:48:14 +0000 Received: from localhost ([127.0.0.1]:50834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRU0E-000358-82 for submit@debbugs.gnu.org; Thu, 03 Aug 2023 04:48:14 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:52186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRU0B-00034j-KZ for 65034@debbugs.gnu.org; Thu, 03 Aug 2023 04:48:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691052488; 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=0JVE76j+o7VE+jneKkg3yz/l1fKqetnKymShuhn+0w4=; b=182ucWhjBKMmP2vZmDPt1SLYa0VhObRYr95ihXk++JfFCn09T29NbvWLDmCz80Ak22SrzG EeOzZ2vG4b45snGrxZziLpc2ZqQVHZcJzlC6pto9eWqXn9xGcGt8DN+UipOg9KnETYDyoL 1sAP0mu+RO5+eFECZbF48uLgPz/aEgx75C5SGxHWYH6vy2KLU/sLgVP/NzXjvkCpR8Dtpo w++W/DWzXWBlRPI6xyB3hPL1wKaAXYHo67Yb9LEbeDd9B5rlLjkg1A3od2uIUFaPEBXixY KnQJmby+O3C6/drIHzzyg+LuInZvL1bsjzE7CVln8DGY0l8ctgmquPmAbQa5tQ== Date: Thu, 3 Aug 2023 16:47:37 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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. [import-path]: Use github.com/golang/protobuf. [phases]: Build and check all packages. (go-github-com-lucas-clemente-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]: Adjust accordingly. --- gnu/packages/golang.scm | 46 ++++++++++++++++++++++++++++++-------- gnu/packages/syncthing.scm | 4 ++-- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 25690f6665..dcbc780f31 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7608,7 +7608,7 @@ (define-public go-github-com-lucas-clemente-quic-go (list go-golang-org-x-crypto go-github-com-cheekybits-genny go-github-com-marten-seemann-chacha20 go-github-com-marten-seemann-qtls - go-github-com-golang-protobuf-proto)) + go-github-com-golang-protobuf)) (synopsis "QUIC in Go") (description "This package provides a Go language implementation of the QUIC network protocol.") @@ -8405,9 +8405,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) @@ -8420,8 +8420,37 @@ (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" + #: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") @@ -10212,7 +10241,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") @@ -10269,7 +10298,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 @@ -13452,11 +13481,10 @@ (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 - go-google-golang-org-protobuf go-gopkg-in-yaml-v2)) (home-page "https://github.com/onsi/gomega") (synopsis "Matcher library for Ginkgo") diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index dd54100ce6..99cb3acdc8 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -841,7 +841,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") @@ -869,7 +869,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