From patchwork Thu May 6 16:35:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dion Mendel X-Patchwork-Id: 29151 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 39F4927BC82; Thu, 6 May 2021 17:48:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 82CA027BC81 for ; Thu, 6 May 2021 17:48:49 +0100 (BST) Received: from localhost ([::1]:47696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lehBA-0004TX-KM for patchwork@mira.cbaines.net; Thu, 06 May 2021 12:48:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1legyp-0000DP-C5 for guix-patches@gnu.org; Thu, 06 May 2021 12:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55128) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1legyo-00009y-W3 for guix-patches@gnu.org; Thu, 06 May 2021 12:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1legyo-0004pP-Fo for guix-patches@gnu.org; Thu, 06 May 2021 12:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48259] [PATCH 1/2] gnu: Replace go-github-com-golang-protobuf-proto with go-github-com-golang-protobuf Resent-From: Dion Mendel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 May 2021 16:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48259 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48259@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162031894018539 (code B ref -1); Thu, 06 May 2021 16:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 May 2021 16:35:40 +0000 Received: from localhost ([127.0.0.1]:38440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1legyN-0004ou-0X for submit@debbugs.gnu.org; Thu, 06 May 2021 12:35:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:47278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1legyJ-0004oo-P0 for submit@debbugs.gnu.org; Thu, 06 May 2021 12:35:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1legyJ-00080e-FG for guix-patches@gnu.org; Thu, 06 May 2021 12:35:31 -0400 Received: from fossa.birch.relay.mailchannels.net ([23.83.209.62]:25864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1legyF-0008HD-6u for guix-patches@gnu.org; Thu, 06 May 2021 12:35:31 -0400 X-Sender-Id: dreamhost|x-authsender|smtp@dm9.info Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id D370F362680 for ; Thu, 6 May 2021 16:35:18 +0000 (UTC) Received: from pdx1-sub0-mail-a40.g.dreamhost.com (100-96-17-237.trex.outbound.svc.cluster.local [100.96.17.237]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 78B9C36283D for ; Thu, 6 May 2021 16:35:17 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|smtp@dm9.info Received: from pdx1-sub0-mail-a40.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.96.17.237 (trex/6.2.1); Thu, 06 May 2021 16:35:18 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|smtp@dm9.info X-MailChannels-Auth-Id: dreamhost X-Harbor-Gusty: 1474530377fedbea_1620318918657_2595187630 X-MC-Loop-Signature: 1620318918656:2951685924 X-MC-Ingress-Time: 1620318918656 Received: from pdx1-sub0-mail-a40.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a40.g.dreamhost.com (Postfix) with ESMTP id 2FE648BABD for ; Thu, 6 May 2021 09:35:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=dm9.info; h=date:from:to :subject:message-id:mime-version:content-type :content-transfer-encoding; s=dm9.info; bh=Sxe5yAF2Pqv6Q0B4OsLG5 W8NjWs=; b=PWksNn+akV6YK2lWFMHpVBbLNNJS4bfedEWSAtC5xpIzCVKXKAqnD 1H2/ekXADKz4IN/mkP4P2Ob7RfTcrqLZ0CJXK6XOIXiSAs/trJpKqUjkTJu9ZMQr RzMX2/z0WDEZETAy8ei/UJ6H/5Cbe9LuiIkRlmjjoMDlb0wNLwcZjk= Received: from mail.localdomain (61-245-140-70.3df58c.per.nbn.aussiebb.net [61.245.140.70]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: smtp@dm9.info) by pdx1-sub0-mail-a40.g.dreamhost.com (Postfix) with ESMTPSA id A81FE7E5A7 for ; Thu, 6 May 2021 09:35:16 -0700 (PDT) Received: by mail.localdomain (Postfix, from userid 2001) id E1304507973; Fri, 7 May 2021 00:35:11 +0800 (AWST) Date: Fri, 7 May 2021 00:35:11 +0800 X-DH-BACKEND: pdx1-sub0-mail-a40 From: Dion Mendel Message-ID: <20210506163511.GB27260@dm9.info> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) Received-SPF: none client-ip=23.83.209.62; envelope-from=guix@dm9.info; helo=fossa.birch.relay.mailchannels.net 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi guix, The github.com/golang/protobuf module contains several packages. Only proto is currently packaged. This change updates the module from 1.3.1 to 1.5.2 and packages the entire module. This is needed as I am preparing to package lxd (github.com/lxc/lxd), which depends on the unpackaged packages from golang/protobuf. This change replaces go-github-com-golang-protobuf-proto with go-github-com-golang-protobuf. There are currently two packages that depend on go-github-com-golang-protobuf-proto. I have tested this changeset by building both of these packages. go-github-com-lucas-clemente-quic-go: this is a source only package that no other package uses. syncthing: depends on go-github-com-golang-protobuf-proto via several intermediary packages. After building, I've run some of the syncthing executables and they appear to work. From 0f029698f12364a475211204498aeb3face1381e Mon Sep 17 00:00:00 2001 From: Dion Mendel Date: Thu, 6 May 2021 23:39:16 +0800 Subject: [PATCH 2/2] gnu: Replace go-github-com-golang-protobuf-proto with go-github-com-golang-protobuf The github.com/golang/protobuf module contains several packages. Only proto is currently packaged. This change updates the module from 1.3.1 to 1.5.2 and packages the entire module. * gnu/packages/golang.scm (go-github-com-golang-protobuf): New variable. (go-github-com-golang-protobuf-proto): Removed variable. (go-github-com-lucas-clemente-quic-go)[propagated-inputs]: Replace go-github-com-golang-protobuf-proto@1.3.1 with go-github-com-golang-protobuf@1.5.2. * gnu/packages/syncthing.scm (go-github-com-matttproud-golang-protobuf-extensions-pbutil) (go-github-com-prometheus-client-golang) (go-github-com-prometheus-client-model) (go-github-com-prometheus-common) [propagated-inputs]: Replace go-github-com-golang-protobuf-proto@1.3.1 with go-github-com-golang-protobuf@1.5.2. --- gnu/packages/golang.scm | 32 ++++++++++++++++++++++---------- gnu/packages/syncthing.scm | 16 ++++++++-------- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f0fa0e1d36..9a689d225b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4237,7 +4237,7 @@ implementation of generics.") ("go-github-com-cheekybits-genny" ,go-github-com-cheekybits-genny) ("go-github-com-marten-seemann-chacha20" ,go-github-com-marten-seemann-chacha20) ("go-github-com-marten-seemann-qtls" ,go-github-com-marten-seemann-qtls) - ("go-github-com-golang-protobuf-proto" ,go-github-com-golang-protobuf-proto))) + ("go-github-com-golang-protobuf" ,go-github-com-golang-protobuf))) (synopsis "QUIC in Go") (description "This package provides a Go language implementation of the QUIC network protocol.") @@ -4808,10 +4808,10 @@ test results.") (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") - (version "1.3.1") + (name "go-github-com-golang-protobuf") + (version "1.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -4820,16 +4820,28 @@ test results.") (file-name (git-file-name name version)) (sha256 (base32 - "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl")))) + "1mh5fyim42dn821nsd3afnmgscrzzhn3h8rag635d2jnr23r1zhk")))) (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)) + '(#:import-path "github.com/golang/protobuf" + ; Source-only package + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'build)))) + (propagated-inputs + `(("go-golang-org-protobuf" ,go-golang-org-protobuf))) (synopsis "Go support for Protocol Buffers") (description "This package provides Go support for the Protocol Buffers -data serialization format.") +data serialization format. + +It has been superseded by go-golang-org-protobuf, which contains an updated and +simplified API, support for protobuf reflection, and many other improvements. +We recommend that new code use the google.golang.org/protobuf module. + +Versions v1.4 and later of go-github-com-golang-protobuf are implemented in +terms of go-golang-org-protobuf. Programs which use both modules must use +at least version v1.4 of this one.") (home-page "https://github.com/golang/protobuf") (license license:bsd-3))) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index e40f696720..67088ca6ca 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -838,8 +838,8 @@ bounds.") ;; Source-only package (delete 'build)))) (propagated-inputs - `(("go-github-com-golang-protobuf-proto" - ,go-github-com-golang-protobuf-proto))) + `(("go-github-com-golang-protobuf" + ,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") @@ -867,8 +867,8 @@ bounds.") '(#:import-path "github.com/matttproud/golang_protobuf_extensions/pbutil" #:unpack-path "github.com/matttproud/golang_protobuf_extensions")) (propagated-inputs - `(("go-github-com-golang-protobuf-proto" - ,go-github-com-golang-protobuf-proto))) + `(("go-github-com-golang-protobuf" + ,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 @@ -907,8 +907,8 @@ message streaming.") ;; Source-only package (delete 'build)))) (propagated-inputs - `(("go-github-com-golang-protobuf-proto" - ,go-github-com-golang-protobuf-proto) + `(("go-github-com-golang-protobuf" + ,go-github-com-golang-protobuf) ("go-github-com-matttproud-golang-protobuf-extensions-pbutil" ,go-github-com-matttproud-golang-protobuf-extensions-pbutil) ("go-github-com-prometheus-client-model" @@ -968,8 +968,8 @@ system, kernel, and process metrics from the @file{/proc} pseudo file system.") (propagated-inputs `(("go-github-com-beorn7-perks-quantile" ,go-github-com-beorn7-perks-quantile) - ("go-github-com-golang-protobuf-proto" - ,go-github-com-golang-protobuf-proto) + ("go-github-com-golang-protobuf" + ,go-github-com-golang-protobuf) ("go-github-com-prometheus-client-model" ,go-github-com-prometheus-client-model) ("go-github-com-prometheus-common" -- 2.31.1