diff options
| -rw-r--r-- | gnu/packages/golang-check.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/golang-web.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/golang-xyz.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/golang.scm | 25 | ||||
| -rw-r--r-- | gnu/packages/syncthing.scm | 2 |
5 files changed, 21 insertions, 12 deletions
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index f886b66c9f..dd0b71ff13 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -657,7 +657,7 @@ Gomega matcher library.") #:go go-1.21 #:import-path "github.com/onsi/gomega")) (propagated-inputs - (list go-github-com-golang-protobuf-proto + (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/golang-web.scm b/gnu/packages/golang-web.scm index a92f915826..e64f20801c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -919,7 +919,7 @@ language.") (arguments (list #:import-path "github.com/golang/groupcache")) (propagated-inputs - (list go-github-com-golang-protobuf-proto)) + (list go-github-com-golang-protobuf)) (home-page "https://github.com/golang/groupcache") (synopsis "Groupcache is a caching and cache-filling library") (description diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 44b3f54325..189a39b6fe 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -3413,7 +3413,7 @@ Pion}.") ;; 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") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e453a51fb2..6f267cbd0c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6229,23 +6229,32 @@ 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") + (name "go-github-com-golang-protobuf") (version "1.5.3") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/golang/protobuf") - (commit (string-append "v" version)))) + (url "https://github.com/golang/protobuf") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "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 + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (propagated-inputs (list go-google-golang-org-protobuf)) (synopsis "Go support for Protocol Buffers") @@ -7589,7 +7598,7 @@ formatting information, rather than the current locale name.") ;; 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") @@ -7647,7 +7656,7 @@ system, kernel, and process metrics from the @file{/proc} pseudo file system.") (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 diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index c698ba5247..5c68ab173a 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -260,7 +260,7 @@ notification library in Go.") #:import-path "github.com/matttproud/golang_protobuf_extensions/v2/pbutil" #:unpack-path "github.com/matttproud/golang_protobuf_extensions/v2")) (propagated-inputs - (list go-github-com-golang-protobuf-proto + (list go-github-com-golang-protobuf go-google-golang-org-protobuf)) (synopsis "Streaming Protocol Buffers in Go") (description "This package provides various Protocol Buffer |