From 9c359ff4455703536788d536e4e7cfb4ee285002 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Mar 2019 15:09:14 -0400 Subject: gnu: Remove the various Go union meta-packages. * gnu/packages/golang.scm (go-github-com-gogo-protobuf-union, go-golang-org-x-crypto-union): Remove variables. (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-xtea, go-golang-org-x-crypto-salsa20, go-golang-org-x-crypto-twofish,)[arguments]: Remove obsolete 'make-gzip-archive-writable' phase. (go-golang-org-x-crypto-ed25519)[arguments]: The phase 'make-gzip-archive-writable' belongs here now. (go-github-com-multiformats-go-multihash)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-blake2s and go-golang-org-x-crypto-sha3. (go-github-com-libp2p-go-libp2p-peer)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-blake2s, go-golang-org-x-crypto-ed25519, and go-golang-org-x-crypto-sha3. (go-github-com-libp2p-go-libp2p-metrics)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-sha3, go-golang-org-x-crypto-ed25519, and go-golang-org-x-crypto-blake2s. (go-github-com-multiformats-go-multiaddr)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-sha3 and go-golang-org-x-crypto-blake2s. (go-github-com-multiformats-go-multiaddr-net)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-sha3 and go-golang-org-x-crypto-blake2s. * gnu/packages/ipfs.scm (go-github-com-ipfs-go-ipfs-api)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-blake2s, go-golang-org-x-crypto-ed25519, and go-golang-org-x-crypto-sha3. (gx)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-blake2s, go-golang-org-x-crypto-ed25519, and go-golang-org-x-crypto-sha3. (gx-go)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-blake2s, go-golang-org-x-crypto-ed25519, and go-golang-org-x-crypto-sha3. * gnu/packages/syncthing.scm: Remove go-golang-org-x-text-union, go-golang-org-x-net-union, and go-github-com-vitrun-qart-union. --- gnu/packages/ipfs.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu/packages/ipfs.scm') diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 9d00c9c981..014272352f 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -91,7 +91,9 @@ 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-union" ,(go-golang-org-x-crypto-union)) + ("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-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) @@ -137,14 +139,16 @@ that are shared between @command{go-ipfs/commands} and its rewrite ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) ("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils) - ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)) ("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-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) ("go-github-com-whyrusleeping-progmeter" ,go-github-com-whyrusleeping-progmeter) - ("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump))) + ("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))) (home-page "https://github.com/whyrusleeping/gx") (synopsis "Package management tool using IPFS") (description "@command{gx} is a packaging tool built around the @@ -197,13 +201,15 @@ powerful and simple.") ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) ("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils) - ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)) ("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-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) - ("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump))) + ("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))) (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 -- cgit 1.4.1