>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