summaryrefslogtreecommitdiff
path: root/gnu/packages/syncthing.scm
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2019-08-14 14:42:50 -0400
committerLeo Famulari <leo@famulari.name>2019-10-29 11:03:12 -0400
commit561d391ba8711049fea8eca25a1685b2a051b55c (patch)
tree656cb544b8f23b124509d81af4db8d46fcd2230d /gnu/packages/syncthing.scm
parentb98b3674ee1556db6c5f62fc377eebceb14ae5ad (diff)
downloadpatches-561d391ba8711049fea8eca25a1685b2a051b55c.tar
patches-561d391ba8711049fea8eca25a1685b2a051b55c.tar.gz
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.
Diffstat (limited to 'gnu/packages/syncthing.scm')
-rw-r--r--gnu/packages/syncthing.scm21
1 files changed, 6 insertions, 15 deletions
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 7e1d8df333..0ba116fd11 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.")