[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: gnu: Go standard library 'x' packages: Consolidate.
From: |
guix-commits |
Subject: |
02/06: gnu: Go standard library 'x' packages: Consolidate. |
Date: |
Thu, 17 Oct 2019 14:33:43 -0400 (EDT) |
lfam pushed a commit to branch wip-go-consolidation
in repository guix.
commit eaced2fe50f1751010a51b957d0abc894be99802
Author: Leo Famulari <address@hidden>
Date: Wed Aug 14 14:42:50 2019 -0400
gnu: Go standard library 'x' packages: Consolidate.
* gnu/packages/golang.scm (go-golang-org-x-text, go-golang-org-x-sys,
go-golang-org-x-net,
go-golang-org-x-time): New variables.
(go-golang.org-x-crypto-ssh-terminal, go-golang-org-x-crypto-bcrypt,
go-golang-org-x-crypto-blowfish, go-golang-org-x-crypto-pbkdf2,
go-golang-org-x-crypto-tea, go-golang-org-x-crypto-salsa20,
go-golang-org-x-crypto-cast5, go-golang-org-x-crypto-twofish,
go-golang-org-x-crypto-xtea, go-golang-org-x-crypto-ed25519,
go-golang-org-x-crypto-ripemd160, go-golang-org-x-crypto-blake2s,
go-golang-org-x-crypto-sha3, go-golang-org-x-text-encoding,
go-golang-org-x-text-transform, go-golang-org-x-text-unicode-norm,
go-golang-org-x-net-ipv4, go-golang-org-x-net-bpf,
go-golang-org-x-net-context,
go-golang-org-x-net-internal-socks, go-golang-org-x-net-internal-socket,
go-golang-org-x-net-internal-iana, go-golang-org-x-net-ipv6,
go-golang-org-x-net-proxy, go-golang-org-x-sys-cpu,
go-golang-org-x-sys-unix,
go-golang-org-x-time-rate): Remove variables.
(go-github-com-sirupsen-logrus, go-github-com-docker-distribution,
go-github-com-libp2p-go-libp2p-crypto,
go-github-com-multiformats-go-multihash,
go-github-com-libp2p-go-libp2p-peer,
go-github-com-libp2p-go-libp2p-metrics,
go-github-com-multiformats-go-multiaddr,
go-github-com-multiformats-go-multiaddr-net,
go-github-com-mattn-go-isatty, go-github-com-gdamore-encoding,
go-github-com-gdamore-tcell): Adjust accordingly.
* gnu/packages/docker.scm (docker-libnetwork-cmd-proxy): Likewise.
* gnu/packages/databases.scm (mongo-tools): Likewise.
* gnu/packages/ipfs.scm (go-github-com-ipfs-go-ipfs-api, gx, gx-go):
Likewise.
* gnu/packages/web.scm (poussetaches): Likewise.
* gnu/packages/terminals.scm (go-github-com-junegunn-fzf,
go-github.com-howeyc-gopass): Likewise.
(go-golang.org-x-crypto-ssh-terminal): Remove variable.
* gnu/packages/syncthing.scm (syncthing,
go-github-com-oschwald-geoip2-golang,
go-github-com-oschwald-maxminddb-golang,
go-github-com-syncthing-notify): Adjust accordingly.
* gnu/packages/linux.scm (go-netlink): Likewise.
---
gnu/packages/databases.scm | 2 +-
gnu/packages/docker.scm | 6 +-
gnu/packages/golang.scm | 519 ++++++---------------------------------------
gnu/packages/ipfs.scm | 12 +-
gnu/packages/linux.scm | 2 +-
gnu/packages/syncthing.scm | 21 +-
gnu/packages/terminals.scm | 42 +---
gnu/packages/web.scm | 2 +-
8 files changed, 78 insertions(+), 528 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f8e7256..0986436 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2932,7 +2932,7 @@ transforms idiomatic python function calls to well-formed
SQL queries.")
(native-inputs
`(("go-github.com-howeyc-gopass" ,go-github.com-howeyc-gopass)
("go-github.com-jessevdk-go-flags" ,go-github.com-jessevdk-go-flags)
- ("go-golang.org-x-crypto-ssh-terminal"
,go-golang.org-x-crypto-ssh-terminal)
+ ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
("go-gopkg.in-mgo.v2" ,go-gopkg.in-mgo.v2)
("go-gopkg.in-tomb.v2" ,go-gopkg.in-tomb.v2)
("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go)
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 28eff0a..6932544 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -291,9 +291,9 @@ the required network abstractions for applications.")
("logrus" ,go-github-com-sirupsen-logrus)
("go-netlink" ,go-netlink)
("go-netns" ,go-netns)
- ("go-golang-org-x-crypto-ssh-terminal"
- ,go-golang-org-x-crypto-ssh-terminal)
- ("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
+ ("go-golang-org-x-crypto"
+ ,go-golang-org-x-crypto)
+ ("go-golang-org-x-sys" ,go-golang-org-x-sys)))
(synopsis "Docker user-space proxy")
(description "A proxy running in the user space. It is used by the
built-in registry server of Docker.")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e17d19c..f4ce35c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -841,182 +841,18 @@ Go programming language.")
".*\\.gz$"))
#t)))))
(propagated-inputs
- `(("go-golang-org-x-sys-cpu" ,go-golang-org-x-sys-cpu)))
+ `(("go-golang-org-x-sys" ,go-golang-org-x-sys)))
(synopsis "Supplementary cryptographic libraries in Go")
(description "This package provides supplementary cryptographic libraries
for the Go language.")
(home-page "https://go.googlesource.com/crypto/")
(license license:bsd-3))))
-(define-public go-golang-org-x-crypto-bcrypt
- (let ((commit "b7391e95e576cacdcdd422573063bc057239113d")
- (revision "3"))
- (package
- (name "go-golang-org-x-crypto-bcrypt")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/crypto")
- (commit commit)))
- (file-name (string-append "go.googlesource.com-crypto-"
- version "-checkout"))
- (sha256
- (base32
- "1jqfh81mhgwcc6b9l0bs6rb0707s01qpvn7896i5bsmig46lc7zm"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/crypto/bcrypt"
- #:unpack-path "golang.org/x/crypto"))
- (synopsis "Bcrypt in Go")
- (description "This package provides a Go implementation of the bcrypt
-password hashing function.")
- (home-page "https://go.googlesource.com/crypto/")
- (license license:bsd-3))))
-
-(define-public go-golang-org-x-crypto-blowfish
- (package
- (inherit go-golang-org-x-crypto-bcrypt)
- (name "go-golang-org-x-crypto-blowfish")
- (arguments
- `(#:import-path "golang.org/x/crypto/blowfish"
- #:unpack-path "golang.org/x/crypto"))
- (synopsis "Blowfish in Go")
- (description "This package provides a Go implementation of the Blowfish
-symmetric-key block cipher.")))
-
-(define-public go-golang-org-x-crypto-pbkdf2
- (package
- (inherit go-golang-org-x-crypto-bcrypt)
- (name "go-golang-org-x-crypto-pbkdf2")
- (arguments
- `(#:import-path "golang.org/x/crypto/pbkdf2"
- #:unpack-path "golang.org/x/crypto"))
- (synopsis "PBKDF2 in Go")
- (description "This package provides a Go implementation of the PBKDF2 key
-derivation function.")))
-
-(define-public go-golang-org-x-crypto-tea
- (package
- (inherit go-golang-org-x-crypto-bcrypt)
- (name "go-golang-org-x-crypto-tea")
- (arguments
- `(#:import-path "golang.org/x/crypto/tea"
- #:unpack-path "golang.org/x/crypto"))
- (synopsis "Tiny Encryption Algorithm (TEA) in Go")
- (description "This package provides a Go implementation of the Tiny
Encryption
-Algorithm (TEA) block cipher.")))
-
-(define-public go-golang-org-x-crypto-salsa20
- (package
- (inherit go-golang-org-x-crypto-bcrypt)
- (name "go-golang-org-x-crypto-salsa20")
- (arguments
- `(#:import-path "golang.org/x/crypto/salsa20"
- #:unpack-path "golang.org/x/crypto"))
- (synopsis "Salsa20 in Go")
- (description "This package provides a Go implementation of the Salsa20
-stream cipher.")))
-
-(define-public go-golang-org-x-crypto-cast5
- (package
- (inherit go-golang-org-x-crypto-bcrypt)
- (name "go-golang-org-x-crypto-cast5")
- (arguments
- `(#:import-path "golang.org/x/crypto/cast5"
- #:unpack-path "golang.org/x/crypto"))
- (synopsis "Cast5 in Go")
- (description "This package provides a Go implementation of the Cast5
-symmetric-key block cipher.")))
-
-(define-public go-golang-org-x-crypto-twofish
- (package
- (inherit go-golang-org-x-crypto-bcrypt)
- (name "go-golang-org-x-crypto-twofish")
- (arguments
- `(#:import-path "golang.org/x/crypto/twofish"
- #:unpack-path "golang.org/x/crypto"))
- (synopsis "Twofish in Go")
- (description "This package provides a Go implementation of the Twofish
-symmetric-key block cipher.")))
-
-(define-public go-golang-org-x-crypto-xtea
- (package
- (inherit go-golang-org-x-crypto-bcrypt)
- (name "go-golang-org-x-crypto-xtea")
- (arguments
- `(#:import-path "golang.org/x/crypto/xtea"
- #:unpack-path "golang.org/x/crypto"))
- (synopsis "eXtended Tiny Encryption Algorithm (XTEA) in Go")
- (description "This package provides a Go implementation of the eXtended
-Tiny Encryption Algorithm (XTEA) block cipher.")))
-
-(define-public go-golang-org-x-crypto-ed25519
- (package
- (inherit go-golang-org-x-crypto-bcrypt)
- (name "go-golang-org-x-crypto-ed25519")
- (arguments
- `(#:import-path "golang.org/x/crypto/ed25519"
- #:unpack-path "golang.org/x/crypto"
- #:phases
- (modify-phases %standard-phases
- (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable
- (lambda* (#:key outputs #:allow-other-keys)
- (map (lambda (file)
- (make-file-writable file))
- (find-files
- (string-append (assoc-ref outputs "out")
- "/src/golang.org/x/crypto/ed25519/testdata")
- ".*\\.gz$"))
- #t)))))
- (synopsis "ED25519 in Go")
- (description "This package provides a Go implementation of the ED25519
-signature algorithm.")))
-
-(define-public go-golang-org-x-crypto-ripemd160
- (package
- (inherit go-golang-org-x-crypto-bcrypt)
- (name "go-golang-org-x-crypto-ripemd160")
- (arguments
- (substitute-keyword-arguments (package-arguments
go-golang-org-x-crypto-bcrypt)
- ((#:import-path _)
- "golang.org/x/crypto/ripemd160")))
- (synopsis "RIPEMD-160 in Go")
- (description "This package provides a Go implementation of the RIPEMD-160
-hash algorithm.")))
-
-(define-public go-golang-org-x-crypto-blake2s
- (package
- (inherit go-golang-org-x-crypto-bcrypt)
- (name "go-golang-org-x-crypto-blake2s")
- (arguments
- (substitute-keyword-arguments (package-arguments
go-golang-org-x-crypto-bcrypt)
- ((#:import-path _)
- "golang.org/x/crypto/blake2s")))
- (propagated-inputs
- `(("go-golang-org-x-sys-cpu" ,go-golang-org-x-sys-cpu)))
- (synopsis "BLAKE2s in Go")
- (description "This package provides a Go implementation of the BLAKE2s
-hash algorithm.")))
-
-(define-public go-golang-org-x-crypto-sha3
- (package
- (inherit go-golang-org-x-crypto-bcrypt)
- (name "go-golang-org-x-crypto-sha3")
- (arguments
- (substitute-keyword-arguments (package-arguments
go-golang-org-x-crypto-bcrypt)
- ((#:import-path _)
- "golang.org/x/crypto/sha3")))
- (synopsis "SHA-3 in Go")
- (description "This package provides a Go implementation of the SHA-3
-fixed-output-length hash functions and the SHAKE variable-output-length hash
-functions defined by FIPS-202.")))
-
-(define-public go-golang-org-x-net-ipv4
+(define-public go-golang-org-x-net
(let ((commit "d28f0bde5980168871434b95cfc858db9f2a7a99")
(revision "3"))
(package
- (name "go-golang-org-x-net-ipv4")
+ (name "go-golang-org-x-net")
(version (git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
@@ -1029,208 +865,22 @@ functions defined by FIPS-202.")))
"18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"))))
(build-system go-build-system)
(arguments
- `(#:import-path "golang.org/x/net/ipv4"
- #:unpack-path "golang.org/x/net"))
- (propagated-inputs
- `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
- (synopsis "Go IPv4 support")
- (description "This package provides @code{ipv4}, which implements
IP-level
-socket options for the Internet Protocol version 4.")
- (home-page "https://go.googlesource.com/net")
- (license license:bsd-3))))
-
-(define-public go-golang-org-x-net-bpf
- (let ((commit "d28f0bde5980168871434b95cfc858db9f2a7a99")
- (revision "3"))
- (package
- (name "go-golang-org-x-net-bpf")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/net")
- (commit commit)))
- (file-name (string-append "go.googlesource.com-net-"
- version "-checkout"))
- (sha256
- (base32
- "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/net/bpf"
- #:unpack-path "golang.org/x/net"))
- (propagated-inputs
- `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
- (synopsis "Berkeley Packet Filters (BPF) in Go")
- (description "This package provides a Go implementation of the Berkeley
-Packet Filter (BPF) virtual machine.")
- (home-page "https://go.googlesource.com/net/")
- (license license:bsd-3))))
-
-(define-public go-golang-org-x-net-context
- (let ((commit "d28f0bde5980168871434b95cfc858db9f2a7a99")
- (revision "3"))
- (package
- (name "go-golang-org-x-net-context")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/net")
- (commit commit)))
- (file-name (string-append "go.googlesource.com-net-"
- version "-checkout"))
- (sha256
- (base32
- "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/net/context"
- #:unpack-path "golang.org/x/net"))
- (synopsis "Golang Context type")
- (description "This package provides @code{context}, which defines the
-Context type, which carries deadlines, cancellation signals, and other
-request-scoped values across API boundaries and between processes.")
- (home-page "https://go.googlesource.com/net/")
- (license license:bsd-3))))
-
-(define-public go-golang-org-x-net-internal-socks
- (let ((commit "d28f0bde5980168871434b95cfc858db9f2a7a99")
- (revision "3"))
- (package
- (name "go-golang-org-x-net-internal-socks")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/net")
- (commit commit)))
- (file-name (string-append "go.googlesource.com-net-"
- version "-checkout"))
- (sha256
- (base32
- "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/net/internal/socks"
- #:unpack-path "golang.org/x/net"))
- (synopsis "")
- (description "")
- (home-page "https://go.googlesource.com/net/")
- (license license:bsd-3))))
-
-(define-public go-golang-org-x-net-internal-socket
- (let ((commit "d28f0bde5980168871434b95cfc858db9f2a7a99")
- (revision "3"))
- (package
- (name "go-golang-org-x-net-internal-socket")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/net")
- (commit commit)))
- (file-name (string-append "go.googlesource.com-net-"
- version "-checkout"))
- (sha256
- (base32
- "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/net/internal/socket"
- #:unpack-path "golang.org/x/net"))
- (propagated-inputs
- `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
- (synopsis "")
- (description "")
- (home-page "https://go.googlesource.com/net/")
- (license license:bsd-3))))
-
-(define-public go-golang-org-x-net-internal-iana
- (let ((commit "d28f0bde5980168871434b95cfc858db9f2a7a99")
- (revision "3"))
- (package
- (name "go-golang-org-x-net-internal-iana")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/net")
- (commit commit)))
- (file-name (string-append "go.googlesource.com-net-"
- version "-checkout"))
- (sha256
- (base32
- "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/net/internal/iana"
- #:unpack-path "golang.org/x/net"))
- (synopsis "Go support for assigned numbers (IANA)")
- (description "This package provides @code{iana}, which provides protocol
-number resources managed by the Internet Assigned Numbers Authority (IANA).")
- (home-page "https://go.googlesource.com/net/")
- (license license:bsd-3))))
-
-(define-public go-golang-org-x-net-ipv6
- (let ((commit "d28f0bde5980168871434b95cfc858db9f2a7a99")
- (revision "3"))
- (package
- (name "go-golang-org-x-net-ipv6")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/net")
- (commit commit)))
- (file-name (string-append "go.googlesource.com-net-"
- version "-checkout"))
- (sha256
- (base32
- "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/net/ipv6"
- #:unpack-path "golang.org/x/net"))
- (propagated-inputs
- `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
- (synopsis "Go IPv6 support")
- (description "This package provides @code{ipv6}, which implements
-IP-level socket options for the Internet Protocol version 6.")
- (home-page "https://go.googlesource.com/net")
- (license license:bsd-3))))
-
-(define-public go-golang-org-x-net-proxy
- (let ((commit "d28f0bde5980168871434b95cfc858db9f2a7a99")
- (revision "3"))
- (package
- (name "go-golang-org-x-net-proxy")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/net")
- (commit commit)))
- (file-name (string-append "go.googlesource.com-net-"
- version "-checkout"))
- (sha256
- (base32
- "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/net/proxy"
- #:unpack-path "golang.org/x/net/"))
- (synopsis "Go support for network proxies")
- (description "This package provides @code{proxy}, which provides support
-for a variety of protocols to proxy network data.")
+ `(#:import-path "golang.org/x/net"
+ ; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'build))))
+ (synopsis "Go supplemental networking libraries")
+ (description "This package provides supplemental Go networking
libraries.")
(home-page "https://go.googlesource.com/net")
(license license:bsd-3))))
-(define-public go-golang-org-x-sys-unix
+(define-public go-golang-org-x-sys
(let ((commit "04f50cda93cbb67f2afa353c52f342100e80e625")
(revision "4"))
(package
- (name "go-golang-org-x-sys-unix")
+ (name "go-golang-org-x-sys")
(version (git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
@@ -1243,28 +893,21 @@ for a variety of protocols to proxy network data.")
"0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw"))))
(build-system go-build-system)
(arguments
- `(#:import-path "golang.org/x/sys/unix"
- #:unpack-path "golang.org/x/sys"))
+ `(#:import-path "golang.org/x/sys"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'build))))
(synopsis "Go support for low-level system interaction")
- (description "This package provides @code{unix}, which offers Go support
-for low-level interaction with the operating system.")
+ (description "This package provides supplemental libraries offering Go
+support for low-level interaction with the operating system.")
(home-page "https://go.googlesource.com/sys")
(license license:bsd-3))))
-(define-public go-golang-org-x-sys-cpu
+(define-public go-golang-org-x-text
(package
- (inherit go-golang-org-x-sys-unix)
- (name "go-golang-org-x-sys-cpu")
- (arguments
- '(#:import-path "golang.org/x/sys/cpu"
- #:unpack-path "golang.org/x/sys"))
- (synopsis "CPU feature detection")
- (description "Thi spackage provides @code{cpu}, which offers tools for CPU
-feature detection in Go.")))
-
-(define-public go-golang-org-x-text-encoding
- (package
- (name "go-golang-org-x-text-encoding")
+ (name "go-golang-org-x-text")
(version "0.3.2")
(source (origin
(method git-fetch)
@@ -1278,45 +921,23 @@ feature detection in Go.")))
"0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"))))
(build-system go-build-system)
(arguments
- `(#:import-path "golang.org/x/text/encoding"
- #:unpack-path "golang.org/x/text"))
- (synopsis "Interface for character encodings for conversion to and from
-UTF-8")
- (description "This package defines an interface for character encodings.
-Specific implementations of encoding for CJK text as well as simple character
-encodings are provided in subpackages.")
+ `(#:import-path "golang.org/x/text"
+ ; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'build))))
+ (synopsis "Supplemental Go text processing libraries")
+ (description "This package provides supplemental Go libraries for text
+ processing.")
(home-page "https://go.googlesource.com/text")
(license license:bsd-3)))
-(define-public go-golang-org-x-text-transform
- (package
- (inherit go-golang-org-x-text-encoding)
- (name "go-golang-org-x-text-transform")
- (arguments
- `(#:import-path "golang.org/x/text/transform"
- #:unpack-path "golang.org/x/text"))
- (synopsis "Go text transformation")
- (description "This package provides @code{transform}, which provides
-reader and writer wrappers that transform the bytes passing through. Example
-transformations provided by other packages include normalization and conversion
-between character sets.")))
-
-(define-public go-golang-org-x-text-unicode-norm
- (package
- (inherit go-golang-org-x-text-encoding)
- (name "go-golang-org-x-text-unicode-norm")
- (arguments
- `(#:import-path "golang.org/x/text/unicode/norm"
- #:unpack-path "golang.org/x/text"))
- (synopsis "Unicode normalization in Go")
- (description "This package provides @code{norm}, which contains types and
-functions for normalizing Unicode strings.")))
-
-(define-public go-golang-org-x-time-rate
+(define-public go-golang-org-x-time
(let ((commit "6dc17368e09b0e8634d71cac8168d853e869a0c7")
(revision "1"))
(package
- (name "go-golang-org-x-time-rate")
+ (name "go-golang-org-x-time")
(version (git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
@@ -1329,29 +950,20 @@ functions for normalizing Unicode strings.")))
"1fx4cf5fpdz00g3c7vxzy92hdcg0vh4yqw00qp5s52j72qixynbk"))))
(build-system go-build-system)
(arguments
- `(#:import-path "golang.org/x/time/rate"
- #:unpack-path "golang.org/x/time"))
- (propagated-inputs
- `(("go-golang-org-x-net-context" ,go-golang-org-x-net-context)))
- (synopsis "Rate limiting in Go")
- (description "This package provides @{rate}, which implements rate
-limiting in Go.")
+ `(#:import-path "golang.org/x/time"
+ ; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'build))))
+; (propagated-inputs
+; `(("go-golang-org-x-net" ,go-golang-org-x-net)))
+ (synopsis "Supplemental Go time libraries")
+ (description "This package provides supplemental Go libraries related to
+time.")
(home-page "https://godoc.org/golang.org/x/time/rate")
(license license:bsd-3))))
-(define-public go-golang-org-x-crypto-ssh-terminal
- (package
- (inherit go-golang-org-x-crypto-bcrypt)
- (name "go-golang-org-x-crypto-ssh-terminal")
- (inputs
- `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
- (arguments
- `(#:import-path "golang.org/x/crypto/ssh/terminal"
- #:unpack-path "golang.org/x/crypto"))
- (synopsis "Terminal functions for Go")
- (description "This package provides @{terminal}, which implements support
-functions for dealing with terminals, as commonly found on UNIX systems.")))
-
(define-public go-github-com-burntsushi-toml
(package
(name "go-github-com-burntsushi-toml")
@@ -1740,12 +1352,11 @@ GNU extensions} to the POSIX recommendations for
command-line options.")
"0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"))))
(build-system go-build-system)
(native-inputs
- `(("go-golang-org-x-crypto-ssh-terminal"
- ,go-golang-org-x-crypto-ssh-terminal)
+ `(("go-golang-org-x-crypto"
+ ,go-golang-org-x-crypto)
("go-github-com-stretchr-testify"
,go-github-com-stretchr-testify)
- ("go-golang-org-x-sys-unix"
- ,go-golang-org-x-sys-unix)))
+ ("go-golang-org-x-sys" ,go-golang-org-x-sys)))
(arguments
'(#:tests? #f ;FIXME missing dependencies
#:import-path "github.com/sirupsen/logrus"))
@@ -1834,12 +1445,11 @@ SysVinit, and more.")
"1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6"))))
(build-system go-build-system)
(native-inputs
- `(("go-golang-org-x-sys-unix"
- ,go-golang-org-x-sys-unix)
+ `(("go-golang-org-x-sys" ,go-golang-org-x-sys)
("go-github-com-sirupsen-logrus"
,go-github-com-sirupsen-logrus)
- ("go-golang-org-x-crypto-ssh-terminal"
- ,go-golang-org-x-crypto-ssh-terminal)))
+ ("go-golang-org-x-crypto"
+ ,go-golang-org-x-crypto)))
(arguments
'(#:import-path "github.com/docker/distribution"
#:phases
@@ -2011,7 +1621,7 @@ values.")
"1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"))))
(build-system go-build-system)
(propagated-inputs
- `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
+ `(("go-golang-org-x-sys" ,go-golang-org-x-sys)))
(arguments
'(#:import-path "github.com/mattn/go-isatty"))
(home-page "https://github.com/mattn/go-isatty")
@@ -2663,7 +2273,7 @@ Architecture Processors\" by J. Guilford et al.")
(arguments
'(#:import-path "github.com/libp2p/go-libp2p-crypto"))
(native-inputs
- `(("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519)
+ `(("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-minio-sha256-simd" ,go-github-com-minio-sha256-simd)))
@@ -2811,8 +2421,7 @@ required by Go's standard Hash interface.")
("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-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
- ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s)
- ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3)))
+ ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)))
(home-page "https://github.com/multiformats/go-multihash")
(synopsis "Multihash implementation in Go")
(description "Multihash implementation in Go.")
@@ -2847,9 +2456,7 @@ required by Go's standard Hash interface.")
("go-github-com-multiformats-go-multihash"
,go-github-com-multiformats-go-multihash)
("go-github-com-gxed-hashland-keccakpg"
,go-github-com-gxed-hashland-keccakpg)
("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
- ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s)
- ("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519)
- ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3)))
+ ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)))
(home-page "https://github.com/libp2p/go-libp2p-peer")
(synopsis "PKI based identities for use in go-libp2p")
(description "PKI based identities for use in @command{go-libp2p}.")
@@ -2912,9 +2519,7 @@ required by Go's standard Hash interface.")
("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-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
- ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3)
- ("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519)
- ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s)))
+ ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)))
(home-page "https://github.com/libp2p/go-libp2p-metrics")
(synopsis "Connection wrapper for go-libp2p that provides bandwidth
metrics")
(description "A connection wrapper for @command{go-libp2p} that provides
bandwidth
@@ -2987,8 +2592,7 @@ cross-compilation.")
("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd)
("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58)
("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
- ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3)
- ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s)))
+ ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)))
(home-page "https://github.com/multiformats/go-multiaddr")
(synopsis "Composable and future-proof network addresses")
(description "Multiaddr is a standard way to represent addresses that
@@ -3032,8 +2636,7 @@ does the following:
("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd)
("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58)
("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
- ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3)
- ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s)))
+ ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)))
(home-page "https://github.com/multiformats/go-multiaddr-net")
(synopsis "Multiaddress net tools")
(description "This package provides Multiaddr specific versions of
@@ -3388,8 +2991,7 @@ colorspaces.")
(arguments
'(#:import-path "github.com/gdamore/encoding"))
(inputs
- `(("go-golang-org-x-text-encoding" ,go-golang-org-x-text-encoding)
- ("go-golang-org-x-text-transform" ,go-golang-org-x-text-transform)))
+ `(("go-golang-org-x-text" ,go-golang-org-x-text)))
(home-page "https://github.com/gdamore/encoding")
(synopsis "Provide encodings missing from Go")
(description "This package provides useful encodings not included in the
@@ -3430,8 +3032,7 @@ non-UTF-friendly sources.")
(inputs
`(("go-github.com-mattn-go-runewidth" ,go-github.com-mattn-go-runewidth)
("go-golang-org-colorful" ,go-golang-org-colorful)
- ("go-golang-org-x-text-encoding" ,go-golang-org-x-text-encoding)
- ("go-golang-org-x-text-transform" ,go-golang-org-x-text-transform)
+ ("go-golang-org-x-text" ,go-golang-org-x-text)
("go-github-com-gdamore-encoding" ,go-github-com-gdamore-encoding)))
(home-page "https://github.com/gdamore/tcell")
(synopsis "Provide a cell-based view for text terminals")
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 2dd2097..79323d8 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -91,9 +91,7 @@ that are shared between @command{go-ipfs/commands} and its
rewrite
("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd)
("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-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s)
- ("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519)
- ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3)
+ ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
("go-github-com-gxed-hashland-keccakpg"
,go-github-com-gxed-hashland-keccakpg)
("go-github-com-whyrusleeping-tar-utils"
,go-github-com-whyrusleeping-tar-utils)
@@ -146,9 +144,7 @@ that are shared between @command{go-ipfs/commands} and its
rewrite
("go-github-com-whyrusleeping-json-filter"
,go-github-com-whyrusleeping-json-filter)
("go-github-com-whyrusleeping-progmeter"
,go-github-com-whyrusleeping-progmeter)
("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump)
- ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s)
- ("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519)
- ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3)))
+ ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)))
(home-page "https://github.com/whyrusleeping/gx")
(synopsis "Package management tool using IPFS")
(description "@command{gx} is a packaging tool built around the
@@ -207,9 +203,7 @@ powerful and simple.")
("go-github-com-urfave-cli" ,go-github-com-urfave-cli)
("go-github-com-whyrusleeping-progmeter"
,go-github-com-whyrusleeping-progmeter)
("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump)
- ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s)
- ("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519)
- ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3)))
+ ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)))
(home-page "https://github.com/whyrusleeping/gx-go")
(synopsis "Golang subtool for the @command{gx} package manager")
(description "A subtool for the @command{gx} package manager for packages
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ad3c597..b0ec6fd 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5841,7 +5841,7 @@ management tools in userspace.")
(arguments
`(#:import-path "github.com/vishvananda/netlink"))
(native-inputs
- `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)
+ `(("go-golang-org-x-sys" ,go-golang-org-x-sys)
("go-netns" ,go-netns)))
(home-page "https://github.com/vishvananda/netlink")
(synopsis "Simple netlink library for Go")
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 7e1d8df..0ba116f 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -74,7 +74,7 @@
("go-github-com-syncthing-notify" ,go-github-com-syncthing-notify)
("go-github-com-syndtr-goleveldb" ,go-github-com-syndtr-goleveldb)
("go-github-com-thejerf-suture" ,go-github-com-thejerf-suture)
- ("go-golang-org-x-time-rate" ,go-golang-org-x-time-rate)
+ ("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"
@@ -84,17 +84,8 @@
("go-github-com-prometheus-client-golang-prometheus"
,go-github-com-prometheus-client-golang-prometheus)
("go-github-com-shirou-gopsutil" ,go-github-com-shirou-gopsutil)
- ("go-golang-org-x-net-bpf" ,go-golang-org-x-net-bpf)
- ("go-golang-org-x-net-internal-iana" ,go-golang-org-x-net-internal-iana)
- ("go-golang-org-x-net-internal-socket"
- ,go-golang-org-x-net-internal-socket)
- ("go-golang-org-x-net-internal-socks"
- ,go-golang-org-x-net-internal-socks)
- ("go-golang-org-x-net-ipv4" ,go-golang-org-x-net-ipv4)
- ("go-golang-org-x-net-ipv6" ,go-golang-org-x-net-ipv6)
- ("go-golang-org-x-net-proxy" ,go-golang-org-x-net-proxy)
- ("go-golang-org-x-text-unicode-norm" ,go-golang-org-x-text-unicode-norm)
- ("go-golang-org-x-text-transform" ,go-golang-org-x-text-transform)
+ ("go-golang-org-x-net" ,go-golang-org-x-net)
+ ("go-golang-org-x-text" ,go-golang-org-x-text)
("go-github-com-audriusbutkevicius-recli"
,go-github-com-audriusbutkevicius-recli)
("go-github-com-urfave-cli" ,go-github-com-urfave-cli)
@@ -461,7 +452,7 @@ database/sql package.")
(propagated-inputs
`(("go-github-com-oschwald-maxminddb-golang"
,go-github-com-oschwald-maxminddb-golang)
- ("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
+ ("go-golang-org-x-sys" ,go-golang-org-x-sys)))
(arguments
`(#:import-path "github.com/oschwald/geoip2-golang"
#:tests? #f)) ; Requires some unpackaged software and test data
@@ -488,7 +479,7 @@ GeoLite2 and GeoIP2 databases in Go.")
"1i6d935f3cv9djpjvc2ibh8aps8jqvg454b9pkwg2h98al759ggk"))))
(build-system go-build-system)
(propagated-inputs
- `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
+ `(("go-golang-org-x-sys" ,go-golang-org-x-sys)))
(arguments
`(#:import-path "github.com/oschwald/maxminddb-golang"
#:tests? #f)) ; Requires some unpackaged software and test data
@@ -811,7 +802,7 @@ using sh's word-splitting rules.")
(arguments
'(#:import-path "github.com/syncthing/notify"))
(propagated-inputs
- `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
+ `(("go-golang-org-x-sys" ,go-golang-org-x-sys)))
(synopsis "File system event notification library")
(description "This package provides @code{notify}, a file system event
notification library in Go.")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index cd40ce3..2208394 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -721,42 +721,6 @@ programmer to write text-based user interfaces.")
(home-page "https://github.com/nsf/termbox-go")
(license license:expat))))
-(define-public go-golang.org-x-crypto-ssh-terminal
- (let ((commit "c78caca803c95773f48a844d3dcab04b9bc4d6dd")
- (revision "0"))
- (package
- (name "go-golang.org-x-crypto-ssh-terminal")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/crypto")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0vxlfxr9y681yn2cfh6dbqmq35vvq4f45ay0mm31ffkny9cms0y4"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "golang.org/x/crypto/ssh/terminal"
- #:unpack-path "golang.org/x/crypto"
- #:phases
- (modify-phases %standard-phases
- (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable
- (lambda* (#:key outputs #:allow-other-keys)
- (map (lambda (file)
- (make-file-writable file))
- (find-files
- (string-append (assoc-ref outputs "out")
-
"/src/golang.org/x/crypto/ed25519/testdata")
- ".*\\.gz$"))
- #t)))))
- (synopsis "Support functions for dealing with terminals in Go")
- (description "@code{terminal} provides support functions for dealing
-with terminals in Go.")
- (home-page "https://go.googlesource.com/crypto/")
- (license license:bsd-3))))
-
(define-public go-github-com-junegunn-fzf
(package
(name "go-github-com-junegunn-fzf")
@@ -779,7 +743,7 @@ with terminals in Go.")
("go-github-com-mattn-go-shellwords" ,go-github-com-mattn-go-shellwords)
("go-github-com-mattn-go-isatty" ,go-github-com-mattn-go-isatty)
("go-github-com-gdamore-tcell" ,go-github-com-gdamore-tcell)
- ("go-golang-org-x-crypto-ssh-terminal"
,go-golang-org-x-crypto-ssh-terminal)))
+ ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)))
(home-page "https://github.com/junegunn/fzf")
(synopsis "Command-line fuzzy-finder")
(description "This package provides an interactive command-line filter
@@ -805,8 +769,8 @@ usable with any list--including files, command history,
processes and more.")
(arguments
'(#:import-path "github.com/howeyc/gopass"))
(propagated-inputs
- `(("go-golang.org-x-crypto-ssh-terminal"
- ,go-golang.org-x-crypto-ssh-terminal)))
+ `(("go-golang-org-x-crypto"
+ ,go-golang-org-x-crypto)))
(synopsis "Retrieve password from a terminal or piped input in Go")
(description
"@code{gopass} is a Go package for retrieving a password from user
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index f84214b..14c1506 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6775,7 +6775,7 @@ Anonip can also be uses as a Python module in your own
Python application.")
(build-system go-build-system)
(propagated-inputs
`(("go-github-com-robfig-cron" ,go-github-com-robfig-cron)
- ("go-golang-org-x-time-rate" ,go-golang-org-x-time-rate)))
+ ("go-golang-org-x-time" ,go-golang-org-x-time)))
(arguments
`(#:import-path "github.com/tsileo/poussetaches"))
(home-page "https://github.com/tsileo/poussetaches")
- 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, 2019/10/17
- 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 <=