X-Loop: help-debbugs@HIDDEN Subject: [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0. Resent-From: Hilton Chain <hako@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 03 Aug 2023 08:47:02 +0000 Resent-Message-ID: <handler.65034.B.169105241111467 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65034 <at> debbugs.gnu.org Cc: Hilton Chain <hako@HIDDEN> X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.169105241111467 (code B ref -1); Thu, 03 Aug 2023 08:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Aug 2023 08:46:51 +0000 Received: from localhost ([127.0.0.1]:50816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qRTyt-0002yt-2Z for submit <at> debbugs.gnu.org; Thu, 03 Aug 2023 04:46:51 -0400 Received: from lists.gnu.org ([2001:470:142::17]:35568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <hako@HIDDEN>) id 1qRTys-0002yf-5A for submit <at> debbugs.gnu.org; Thu, 03 Aug 2023 04:46:50 -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 <hako@HIDDEN>) id 1qRTym-0005VN-Ui for guix-patches@HIDDEN; Thu, 03 Aug 2023 04:46:44 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <hako@HIDDEN>) id 1qRTyl-0003NJ-Fq for guix-patches@HIDDEN; Thu, 03 Aug 2023 04:46:44 -0400 From: Hilton Chain <hako@HIDDEN> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691052396; 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; bh=XxpslPz2CoB/OF039hX95Mv8afrg+Tz2SiXBsmgUK2Q=; b=DEcZWAdCBACt4NWqPs71OV3Y+sHc77p+OaiMppWJXfyVQ3uORlRZ58iPSgnhVUdI3C4Tic CTxsSkLcba6PK+m1dZm0SZMqrrWJeVPPKc2K1KKGjxPpPDq7LfqGclraiPw7FCzZurp/5s 1NEtyZwaU0vPZdQadhkHMRqtF6Gl7LK3YSqCG24Ifijdr2vFLAjOTO51d4nF6yGHvFX7aT 0/FZiHRRMEqzFuA+nXADZtte28xHfgqE+y6zgW/NwQQDTR3ZwDcTRXP6rhQREvD2aqldGf FwNOTQbIfuvGyECMzDotx1bp40QQ9efveVy9oIoA6AxqqTdiJMMQerEi4CGXbQ== Date: Thu, 3 Aug 2023 16:46:17 +0800 Message-ID: <cover.1691046969.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN X-Spam-Level: * X-Spamd-Bar: + Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@HIDDEN; helo=mail.boiledscript.com 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) Hello Guix! This patchset updates go-google-golang-org-protobuf to 1.31.0 and go-github-com-golang-protobuf-proto to 1.5.3 (latest versions), then renames the latter to go-github-com-golang-protobuf. Their dependency is changed from go-google-golang-org-protobuf -> go-github-com-golang-protobuf-proto -> go-github-com-google-go-cmp-cmp to go-github-com-golang-protobuf -> go-google-golang-org-protobuf -> go-github-com-google-go-cmp-cmp Since there's no Go file in their unpack-path, I have added builds and checks for the Go packages described in the docs of these two Go modules. I have built all affected packages reported by `guix refresh -l' for each commit on my system (x86_64-linux). Thanks Hilton Chain (3): gnu: go-google-golang-org-protobuf: Update to 1.31.0. gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3. gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf. gnu/packages/golang.scm | 110 ++++++++++++++++++++++++++++++------- gnu/packages/syncthing.scm | 4 +- 2 files changed, 91 insertions(+), 23 deletions(-) base-commit: 23e2ff223c0511317edf236504fb474e3b5ac301 -- 2.41.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Hilton Chain <hako@HIDDEN> Subject: bug#65034: Acknowledgement ([PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0.) Message-ID: <handler.65034.B.169105241111467.ack <at> debbugs.gnu.org> References: <cover.1691046969.git.hako@HIDDEN> X-Gnu-PR-Message: ack 65034 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 65034 <at> debbugs.gnu.org Date: Thu, 03 Aug 2023 08:47:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 65034 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 65034: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D65034 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#65034] [PATCH 1/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0. Resent-From: Hilton Chain <hako@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 03 Aug 2023 08:49:01 +0000 Resent-Message-ID: <handler.65034.B65034.169105248811791 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65034 <at> debbugs.gnu.org Cc: Hilton Chain <hako@HIDDEN> Received: via spool by 65034-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qRU07-000344-HM for submit <at> 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 <hako@HIDDEN>) id 1qRU05-00033k-Ua for 65034 <at> debbugs.gnu.org; Thu, 03 Aug 2023 04:48:06 -0400 From: Hilton Chain <hako@HIDDEN> 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: <fd53c7f9f6f5f22e25ca8f73f6e45bbaceee1144.1691046969.git.hako@HIDDEN> In-Reply-To: <cover.1691046969.git.hako@HIDDEN> References: <cover.1691046969.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * 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 -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#65034] [PATCH 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3. Resent-From: Hilton Chain <hako@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 03 Aug 2023 08:49:02 +0000 Resent-Message-ID: <handler.65034.B65034.169105249011815 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65034 <at> debbugs.gnu.org Cc: Hilton Chain <hako@HIDDEN> Received: via spool by 65034-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qRU09-00034U-U2 for submit <at> 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 <hako@HIDDEN>) id 1qRU08-00034F-Ee for 65034 <at> debbugs.gnu.org; Thu, 03 Aug 2023 04:48:08 -0400 From: Hilton Chain <hako@HIDDEN> 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@HIDDEN> In-Reply-To: <cover.1691046969.git.hako@HIDDEN> References: <cover.1691046969.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * 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.") -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#65034] [PATCH 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf. Resent-From: Hilton Chain <hako@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 03 Aug 2023 08:49:02 +0000 Resent-Message-ID: <handler.65034.B65034.169105249411857 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65034 <at> debbugs.gnu.org Cc: Hilton Chain <hako@HIDDEN> Received: via spool by 65034-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qRU0E-000358-82 for submit <at> 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 <hako@HIDDEN>) id 1qRU0B-00034j-KZ for 65034 <at> debbugs.gnu.org; Thu, 03 Aug 2023 04:48:12 -0400 From: Hilton Chain <hako@HIDDEN> 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: <fb29032b3f9dd80d37a3eefc6c422b1e47e0ca38.1691046970.git.hako@HIDDEN> In-Reply-To: <cover.1691046969.git.hako@HIDDEN> References: <cover.1691046969.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * 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 -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0. Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Tue, 05 Sep 2023 13:50:02 +0000 Resent-Message-ID: <handler.65034.B65034.169392176825435 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Hilton Chain <hako@HIDDEN> Cc: 65034 <at> debbugs.gnu.org Received: via spool by 65034-submit <at> debbugs.gnu.org id=B65034.169392176825435 (code B ref 65034); Tue, 05 Sep 2023 13:50:02 +0000 Received: (at 65034) by debbugs.gnu.org; 5 Sep 2023 13:49:28 +0000 Received: from localhost ([127.0.0.1]:55229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qdWQq-0006cB-00 for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 09:49:28 -0400 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]:61598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qdWQo-0006by-07 for 65034 <at> debbugs.gnu.org; Tue, 05 Sep 2023 09:49:26 -0400 Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-76f18e09716so148950285a.2 for <65034 <at> debbugs.gnu.org>; Tue, 05 Sep 2023 06:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693921759; x=1694526559; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=pDlHH6wGAJO//cvGdoLju4JQMi4K0W37XFEdTNIIxX4=; b=AtwZUFYo0TaNgs8dHwVkmajImjwDb06iKYMAdvjOxZahwckXCpUhu6CsEbFwULaCVB X0nFjkpCk3oxZy25OZmt55Uo7ECptmhIHeDAgOdWptk9+/YUBQXu0w23KnmO5nkFrKi4 YWBXwVfF+CAkyga0Mm7ln96DqGpCdU/BkMqgNnQwyy6f3xkx2Euo+YfWmCJVZitnOMPG 78C4vXnFXKseeodGGzDxP4v6vvNpcA1mB/ShGMqV4TxP4Pg64Kp/lGiGL5BXirdlMSrl Bv911LpKl2aHqFSsD1pBVyIqfqPKN2izJ2hOBhIG1AwV9l7YyUcsFm2LCjfgqojKCl+I 65HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693921759; x=1694526559; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pDlHH6wGAJO//cvGdoLju4JQMi4K0W37XFEdTNIIxX4=; b=cIoN5NNZgZfGprfVOJcxj6ig6+hLRFlkAF71vLAQCdNiKyRrHEuK8+hxPr4o9E4qPc +DNsO3p5SwlMivxQIKgoCpV3bWZ108DWxovrKuqFOUsdFCTW1rgMaktORUD4c36DpXgb o5NMOhegHpNBy7Ef1hq3SoHNL9RDuM5KvAkLkKaTspF2y3XyAw6n/5k1opj4E16wpnjM UIMNpKnHD4JD42papUIJ7YLZ8TAydVm30Ge7h+gCyv6usxSD9SZxfTxmha01sytVug2E 67wH9L0Fa9+z5YZ4clq/o6IPwHoX9kVW9peV+i/cMFaVyz+5V6QoMHcaLbu9934LvkAS WiAw== X-Gm-Message-State: AOJu0YxeqShLvUlcvRsnRn8AK18Xi4xmdKKFlSRgEGBpyyH4BuCvv3xM KkJa2mmShNhdCA2GZRwJM0HKiW3+qeIFrQ== X-Google-Smtp-Source: AGHT+IFAbH03aKmkvkvGFFIu3QbF32dC7iplm2XkJeZ/KsDrTse6tXd4qEQe4Q2hz/duFehsjMj/6w== X-Received: by 2002:a05:620a:248a:b0:76c:a8a2:aad2 with SMTP id i10-20020a05620a248a00b0076ca8a2aad2mr16857880qkn.34.1693921759581; Tue, 05 Sep 2023 06:49:19 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id c12-20020a05620a11ac00b00767f00a9c67sm4085394qkk.95.2023.09.05.06.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 06:49:19 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> References: <cover.1691046969.git.hako@HIDDEN> <fd53c7f9f6f5f22e25ca8f73f6e45bbaceee1144.1691046969.git.hako@HIDDEN> Date: Tue, 05 Sep 2023 09:49:18 -0400 In-Reply-To: <fd53c7f9f6f5f22e25ca8f73f6e45bbaceee1144.1691046969.git.hako@HIDDEN> (Hilton Chain's message of "Thu, 3 Aug 2023 16:47:35 +0800") Message-ID: <87v8cok9wh.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Hilton, Hilton Chain <hako@HIDDEN> writes: > * 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))))))) Is this a workaround for our lack of Go modules support? An explanatory comment is needed. -- Thanks, Maxim
Received: (at control) by debbugs.gnu.org; 5 Sep 2023 13:49:44 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 05 09:49:44 2023 Received: from localhost ([127.0.0.1]:55232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qdWR6-0006cg-DP for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 09:49:44 -0400 Received: from mail-vs1-xe36.google.com ([2607:f8b0:4864:20::e36]:50542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qdWR4-0006cQ-47 for control <at> debbugs.gnu.org; Tue, 05 Sep 2023 09:49:42 -0400 Received: by mail-vs1-xe36.google.com with SMTP id ada2fe7eead31-44d38d91885so1034788137.1 for <control <at> debbugs.gnu.org>; Tue, 05 Sep 2023 06:49:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693921776; x=1694526576; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=woGuzCKDs/99pTw7ihqXxhjwHhpXj370l1SpGB2QZ9s=; b=Q0kuOp8VZnx581L1O6KEnJMwHyZLEjDACP4z4OgpWpMhQ6bGrP1P5CSIDcO8t5TLKC dzNkxMXzMum64otysLwlyd0TVtcsUmC02b0VSSaT+S3X5+g3ecdQ5pySYKoReNUzzdQ3 VvRY6bmhp7YI6q7S0anvzu3Wp+JuDwL8TXw3q4VGrUFzf2MQ+D9UfVcVTfmgeF7Q1kzD NbCx1i99QsS4on6+9S5Z0eAyWQrCl+NnWa4mye0nSr6QIjw4bkseTSQ5akm4zLKOlE8D 5OhbX/zqW/IJ21PyuPj+k/fEpAyzGjkb/tNrqq2nfFAzzvUxr7VoPzdqCoX9NAh6OTNU kGRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693921776; x=1694526576; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=woGuzCKDs/99pTw7ihqXxhjwHhpXj370l1SpGB2QZ9s=; b=CNFDorrgirSgjSbUWWR83B47FfSdcWl9PlzA+3kokR6mPHAnmm9XdIwHYWDq0598W5 Im5OQtd5itJHataTaX4Yny9X7Swp5Ap4x9ez9Vw614gt2gnfMPWIKpvxHJAF+nBIX6ZX 0UPF34nAzrqjuihuyA+zvXrNsEGlGFm6pvcMJEB9UsWnh/8B2n6xApwFLEhJ4Mw4umpl sne8ODPLGCYQs8EVs4iipLhtrY2OauRTzzWF71TnR9lyHSBEx5Bhtq0FKMntwWkmbEab aOqK8k0DpjtUhirmdnJXZ+OTRrKBeA0E0MqtfephnLyth8LR3+T+yt/cgu0rzsRP6WyJ UEuw== X-Gm-Message-State: AOJu0YwQbxei+SaHQg7//fAyaFoOPb/mEsfy4QuEA7+OFf5bvminj22k OoP7D/qMsakQhrcysrvan/cvzpouBemVSQ== X-Google-Smtp-Source: AGHT+IFAbZSbxCTT8nYnRJ/CF7it86jeZXvs09EY00rkavmbUgXp069fkaLC8C3nwEsqFOtLE8y2Jg== X-Received: by 2002:a67:f5d8:0:b0:44d:63a3:4be4 with SMTP id t24-20020a67f5d8000000b0044d63a34be4mr12553729vso.29.1693921775772; Tue, 05 Sep 2023 06:49:35 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id x27-20020ac84d5b000000b00403bf34266csm4324574qtv.30.2023.09.05.06.49.35 for <control <at> debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 06:49:35 -0700 (PDT) Date: Tue, 05 Sep 2023 09:49:34 -0400 Message-Id: <87tts8k9w1.fsf@HIDDEN> To: control <at> debbugs.gnu.org From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: control message for bug #65034 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) tags 65034 + moreinfo quit
X-Loop: help-debbugs@HIDDEN Subject: [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0. Resent-From: Hilton Chain <hako@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 23 Sep 2023 13:45:02 +0000 Resent-Message-ID: <handler.65034.B65034.169547669524629 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Cc: 65034 <at> debbugs.gnu.org Received: via spool by 65034-submit <at> debbugs.gnu.org id=B65034.169547669524629 (code B ref 65034); Sat, 23 Sep 2023 13:45:02 +0000 Received: (at 65034) by debbugs.gnu.org; 23 Sep 2023 13:44:55 +0000 Received: from localhost ([127.0.0.1]:38001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qk2wI-0006PB-PU for submit <at> debbugs.gnu.org; Sat, 23 Sep 2023 09:44:55 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:47632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <hako@HIDDEN>) id 1qk2wF-0006P1-T0 for 65034 <at> debbugs.gnu.org; Sat, 23 Sep 2023 09:44:53 -0400 Date: Sat, 23 Sep 2023 21:43:45 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1695476586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Mz3IeW5N6WuzRXbKDNfE+PvS7c13sv83OAfOhGczi74=; b=YhJXdnCu6qhCydyHyre9oymzKPZdQ4QQqvCzU83ACgucocFxd9C0oEFPHFIRabQRI8QM91 ChyJLicWMNsiqVu9YkxvezauSJ0r/pF5ZeWYPO5YNZAobyrAFPCE4cPZGAP0PEeRHfB8zK fv4wJopjp7YXdgnpCVjUA2CY5Omrq4a+7HT9FHmcHuvJBVNzfCiybeHKi7KO6RgNDttdCA S/P5+GnNmeCIrDYBUtkRxMhxpYppZsMjuHGuTjJhH5A3y7mC5zL1mZL3yy55peEzAFfNIl CgJsEJRYGIkwbsn2TzNrbTyfJmTSbP0ZWevzMoHq3H+3Rvy1K6SjBVlk9Qw3gQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN Message-ID: <874jjlqa26.wl-hako@HIDDEN> From: Hilton Chain <hako@HIDDEN> In-Reply-To: <87v8cok9wh.fsf_-_@HIDDEN> References: <cover.1691046969.git.hako@HIDDEN> <fd53c7f9f6f5f22e25ca8f73f6e45bbaceee1144.1691046969.git.hako@HIDDEN> <87v8cok9wh.fsf_-_@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Maxim, On Tue, 05 Sep 2023 21:49:18 +0800, Maxim Cournoyer wrote: > [...] > > (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))))))) > > Is this a workaround for our lack of Go modules support? An explanatory > comment is needed. Yes, I'll add the comment and send V2, thank you!
X-Loop: help-debbugs@HIDDEN Subject: [bug#65034] [PATCH v2 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0. Resent-From: Hilton Chain <hako@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: maxim.cournoyer@HIDDEN, guix-patches@HIDDEN Resent-Date: Sun, 24 Sep 2023 02:42:02 +0000 Resent-Message-ID: <handler.65034.B65034.169552328524065 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 65034 <at> debbugs.gnu.org Cc: Hilton Chain <hako@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-Debbugs-Original-Xcc: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Received: via spool by 65034-submit <at> debbugs.gnu.org id=B65034.169552328524065 (code B ref 65034); Sun, 24 Sep 2023 02:42:02 +0000 Received: (at 65034) by debbugs.gnu.org; 24 Sep 2023 02:41:25 +0000 Received: from localhost ([127.0.0.1]:40794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qkF3k-0006G2-Nr for submit <at> debbugs.gnu.org; Sat, 23 Sep 2023 22:41:25 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:47172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <hako@HIDDEN>) id 1qkF3i-0006Fj-0N for 65034 <at> debbugs.gnu.org; Sat, 23 Sep 2023 22:41:23 -0400 From: Hilton Chain <hako@HIDDEN> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1695523173; 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=Aso1cUkw3AX27mtNvDTK2rl9pSisTioUVnSZ6w3upg0=; b=kfILdVvoiu0fwEvAxOPvaZqHtsdUD6WTsNYRQbPH0PiN/bLuy4jtre2m7wxGWd19JNm44n qTprczrawy34hUqxcXTulnsIXldJBv79kTQ6U6eNwdm9Vwfc6hn7HUnnJmAYcMcs6p8vXJ ocDDEFDcGXjUZ82FI2fu6SJH/13sDgCwCda/prRPWlwh8XKFjBKMRRk2TL3EaoBqurIovn gwHziXyIeJJMW8+36Tk4wv8LtHr3H9Xp3ImbXlGDEvMMvtNMOSMWnVZl/0H94NFSxiwpkN 43uM7RVB03AkIR1N0mVgFX/wwFEZoVIE4TL4dM0jEbqjSrd9iMib+L+5mKRkUA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN Date: Sun, 24 Sep 2023 10:39:54 +0800 Message-ID: <cover.1695521520.git.hako@HIDDEN> In-Reply-To: <cover.1691046969.git.hako@HIDDEN> References: <cover.1691046969.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + X-Spam-Level: * X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) V1 -> V2: - Add comment for #:phases change. Hilton Chain (3): gnu: go-google-golang-org-protobuf: Update to 1.31.0. gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3. gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf. gnu/packages/golang.scm | 112 ++++++++++++++++++++++++++++++------- gnu/packages/syncthing.scm | 4 +- 2 files changed, 93 insertions(+), 23 deletions(-) $ git range-diff origin/master v1 v2 1: 67e75293d5 ! 1: 5f6b22ea40 gnu: go-google-golang-org-protobuf: Update to 1.31.0. @@ gnu/packages/golang.scm: (define-public go-google-golang-org-protobuf - (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" 2: 665d5761cb = 2: 177b76f359 gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3. 3: 47a5b62621 ! 3: fb3bff6d7f gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf. @@ Commit message * 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. + [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-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. + [propagated-inputs]: Likewise. ## gnu/packages/golang.scm ## @@ gnu/packages/golang.scm: (define-public go-github-com-lucas-clemente-quic-go @@ gnu/packages/golang.scm: (define-public go-github-com-golang-protobuf-proto - '(#: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" base-commit: 4f35ff1275e05be31f5d41464ccf147e9dbfd016 -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#65034] [PATCH v2 1/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0. Resent-From: Hilton Chain <hako@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: maxim.cournoyer@HIDDEN, guix-patches@HIDDEN Resent-Date: Sun, 24 Sep 2023 02:42:02 +0000 Resent-Message-ID: <handler.65034.B65034.169552328524072 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 65034 <at> debbugs.gnu.org Cc: Hilton Chain <hako@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-Debbugs-Original-Xcc: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Received: via spool by 65034-submit <at> debbugs.gnu.org id=B65034.169552328524072 (code B ref 65034); Sun, 24 Sep 2023 02:42:02 +0000 Received: (at 65034) by debbugs.gnu.org; 24 Sep 2023 02:41:25 +0000 Received: from localhost ([127.0.0.1]:40796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qkF3l-0006G5-3W for submit <at> debbugs.gnu.org; Sat, 23 Sep 2023 22:41:25 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:47178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <hako@HIDDEN>) id 1qkF3i-0006Fm-Ux for 65034 <at> debbugs.gnu.org; Sat, 23 Sep 2023 22:41:23 -0400 From: Hilton Chain <hako@HIDDEN> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1695523176; 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=RTqGEVtcL8gonuI4xB1qCwP9yPNpK3DoKEMLQ5dQstI=; b=QrP8OkYVKDsiH1Qt3o+g4RZxw9LoQrfhr0/ipi8C/jJd1KkImZiJvwA7tdP0z6NPGXqzqa MxfgGYYEKjj3x4zil1OJH41CIw57+ayxAUowD51re9edk+/6aEWLdkKBaHb+jqoGAa/Ois B56JsR4LsJZIgnp/NTv/E3o1zrXHiNMrnT68P2p0vObyNtXb1VMP76Tx2iNydu71rnr8LE 57MgKQiLCJDAzgrNfYt79ao14y+ZzQRbg1GCoderiFqx+r+pAqOL598oogAcAfT0XakQco tWt1JrGt6OwFuakoBW9zp3rkaPR8BgCBs7ZZMMOx9m2n8mdxovQRRwLBfMxeng== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN Date: Sun, 24 Sep 2023 10:39:55 +0800 Message-ID: <5f6b22ea4019638026ac945b175e6497257badaf.1695521520.git.hako@HIDDEN> In-Reply-To: <cover.1695521520.git.hako@HIDDEN> References: <cover.1695521520.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * 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(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3d19b48e9f..2a2ba8c13c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8848,7 +8848,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 @@ -8857,16 +8857,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 -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#65034] [PATCH v2 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3. Resent-From: Hilton Chain <hako@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: maxim.cournoyer@HIDDEN, guix-patches@HIDDEN Resent-Date: Sun, 24 Sep 2023 02:42:03 +0000 Resent-Message-ID: <handler.65034.B65034.169552329324094 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 65034 <at> debbugs.gnu.org Cc: Hilton Chain <hako@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-Debbugs-Original-Xcc: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Received: via spool by 65034-submit <at> debbugs.gnu.org id=B65034.169552329324094 (code B ref 65034); Sun, 24 Sep 2023 02:42:03 +0000 Received: (at 65034) by debbugs.gnu.org; 24 Sep 2023 02:41:33 +0000 Received: from localhost ([127.0.0.1]:40799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qkF3s-0006GW-Jy for submit <at> debbugs.gnu.org; Sat, 23 Sep 2023 22:41:33 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:47188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <hako@HIDDEN>) id 1qkF3l-0006G6-CS for 65034 <at> debbugs.gnu.org; Sat, 23 Sep 2023 22:41:25 -0400 From: Hilton Chain <hako@HIDDEN> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1695523178; 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=r1STpIaE3pp7cE07x13H6z15l/ONRw6KOguHB/6Xjmc=; b=0ryJM8r7+azX3WJAvKCU6oi4u19ZGVj2XjSCSscKvI6Z7FFFm5ApZpDDCiuCqCKn9uIVXb 7ZHBIzLW5rarTL8NFReu1RHrTvzBjZrLuQkb7RLE324m7OX5Stq1aeUSwTXgZorxjKwoX/ bFWGfhvSkSzLhyt12N7Jw70PUqsJjeH/0lOSvx7X/sc+zC5Y02bFFehyHG4JYug+vk8kpe ttPokyxnbKYL/3v641obClIDEi552bUJE8ibf2Z67210vQxhRD42jmoOyzYajkVylORT22 mWjvg8MrIxRELmRco+f35MM01vim+Vr5vVjKXhPJNGBGS/LRfLrF6p/S4pFQgQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN Date: Sun, 24 Sep 2023 10:39:56 +0800 Message-ID: <177b76f359a5e74114c1a684d41e24ffa77b1542.1695521520.git.hako@HIDDEN> In-Reply-To: <cover.1695521520.git.hako@HIDDEN> References: <cover.1695521520.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * 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 2a2ba8c13c..f8a0d48b73 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8823,7 +8823,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 @@ -8832,13 +8832,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.") -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#65034] [PATCH v2 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf. Resent-From: Hilton Chain <hako@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: maxim.cournoyer@HIDDEN, guix-patches@HIDDEN Resent-Date: Sun, 24 Sep 2023 02:42:03 +0000 Resent-Message-ID: <handler.65034.B65034.169552329824110 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 65034 <at> debbugs.gnu.org Cc: Hilton Chain <hako@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-Debbugs-Original-Xcc: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Received: via spool by 65034-submit <at> debbugs.gnu.org id=B65034.169552329824110 (code B ref 65034); Sun, 24 Sep 2023 02:42:03 +0000 Received: (at 65034) by debbugs.gnu.org; 24 Sep 2023 02:41:38 +0000 Received: from localhost ([127.0.0.1]:40802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qkF3x-0006Gn-Dt for submit <at> debbugs.gnu.org; Sat, 23 Sep 2023 22:41:37 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:56400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <hako@HIDDEN>) id 1qkF3s-0006GV-Pn for 65034 <at> debbugs.gnu.org; Sat, 23 Sep 2023 22:41:33 -0400 From: Hilton Chain <hako@HIDDEN> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1695523181; 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=bivK8fQGBFnPg+qNqfneUy28DM+XVaS92tRXofm/Tmo=; b=a5cmFxK29qddhgPxlvznXxANrmpyyB6olN3QH+3rFhdFPhUYEEpFGjUf1jFARyseFXyBUz oV6xvfPZVfdehQRP2FhhoVSBLtft73TULJIBqYi1bwCn5cX/POYVM4JroIUDDxty+t8Iuc RtWoAusdfQA8EJPPnQitW2tAmHvpnfmZeutW/TNudLYK9exLzjIYUAbg/sY9uf974lNmZl p57Z082yai+1cSUVGsmp1+c8sxORIHMoSXbrhLPyfSteguPSiX9YZdnH3C22dnlfR+SS49 kZZE3W1VDgNG8+Ks/eyQ9FRS51OKZZS0tfKn0S0ZYxmgQALt6sMru2IOQb5Ruw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN Date: Sun, 24 Sep 2023 10:39:57 +0800 Message-ID: <fb3bff6d7f0e9f689ace38481d9b112304a7b24c.1695521520.git.hako@HIDDEN> In-Reply-To: <cover.1695521520.git.hako@HIDDEN> References: <cover.1695521520.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * 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-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]: Likewise. --- gnu/packages/golang.scm | 47 ++++++++++++++++++++++++++++++-------- gnu/packages/syncthing.scm | 4 ++-- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f8a0d48b73..6fc7b13fef 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8023,7 +8023,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.") @@ -8820,9 +8820,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) @@ -8835,8 +8835,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") @@ -10697,7 +10727,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") @@ -10754,7 +10784,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 @@ -13937,11 +13967,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 5570aa9361..30ec34e8f3 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -828,7 +828,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") @@ -856,7 +856,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 -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#65034] [PATCH v2 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf. Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 21 Jan 2024 23:01:02 +0000 Resent-Message-ID: <handler.65034.B65034.17058780572688 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: Hilton Chain <hako@HIDDEN> Cc: 65034 <at> debbugs.gnu.org Received: via spool by 65034-submit <at> debbugs.gnu.org id=B65034.17058780572688 (code B ref 65034); Sun, 21 Jan 2024 23:01:02 +0000 Received: (at 65034) by debbugs.gnu.org; 21 Jan 2024 23:00:57 +0000 Received: from localhost ([127.0.0.1]:39265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rRgoD-0000hI-4d for submit <at> debbugs.gnu.org; Sun, 21 Jan 2024 18:00:57 -0500 Received: from mail-ot1-x32b.google.com ([2607:f8b0:4864:20::32b]:59557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1rRgoA-0000h0-RC for 65034 <at> debbugs.gnu.org; Sun, 21 Jan 2024 18:00:55 -0500 Received: by mail-ot1-x32b.google.com with SMTP id 46e09a7af769-6dde1f23060so1713082a34.2 for <65034 <at> debbugs.gnu.org>; Sun, 21 Jan 2024 15:00:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705878044; x=1706482844; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=pLyqrJoD36iuMIm8zFJbnfGRS+XCuNw/Cd8hM8xIKS8=; b=N0d/pfNU1+RmnlvIjXb3iRavQ07JgkCjayK4EbTnG7Ur3kWP0IJ2p4hwPd9kT5xMg8 zCK5TEkeaj3SI3BdEjeDcP5u1Z1thTSH+kpLnbNufOLi+8AD+krspim94Mo0/LQlit9z q6I1YkIPcDQbZlf9PRjdDh+fcYznAL16PqTUbBiesmm9ItuwIHo2c0gp/2dnFtQKd1cq 8UHj/OOCWjuq+c/ccwOwYasvaeqSkzvq1FL3cO6/rDJSoSo+l0d+Z6bevcUPYJ6O+UAl WnOr4FEYUjbDPsyKZV1vS19CyJ6q+zHyh7GN/gzzd+rd1AmHkIJkQ65tDBcl+/wRy061 3pHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705878044; x=1706482844; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pLyqrJoD36iuMIm8zFJbnfGRS+XCuNw/Cd8hM8xIKS8=; b=Ad7iNjJMRoIWvUD7oBDslzjeSp4aH+UiA2DrK3I2AiMJ73HKAHsmhDb7gFgrh5rjGO B2OOk+yZtV/6VmtcT3ya1zn8PbySej6ankWs2NKi4vTqa9gj9Mw1LgUBM01XDiPEaROk LPqetmYixcCJz5l/OUwN6OkdWDn4ozrwA9l6eINKDT5mWxF69W3p4kC2KxGGjgowsWOL PONwvIX8RE+YnzRHzb0k1GfPs7UAgmrv/DLwtWckf1y2nB+Ta8nTE+PZcda5ltMVu/2r PjJ6XZ7VFAqxZRk0k26HIUzUPqAe5vCoBD4Vj92FqRrXD+rUUA7bfDRdvOnDuMAEQmb0 o/jg== X-Gm-Message-State: AOJu0YykTQGI6Fhr7RvTOe1rBQ7Kv+nSl7Dk4ZlatDIXOAJCb1W0HQaj bidBO9XvVx1WwQShRGZa9Mj58U7d4RwsotzWZM9B6lh6IHC4Hjd1VZwx8TIyMU8= X-Google-Smtp-Source: AGHT+IFqkjzZMlbebbllzBq7N+INGKJQRp52PeRC29SOdVrbM/tuiLkgKOKGrtOaHi1YxAWPip7eYg== X-Received: by 2002:a05:6870:9d16:b0:214:3480:45ff with SMTP id pp22-20020a0568709d1600b00214348045ffmr1506125oab.111.1705878044711; Sun, 21 Jan 2024 15:00:44 -0800 (PST) Received: from hurd (dsl-10-128-232.b2b2c.ca. [72.10.128.232]) by smtp.gmail.com with ESMTPSA id md3-20020a056214588300b00681778af4dasm1871706qvb.119.2024.01.21.15.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 15:00:44 -0800 (PST) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> In-Reply-To: <fb3bff6d7f0e9f689ace38481d9b112304a7b24c.1695521520.git.hako@HIDDEN> (Hilton Chain's message of "Sun, 24 Sep 2023 10:39:57 +0800") References: <cover.1695521520.git.hako@HIDDEN> <fb3bff6d7f0e9f689ace38481d9b112304a7b24c.1695521520.git.hako@HIDDEN> Date: Sun, 21 Jan 2024 18:00:43 -0500 Message-ID: <87ttn670mc.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Hilton, Hilton Chain <hako@HIDDEN> writes: > * 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-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]: Likewise. I wanted to apply this to core-updates but I think I had merge conflicts. Could you check if it still applies cleanly, else upload a v3? -- Thanks, Maxim
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.