[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: gnu: gogoprotobuf: Consolidate packages.
|
From: |
guix-commits |
|
Subject: |
03/06: gnu: gogoprotobuf: Consolidate packages. |
|
Date: |
Thu, 17 Oct 2019 14:33:43 -0400 (EDT) |
lfam pushed a commit to branch wip-go-consolidation
in repository guix.
commit b6f4b282794d739e545a6d397c74984c38570536
Author: Leo Famulari <address@hidden>
Date: Thu Aug 15 17:35:21 2019 -0400
gnu: gogoprotobuf: Consolidate packages.
* gnu/packages/golang.scm (go-github-com-gogo-protobuf)[arguments]: Adjust
the #:import-path, and skip the tests and build phases.
(go-github-com-gogo-protobuf-protoc-gen-gogo,
go-github-com-gogo-protobuf-gogoproto, go-github-com-gogo-protobuf-proto):
Remove variables.
(go-github-com-libp2p-go-libp2p-crypto, go-github-com-libp2p-go-libp2p-peer,
go-github-com-libp2p-go-libp2p-metrics): Adjust accordingly.
* gnu/packages/ipfs.scm (go-github-com-ipfs-go-ipfs-api, gx, gx-go):
Likewise.
* gnu/packages/syncthing.scm (syncthing): Likewise.
---
gnu/packages/golang.scm | 94 +++++-----------------------------------------
gnu/packages/ipfs.scm | 6 +--
gnu/packages/syncthing.scm | 4 --
3 files changed, 12 insertions(+), 92 deletions(-)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f4ce35c..f27136c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1989,40 +1989,12 @@ and lookup requests. Browse requests are not supported
yet.")
"06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"))))
(build-system go-build-system)
(arguments
- `(#:import-path "github.com/gogo/protobuf/proto"
- #:unpack-path "github.com/gogo/protobuf"))
- (synopsis "Protocol Buffers for Go with Gadgets")
- (description "Gogoprotobuf is a fork of golang/protobuf with extra code
-generation features. This code generation is used to achieve:
-@itemize
-@item fast marshalling and unmarshalling
-@item more canonical Go structures
-@item goprotobuf compatibility
-@item less typing by optionally generating extra helper code
-@item peace of mind by optionally generating test and benchmark code
-@item other serialization formats
-@end itemize")
- (home-page "https://github.com/gogo/protobuf";)
- (license license:bsd-3)))
-
-(define-public go-github-com-gogo-protobuf-protoc-gen-gogo
- (package
- (name "go-github-com-gogo-protobuf-protoc-gen-gogo")
- (version "1.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gogo/protobuf";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/gogo/protobuf/protoc-gen-gogo"
- #:unpack-path "github.com/gogo/protobuf"
- #:tests? #f)) ; Requires the unpackaged 'protoc-min-version'
+ `(#:import-path "github.com/gogo/protobuf"
+ ; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'build))))
(synopsis "Protocol Buffers for Go with Gadgets")
(description "Gogoprotobuf is a fork of golang/protobuf with extra code
generation features. This code generation is used to achieve:
@@ -2037,54 +2009,6 @@ generation features. This code generation is used to
achieve:
(home-page "https://github.com/gogo/protobuf";)
(license license:bsd-3)))
-(define-public go-github-com-gogo-protobuf-gogoproto
- (package
- (name "go-github-com-gogo-protobuf-gogoproto")
- (version "1.2.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gogo/protobuf.git";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"))))
- (build-system go-build-system)
- (arguments
- '(#:unpack-path "github.com/gogo/protobuf"
- #:import-path "github.com/gogo/protobuf/gogoproto"))
- (home-page "https://github.com/gogo/protobuf";)
- (synopsis "Extensions to protocol buffers")
- (description "This package provides extensions to the Gogo protocol buffers
-implementation.")
- (license license:bsd-3)))
-
-(define-public go-github-com-gogo-protobuf-proto
- (package
- (name "go-github-com-gogo-protobuf-proto")
- (version "1.2.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gogo/protobuf.git";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"))))
- (build-system go-build-system)
- (arguments
- '(#:unpack-path "github.com/gogo/protobuf"
- #:import-path "github.com/gogo/protobuf/proto"))
- (home-page "https://github.com/gogo/protobuf";)
- (synopsis "Protocol buffers component")
- (description "This is a component of the Gogo protocol buffers
-implementation.")
- (license license:bsd-3)))
-
(define-public go-github-com-libp2p-go-flow-metrics
(let ((commit "7e5a55af485341567f98d6847a373eb5ddcdcd43")
(revision "0"))
@@ -2275,7 +2199,7 @@ Architecture Processors\" by J. Guilford et al.")
(native-inputs
`(("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
("go-github-com-btcsuite-btcd-btcec"
,go-github-com-btcsuite-btcd-btcec)
- ("go-github-com-gogo-protobuf-proto"
,go-github-com-gogo-protobuf-proto)
+ ("go-github-com-gogo-protobuf" ,go-github-com-gogo-protobuf)
("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd)))
(home-page
"https://github.com/libp2p/go-libp2p-crypto";)
@@ -2448,7 +2372,7 @@ required by Go's standard Hash interface.")
'(#:import-path "github.com/libp2p/go-libp2p-peer"))
(native-inputs
`(("go-github-com-libp2p-go-libp2p-crypto"
,go-github-com-libp2p-go-libp2p-crypto)
- ("go-github-com-gogo-protobuf-proto"
,go-github-com-gogo-protobuf-proto)
+ ("go-github-com-gogo-protobuf" ,go-github-com-gogo-protobuf)
("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd)
("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd)
("go-github-com-btcsuite-btcd-btcec"
,go-github-com-btcsuite-btcd-btcec)
@@ -2514,7 +2438,7 @@ required by Go's standard Hash interface.")
("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58)
("go-github-com-multiformats-go-multihash"
,go-github-com-multiformats-go-multihash)
("go-github-com-btcsuite-btcd-btcec"
,go-github-com-btcsuite-btcd-btcec)
- ("go-github-com-gogo-protobuf-proto"
,go-github-com-gogo-protobuf-proto)
+ ("go-github-com-gogo-protobuf" ,go-github-com-gogo-protobuf)
("go-github-com-gxed-hashland-keccakpg"
,go-github-com-gxed-hashland-keccakpg)
("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd)
("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd)
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 79323d8..39c2226 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -86,7 +86,7 @@ that are shared between @command{go-ipfs/commands} and its
rewrite
("go-github-com-multiformats-go-multiaddr"
,go-github-com-multiformats-go-multiaddr)
("go-github-com-multiformats-go-multiaddr-net"
,go-github-com-multiformats-go-multiaddr-net)
("go-github-com-btcsuite-btcd-btcec"
,go-github-com-btcsuite-btcd-btcec)
- ("go-github-com-gogo-protobuf-proto"
,go-github-com-gogo-protobuf-proto)
+ ("go-github-com-gogo-protobuf" ,go-github-com-gogo-protobuf)
("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd)
("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd)
("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58)
@@ -138,7 +138,7 @@ that are shared between @command{go-ipfs/commands} and its
rewrite
("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
("go-github-com-whyrusleeping-tar-utils"
,go-github-com-whyrusleeping-tar-utils)
("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec)
- ("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto)
+ ("go-github-com-gogo-protobuf" ,go-github-com-gogo-protobuf)
("go-github-com-sabhiram-go-gitignore"
,go-github-com-sabhiram-go-gitignore)
("go-github-com-urfave-cli" ,go-github-com-urfave-cli)
("go-github-com-whyrusleeping-json-filter"
,go-github-com-whyrusleeping-json-filter)
@@ -198,7 +198,7 @@ powerful and simple.")
("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
("go-github-com-whyrusleeping-tar-utils"
,go-github-com-whyrusleeping-tar-utils)
("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec)
- ("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto)
+ ("go-github-com-gogo-protobuf" ,go-github-com-gogo-protobuf)
("go-github-com-sabhiram-go-gitignore"
,go-github-com-sabhiram-go-gitignore)
("go-github-com-urfave-cli" ,go-github-com-urfave-cli)
("go-github-com-whyrusleeping-progmeter"
,go-github-com-whyrusleeping-progmeter)
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 0ba116f..d0ffe04 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -77,10 +77,6 @@
("go-golang-org-x-time" ,go-golang-org-x-time)
("go-gopkg.in-ldap.v2" ,go-gopkg.in-ldap.v2)
("go-github-com-gogo-protobuf" ,go-github-com-gogo-protobuf)
- ("go-github-com-gogo-protobuf-gogoproto"
- ,go-github-com-gogo-protobuf-gogoproto)
- ("go-github-com-gogo-protobuf-protoc-gen-gogo"
- ,go-github-com-gogo-protobuf-protoc-gen-gogo)
("go-github-com-prometheus-client-golang-prometheus"
,go-github-com-prometheus-client-golang-prometheus)
("go-github-com-shirou-gopsutil" ,go-github-com-shirou-gopsutil)
- branch wip-go-consolidation created (now dc7504e), guix-commits, 2019/10/17
- 01/06: gnu: Go: Update to 1.12.10., guix-commits, 2019/10/17
- 04/06: gnu: Qart: Consolidate packages., guix-commits, 2019/10/17
- 03/06: gnu: gogoprotobuf: Consolidate packages.,
guix-commits <=
- 06/06: gnu: Prometheus Go packages: Consolidate., guix-commits, 2019/10/17
- 05/06: gnu: go-github-com-chmduquesne-rollinghash: Remove extraneous comment., guix-commits, 2019/10/17
- 02/06: gnu: Go standard library 'x' packages: Consolidate., guix-commits, 2019/10/17