* [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0.
@ 2023-08-03 8:46 Hilton Chain via Guix-patches via
2023-08-03 8:47 ` [bug#65034] [PATCH 1/3] " Hilton Chain via Guix-patches via
` (5 more replies)
0 siblings, 6 replies; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-03 8:46 UTC (permalink / raw)
To: 65034; +Cc: Hilton Chain
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
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH 1/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0.
2023-08-03 8:46 [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
@ 2023-08-03 8:47 ` Hilton Chain via Guix-patches via
2023-09-05 13:49 ` [bug#65034] [PATCH 0/3] " Maxim Cournoyer
2023-08-03 8:47 ` [bug#65034] [PATCH 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3 Hilton Chain via Guix-patches via
` (4 subsequent siblings)
5 siblings, 1 reply; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-03 8:47 UTC (permalink / raw)
To: 65034; +Cc: Hilton Chain
* 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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3.
2023-08-03 8:46 [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
2023-08-03 8:47 ` [bug#65034] [PATCH 1/3] " Hilton Chain via Guix-patches via
@ 2023-08-03 8:47 ` Hilton Chain via Guix-patches via
2023-08-03 8:47 ` [bug#65034] [PATCH 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf Hilton Chain via Guix-patches via
` (3 subsequent siblings)
5 siblings, 0 replies; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-03 8:47 UTC (permalink / raw)
To: 65034; +Cc: Hilton Chain
* 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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf.
2023-08-03 8:46 [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
2023-08-03 8:47 ` [bug#65034] [PATCH 1/3] " Hilton Chain via Guix-patches via
2023-08-03 8:47 ` [bug#65034] [PATCH 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3 Hilton Chain via Guix-patches via
@ 2023-08-03 8:47 ` Hilton Chain via Guix-patches via
2023-09-24 2:39 ` [bug#65034] [PATCH v2 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
` (2 subsequent siblings)
5 siblings, 0 replies; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-03 8:47 UTC (permalink / raw)
To: 65034; +Cc: Hilton Chain
* 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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0.
2023-08-03 8:47 ` [bug#65034] [PATCH 1/3] " Hilton Chain via Guix-patches via
@ 2023-09-05 13:49 ` Maxim Cournoyer
2023-09-23 13:43 ` Hilton Chain via Guix-patches via
0 siblings, 1 reply; 17+ messages in thread
From: Maxim Cournoyer @ 2023-09-05 13:49 UTC (permalink / raw)
To: Hilton Chain; +Cc: 65034
Hi Hilton,
Hilton Chain <hako@ultrarare.space> 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
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0.
2023-09-05 13:49 ` [bug#65034] [PATCH 0/3] " Maxim Cournoyer
@ 2023-09-23 13:43 ` Hilton Chain via Guix-patches via
0 siblings, 0 replies; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-09-23 13:43 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 65034
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!
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH v2 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0.
2023-08-03 8:46 [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
` (2 preceding siblings ...)
2023-08-03 8:47 ` [bug#65034] [PATCH 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf Hilton Chain via Guix-patches via
@ 2023-09-24 2:39 ` Hilton Chain via Guix-patches via
2023-09-24 2:39 ` [bug#65034] [PATCH v2 1/3] " Hilton Chain via Guix-patches via
` (2 more replies)
2024-01-25 17:12 ` [bug#65034] [PATCH v3 core-updates 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
2024-06-20 11:57 ` bug#65034: [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Sharlatan Hellseher
5 siblings, 3 replies; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-09-24 2:39 UTC (permalink / raw)
To: 65034; +Cc: Hilton Chain, Maxim Cournoyer
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
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH v2 1/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0.
2023-09-24 2:39 ` [bug#65034] [PATCH v2 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
@ 2023-09-24 2:39 ` Hilton Chain via Guix-patches via
2023-09-24 2:39 ` [bug#65034] [PATCH v2 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3 Hilton Chain via Guix-patches via
2023-09-24 2:39 ` [bug#65034] [PATCH v2 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf Hilton Chain via Guix-patches via
2 siblings, 0 replies; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-09-24 2:39 UTC (permalink / raw)
To: 65034; +Cc: Hilton Chain, Maxim Cournoyer
* 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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH v2 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3.
2023-09-24 2:39 ` [bug#65034] [PATCH v2 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
2023-09-24 2:39 ` [bug#65034] [PATCH v2 1/3] " Hilton Chain via Guix-patches via
@ 2023-09-24 2:39 ` Hilton Chain via Guix-patches via
2023-09-24 2:39 ` [bug#65034] [PATCH v2 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf Hilton Chain via Guix-patches via
2 siblings, 0 replies; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-09-24 2:39 UTC (permalink / raw)
To: 65034; +Cc: Hilton Chain, Maxim Cournoyer
* 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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH v2 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf.
2023-09-24 2:39 ` [bug#65034] [PATCH v2 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
2023-09-24 2:39 ` [bug#65034] [PATCH v2 1/3] " Hilton Chain via Guix-patches via
2023-09-24 2:39 ` [bug#65034] [PATCH v2 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3 Hilton Chain via Guix-patches via
@ 2023-09-24 2:39 ` Hilton Chain via Guix-patches via
2024-01-21 23:00 ` Maxim Cournoyer
2 siblings, 1 reply; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-09-24 2:39 UTC (permalink / raw)
To: 65034; +Cc: Hilton Chain, Maxim Cournoyer
* 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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH v2 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf.
2023-09-24 2:39 ` [bug#65034] [PATCH v2 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf Hilton Chain via Guix-patches via
@ 2024-01-21 23:00 ` Maxim Cournoyer
2024-01-25 17:10 ` Hilton Chain via Guix-patches via
0 siblings, 1 reply; 17+ messages in thread
From: Maxim Cournoyer @ 2024-01-21 23:00 UTC (permalink / raw)
To: Hilton Chain; +Cc: 65034
Hi Hilton,
Hilton Chain <hako@ultrarare.space> 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
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH v2 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf.
2024-01-21 23:00 ` Maxim Cournoyer
@ 2024-01-25 17:10 ` Hilton Chain via Guix-patches via
0 siblings, 0 replies; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2024-01-25 17:10 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 65034
Hi Maxim,
On Mon, 22 Jan 2024 07:00:43 +0800,
Maxim Cournoyer wrote:
>
> Hi Hilton,
>
> Hilton Chain <hako@ultrarare.space> 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?
That's because of the go-github-com-quic-go-quic-go name change, I'll send v3.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH v3 core-updates 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0.
2023-08-03 8:46 [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
` (3 preceding siblings ...)
2023-09-24 2:39 ` [bug#65034] [PATCH v2 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
@ 2024-01-25 17:12 ` Hilton Chain via Guix-patches via
2024-01-25 17:13 ` [bug#65034] [PATCH v3 core-updates 1/3] " Hilton Chain via Guix-patches via
` (2 more replies)
2024-06-20 11:57 ` bug#65034: [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Sharlatan Hellseher
5 siblings, 3 replies; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2024-01-25 17:12 UTC (permalink / raw)
To: 65034; +Cc: Hilton Chain, Maxim Cournoyer
V2 -> V3:
- Rebase.
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 | 111 ++++++++++++++++++++++++++++++-------
gnu/packages/syncthing.scm | 4 +-
2 files changed, 93 insertions(+), 22 deletions(-)
base-commit: 0c2518949dc63948200c6c6d3649d34785a1d84c
--
2.41.0
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH v3 core-updates 1/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0.
2024-01-25 17:12 ` [bug#65034] [PATCH v3 core-updates 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
@ 2024-01-25 17:13 ` Hilton Chain via Guix-patches via
2024-01-25 17:13 ` [bug#65034] [PATCH v3 core-updates 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3 Hilton Chain via Guix-patches via
2024-01-25 17:13 ` [bug#65034] [PATCH v3 core-updates 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf Hilton Chain via Guix-patches via
2 siblings, 0 replies; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2024-01-25 17:13 UTC (permalink / raw)
To: 65034; +Cc: Hilton Chain, Maxim Cournoyer
* 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 e7306a585c..cb08ddae19 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8260,7 +8260,7 @@ (define-public go-github-com-golang-protobuf-proto
(define-public go-google-golang-org-protobuf
(package
(name "go-google-golang-org-protobuf")
- (version "1.28.0")
+ (version "1.31.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -8269,16 +8269,57 @@ (define-public go-google-golang-org-protobuf
(file-name (git-file-name name version))
(sha256
(base32
- "1nzcc4qc00afi24nb7nlnwyzvvr6b8s8qdrn1sw085nygh2y2x8r"))))
+ "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0"))))
(build-system go-build-system)
(arguments
(list #:import-path "google.golang.org/protobuf"
- #:tests? #f ; source-only package
- #:phases #~(modify-phases %standard-phases
- ;; source-only package
- (delete 'build))))
- (propagated-inputs (list go-github-com-google-go-cmp-cmp
- go-github-com-golang-protobuf-proto))
+ ;; XXX: Workaround for go-build-system's lack of Go modules support
+ #:phases
+ #~(let ((go-packages '("proto"
+ "encoding/protojson"
+ "encoding/prototext"
+ "encoding/protowire"
+ "reflect/protoreflect"
+ "reflect/protoregistry"
+ "reflect/protodesc"
+ "reflect/protopath"
+ "reflect/protorange"
+ "testing/protocmp"
+ "testing/protopack"
+ "testing/prototest"
+ "types/dynamicpb"
+ "types/known/anypb"
+ "types/known/timestamppb"
+ "types/known/durationpb"
+ "types/known/wrapperspb"
+ "types/known/structpb"
+ "types/known/fieldmaskpb"
+ "types/known/apipb"
+ "types/known/typepb"
+ "types/known/sourcecontextpb"
+ "types/known/emptypb"
+ "types/descriptorpb"
+ "types/pluginpb"
+ "compiler/protogen"
+ "cmd/protoc-gen-go")))
+ (modify-phases %standard-phases
+ (replace 'build
+ (lambda* (#:key import-path build-flags #:allow-other-keys)
+ (for-each
+ (lambda (pkg)
+ ((assoc-ref %standard-phases 'build)
+ #:import-path (format #f "~a/~a" import-path pkg)
+ #:build-flags build-flags))
+ go-packages)))
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (for-each
+ (lambda (pkg)
+ ((assoc-ref %standard-phases 'check)
+ #:tests? tests?
+ #:import-path (format #f "~a/~a" import-path pkg)))
+ go-packages)))))))
+ (propagated-inputs (list go-github-com-google-go-cmp-cmp))
(home-page "https://google.golang.org/protobuf")
(synopsis "Go library for Protocol Buffers")
(description
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH v3 core-updates 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3.
2024-01-25 17:12 ` [bug#65034] [PATCH v3 core-updates 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
2024-01-25 17:13 ` [bug#65034] [PATCH v3 core-updates 1/3] " Hilton Chain via Guix-patches via
@ 2024-01-25 17:13 ` Hilton Chain via Guix-patches via
2024-01-25 17:13 ` [bug#65034] [PATCH v3 core-updates 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf Hilton Chain via Guix-patches via
2 siblings, 0 replies; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2024-01-25 17:13 UTC (permalink / raw)
To: 65034; +Cc: Hilton Chain, Maxim Cournoyer
* 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 cb08ddae19..eaa2b7d305 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8235,7 +8235,7 @@ (define-public gotestsum
(define-public go-github-com-golang-protobuf-proto
(package
(name "go-github-com-golang-protobuf-proto")
- (version "1.3.1")
+ (version "1.5.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -8244,13 +8244,13 @@ (define-public go-github-com-golang-protobuf-proto
(file-name (git-file-name name version))
(sha256
(base32
- "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"))))
+ "03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/golang/protobuf/proto"
- #:unpack-path "github.com/golang/protobuf"
- ;; Requires unpackaged golang.org/x/sync/errgroup
- #:tests? #f))
+ #:unpack-path "github.com/golang/protobuf"))
+ (propagated-inputs
+ (list go-google-golang-org-protobuf))
(synopsis "Go support for Protocol Buffers")
(description "This package provides Go support for the Protocol Buffers
data serialization format.")
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#65034] [PATCH v3 core-updates 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf.
2024-01-25 17:12 ` [bug#65034] [PATCH v3 core-updates 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
2024-01-25 17:13 ` [bug#65034] [PATCH v3 core-updates 1/3] " Hilton Chain via Guix-patches via
2024-01-25 17:13 ` [bug#65034] [PATCH v3 core-updates 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3 Hilton Chain via Guix-patches via
@ 2024-01-25 17:13 ` Hilton Chain via Guix-patches via
2 siblings, 0 replies; 17+ messages in thread
From: Hilton Chain via Guix-patches via @ 2024-01-25 17:13 UTC (permalink / raw)
To: 65034; +Cc: Hilton Chain, Maxim Cournoyer
* gnu/packages/golang.scm (go-github-com-golang-protobuf-proto): Rename to...
(go-github-com-golang-protobuf): ... this.
[arguments]<#:import-path>: Set to "github.com/golang/protobuf".
<#:unpack-path>: Remove argument.
<#:phases>: Build all Go packages and run tests for them.
(go-github-com-quic-go-quic-go,go-github-com-prometheus-common)
(go-github-com-prometheus-client-golang,go-github-com-onsi-gomega)
[propagated-inputs]: Adjust accordingly.
* gnu/packages/syncthing.scm (go-github-com-prometheus-client-model)
(go-github-com-matttproud-golang-protobuf-extensions-pbutil)
[propagated-inputs]: Likewise.
Change-Id: I0efa2deaac2cb2bcd2c11f8791bdf320a56cf729
---
gnu/packages/golang.scm | 46 +++++++++++++++++++++++++++++++-------
gnu/packages/syncthing.scm | 4 ++--
2 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index eaa2b7d305..b90b31e7ac 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7477,7 +7477,7 @@ (define-public go-github-com-quic-go-quic-go
go-golang-org-x-crypto
go-github-com-cheekybits-genny
go-github-com-marten-seemann-chacha20
- go-github-com-golang-protobuf-proto
+ go-github-com-golang-protobuf
go-golang-org-x-crypto
go-golang-org-x-exp
go-golang-org-x-net
@@ -8232,9 +8232,9 @@ (define-public gotestsum
(home-page "https://github.com/gotestyourself/gotestsum")
(license license:asl2.0)))
-(define-public go-github-com-golang-protobuf-proto
+(define-public go-github-com-golang-protobuf
(package
- (name "go-github-com-golang-protobuf-proto")
+ (name "go-github-com-golang-protobuf")
(version "1.5.3")
(source (origin
(method git-fetch)
@@ -8247,8 +8247,38 @@ (define-public go-github-com-golang-protobuf-proto
"03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/golang/protobuf/proto"
- #:unpack-path "github.com/golang/protobuf"))
+ (list #:import-path "github.com/golang/protobuf"
+ ;; XXX: Workaround for go-build-system's lack of Go modules support
+ #:phases
+ #~(let ((go-packages '("proto"
+ "jsonpb"
+ "ptypes"
+ "ptypes/any"
+ "ptypes/empty"
+ "ptypes/timestamp"
+ "ptypes/duration"
+ "ptypes/wrappers"
+ "ptypes/struct"
+ "protoc-gen-go/descriptor"
+ "protoc-gen-go/plugin"
+ "protoc-gen-go")))
+ (modify-phases %standard-phases
+ (replace 'build
+ (lambda* (#:key import-path build-flags #:allow-other-keys)
+ (for-each
+ (lambda (pkg)
+ ((assoc-ref %standard-phases 'build)
+ #:import-path (format #f "~a/~a" import-path pkg)
+ #:build-flags build-flags))
+ go-packages)))
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (for-each
+ (lambda (pkg)
+ ((assoc-ref %standard-phases 'check)
+ #:tests? tests?
+ #:import-path (format #f "~a/~a" import-path pkg)))
+ go-packages)))))))
(propagated-inputs
(list go-google-golang-org-protobuf))
(synopsis "Go support for Protocol Buffers")
@@ -9893,7 +9923,7 @@ (define-public go-github-com-prometheus-common
;; Source-only package
(delete 'build))))
(propagated-inputs
- (list go-github-com-golang-protobuf-proto
+ (list go-github-com-golang-protobuf
go-github-com-matttproud-golang-protobuf-extensions-pbutil
go-github-com-prometheus-client-model))
(synopsis "Prometheus metrics")
@@ -9950,7 +9980,7 @@ (define-public go-github-com-prometheus-client-golang
(delete 'build))))
(propagated-inputs
(list go-github-com-beorn7-perks-quantile
- go-github-com-golang-protobuf-proto
+ go-github-com-golang-protobuf
go-github-com-prometheus-client-model
go-github-com-prometheus-common
go-github-com-prometheus-procfs
@@ -12679,7 +12709,7 @@ (define-public go-github-com-onsi-gomega
;; Unless we disable the tests, we have a circular dependency on
;; ginkgo/v2.
#:tests? #f))
- (propagated-inputs (list go-github-com-golang-protobuf-proto
+ (propagated-inputs (list go-github-com-golang-protobuf
go-golang-org-x-net
go-golang-org-x-sys
go-golang-org-x-text
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index c18b70eb4b..bc0960d379 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -831,7 +831,7 @@ (define-public go-github-com-prometheus-client-model
;; Source-only package
(delete 'build))))
(propagated-inputs
- (list go-github-com-golang-protobuf-proto))
+ (list go-github-com-golang-protobuf))
(synopsis "Data model artifacts for Prometheus")
(description "This package provides data model artifacts for Prometheus.")
(home-page "https://github.com/prometheus/client_model")
@@ -859,7 +859,7 @@ (define-public go-github-com-matttproud-golang-protobuf-extensions-pbutil
'(#:import-path "github.com/matttproud/golang_protobuf_extensions/pbutil"
#:unpack-path "github.com/matttproud/golang_protobuf_extensions"))
(propagated-inputs
- (list go-github-com-golang-protobuf-proto))
+ (list go-github-com-golang-protobuf))
(synopsis "Streaming Protocol Buffers in Go")
(description "This package provides various Protocol Buffer
extensions for the Go language, namely support for record length-delimited
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* bug#65034: [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0.
2023-08-03 8:46 [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
` (4 preceding siblings ...)
2024-01-25 17:12 ` [bug#65034] [PATCH v3 core-updates 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
@ 2024-06-20 11:57 ` Sharlatan Hellseher
5 siblings, 0 replies; 17+ messages in thread
From: Sharlatan Hellseher @ 2024-06-20 11:57 UTC (permalink / raw)
To: 65034-done
[-- Attachment #1: Type: text/plain, Size: 88 bytes --]
Hi,
Pushed as a5165940c6..91cbb4324f to wip-go-team with some modifications.
--
Oleg
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2024-06-20 11:59 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-03 8:46 [bug#65034] [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
2023-08-03 8:47 ` [bug#65034] [PATCH 1/3] " Hilton Chain via Guix-patches via
2023-09-05 13:49 ` [bug#65034] [PATCH 0/3] " Maxim Cournoyer
2023-09-23 13:43 ` Hilton Chain via Guix-patches via
2023-08-03 8:47 ` [bug#65034] [PATCH 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3 Hilton Chain via Guix-patches via
2023-08-03 8:47 ` [bug#65034] [PATCH 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf Hilton Chain via Guix-patches via
2023-09-24 2:39 ` [bug#65034] [PATCH v2 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
2023-09-24 2:39 ` [bug#65034] [PATCH v2 1/3] " Hilton Chain via Guix-patches via
2023-09-24 2:39 ` [bug#65034] [PATCH v2 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3 Hilton Chain via Guix-patches via
2023-09-24 2:39 ` [bug#65034] [PATCH v2 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf Hilton Chain via Guix-patches via
2024-01-21 23:00 ` Maxim Cournoyer
2024-01-25 17:10 ` Hilton Chain via Guix-patches via
2024-01-25 17:12 ` [bug#65034] [PATCH v3 core-updates 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Hilton Chain via Guix-patches via
2024-01-25 17:13 ` [bug#65034] [PATCH v3 core-updates 1/3] " Hilton Chain via Guix-patches via
2024-01-25 17:13 ` [bug#65034] [PATCH v3 core-updates 2/3] gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3 Hilton Chain via Guix-patches via
2024-01-25 17:13 ` [bug#65034] [PATCH v3 core-updates 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf Hilton Chain via Guix-patches via
2024-06-20 11:57 ` bug#65034: [PATCH 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0 Sharlatan Hellseher
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).