gnu: rust-blake2: Move to (gnu packages crates-crypto).

* gnu/packages/crates-io.scm (rust-blake2-0.10, rust-blake2-0.9,
rust-blake2-0.8, rust-blake2b-simd-1, rust-blake2b-simd-0.5,
rust-blakeout): Move from here ...
* gnu/packages/crates-crypto.scm: ... to here.

Change-Id: I9310bbd1e197f18a42929169a8b9cb6d9b73ed2f

2 files changed, 142 insertions, 140 deletions

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index f51fb986e9..399c0b5c58 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -1,10 +1,12 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
+;;; Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
 ;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
+;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2023 Steve George <steve@futurile.net>
 ;;; Copyright © 2023 VÖRÖSKŐI András <voroskoi@gmail.com>
@@ -413,6 +415,145 @@ This package is deprecated and was replaced by the @code{aes} crate.")
         ("rust-opaque-debug" ,rust-opaque-debug-0.2)
         ("rust-stream-cipher" ,rust-stream-cipher-0.3))))))
 
+(define-public rust-blake2-0.10
+  (package
+    (name "rust-blake2")
+    (version "0.10.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "blake2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zlf7w7gql12v61d9jcbbswa3dw8qxsjglylsiljp9f9b3a2ll26"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-digest" ,rust-digest-0.10))
+       #:cargo-development-inputs
+       (("rust-digest" ,rust-digest-0.10)
+        ("rust-hex-literal" ,rust-hex-literal-0.2))))
+    (home-page "https://github.com/RustCrypto/hashes")
+    (synopsis "BLAKE2 hash functions")
+    (description "This package provides BLAKE2 hash functions in Rust.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-blake2-0.9
+  (package
+    (inherit rust-blake2-0.10)
+    (name "rust-blake2")
+    (version "0.9.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "blake2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0x7i67c0hn3bzcwny08rgjrrnarqnqw10qpmh2blbx9hd78kfkha"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-crypto-mac" ,rust-crypto-mac-0.8)
+        ("rust-digest" ,rust-digest-0.9)
+        ("rust-opaque-debug" ,rust-opaque-debug-0.3))
+       #:cargo-development-inputs
+       (("rust-crypto-mac" ,rust-crypto-mac-0.8)
+        ("rust-digest" ,rust-digest-0.9)
+        ("rust-hex-literal" ,rust-hex-literal-0.2))))))
+
+(define-public rust-blake2-0.8
+  (package
+    (inherit rust-blake2-0.10)
+    (name "rust-blake2")
+    (version "0.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "blake2" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0c4k11j04kqhkci6i9b7lz6p13kpcv228pdqixgrawvavaq0gjwl"))))
+    (arguments
+     `(#:tests? #f      ; Not all tests compile.
+       #:cargo-inputs
+       (("rust-byte-tools" ,rust-byte-tools-0.3)
+        ("rust-crypto-mac" ,rust-crypto-mac-0.7)
+        ("rust-digest" ,rust-digest-0.8)
+        ("rust-opaque-debug" ,rust-opaque-debug-0.2))
+       #:cargo-development-inputs
+       (("rust-crypto-mac" ,rust-crypto-mac-0.7)
+        ("rust-digest" ,rust-digest-0.8)
+        ("rust-hex-literal" ,rust-hex-literal-0.1))))))
+
+(define-public rust-blake2b-simd-1
+  (package
+    (name "rust-blake2b-simd")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "blake2b_simd" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1g04mc4gf6jyymyj41749jhhplm3ymnc6z7rhkc1fqwclv4hsbrw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-arrayref" ,rust-arrayref-0.3)
+        ("rust-arrayvec" ,rust-arrayvec-0.7)
+        ("rust-constant-time-eq" ,rust-constant-time-eq-0.2))))
+    (home-page "https://github.com/oconnor663/blake2_simd")
+    (synopsis "Pure Rust BLAKE2b implementation with dynamic SIMD")
+    (description
+     "This package provides a pure Rust implementation of the BLAKE2b and
+BLAKE2bp hash functions.")
+    (license license:expat)))
+
+(define-public rust-blake2b-simd-0.5
+  (package
+    (inherit rust-blake2b-simd-1)
+    (name "rust-blake2b-simd")
+    (version "0.5.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "blake2b_simd" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "12icvk8ixlivv3jv5nyrg01sajp4s279zb1kmif0nfja4ms2vyyq"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-arrayref" ,rust-arrayref-0.3)
+        ("rust-arrayvec" ,rust-arrayvec-0.5)
+        ("rust-constant-time-eq" ,rust-constant-time-eq-0.1))))))
+
+(define-public rust-blakeout-0.3
+  (package
+    (name "rust-blakeout")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "blakeout" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dxcg3sjxd82mn7mq4ammrfpidqf9zsagvhfzgblsi8g4b2fgvw1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-blake2" ,rust-blake2-0.9)
+        ("rust-digest" ,rust-digest-0.9))))
+    (home-page "https://github.com/Revertron/Blakeout")
+    (synopsis "Memory hard hashing algorithm based on Blake2s")
+    (description "This package provides memory hard hashing algorithm
+based on Blake2s.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-botan-0.10
   (package
     (name "rust-botan")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 91fd2dc3b4..0b0009d4a6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7062,145 +7062,6 @@ streams in big-endian and little-endian formats.")
         ("rust-serde-test" ,rust-serde-test-1)
         ("rust-static-assertions" ,rust-static-assertions-1))))))
 
-(define-public rust-blake2-0.10
-  (package
-    (name "rust-blake2")
-    (version "0.10.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "blake2" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1zlf7w7gql12v61d9jcbbswa3dw8qxsjglylsiljp9f9b3a2ll26"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-digest" ,rust-digest-0.10))
-       #:cargo-development-inputs
-       (("rust-digest" ,rust-digest-0.10)
-        ("rust-hex-literal" ,rust-hex-literal-0.2))))
-    (home-page "https://github.com/RustCrypto/hashes")
-    (synopsis "BLAKE2 hash functions")
-    (description "This package provides BLAKE2 hash functions in Rust.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-blake2-0.9
-  (package
-    (inherit rust-blake2-0.10)
-    (name "rust-blake2")
-    (version "0.9.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "blake2" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0x7i67c0hn3bzcwny08rgjrrnarqnqw10qpmh2blbx9hd78kfkha"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-crypto-mac" ,rust-crypto-mac-0.8)
-        ("rust-digest" ,rust-digest-0.9)
-        ("rust-opaque-debug" ,rust-opaque-debug-0.3))
-       #:cargo-development-inputs
-       (("rust-crypto-mac" ,rust-crypto-mac-0.8)
-        ("rust-digest" ,rust-digest-0.9)
-        ("rust-hex-literal" ,rust-hex-literal-0.2))))))
-
-(define-public rust-blake2-0.8
-  (package
-    (inherit rust-blake2-0.10)
-    (name "rust-blake2")
-    (version "0.8.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "blake2" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0c4k11j04kqhkci6i9b7lz6p13kpcv228pdqixgrawvavaq0gjwl"))))
-    (arguments
-     `(#:tests? #f      ; Not all tests compile.
-       #:cargo-inputs
-       (("rust-byte-tools" ,rust-byte-tools-0.3)
-        ("rust-crypto-mac" ,rust-crypto-mac-0.7)
-        ("rust-digest" ,rust-digest-0.8)
-        ("rust-opaque-debug" ,rust-opaque-debug-0.2))
-       #:cargo-development-inputs
-       (("rust-crypto-mac" ,rust-crypto-mac-0.7)
-        ("rust-digest" ,rust-digest-0.8)
-        ("rust-hex-literal" ,rust-hex-literal-0.1))))))
-
-(define-public rust-blake2b-simd-1
-  (package
-    (name "rust-blake2b-simd")
-    (version "1.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "blake2b_simd" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1g04mc4gf6jyymyj41749jhhplm3ymnc6z7rhkc1fqwclv4hsbrw"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-arrayref" ,rust-arrayref-0.3)
-        ("rust-arrayvec" ,rust-arrayvec-0.7)
-        ("rust-constant-time-eq" ,rust-constant-time-eq-0.2))))
-    (home-page "https://github.com/oconnor663/blake2_simd")
-    (synopsis "Pure Rust BLAKE2b implementation with dynamic SIMD")
-    (description
-     "This package provides a pure Rust implementation of the BLAKE2b and
-BLAKE2bp hash functions.")
-    (license license:expat)))
-
-(define-public rust-blake2b-simd-0.5
-  (package
-    (inherit rust-blake2b-simd-1)
-    (name "rust-blake2b-simd")
-    (version "0.5.10")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "blake2b_simd" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "12icvk8ixlivv3jv5nyrg01sajp4s279zb1kmif0nfja4ms2vyyq"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-arrayref" ,rust-arrayref-0.3)
-        ("rust-arrayvec" ,rust-arrayvec-0.5)
-        ("rust-constant-time-eq" ,rust-constant-time-eq-0.1))))))
-
-(define-public rust-blakeout-0.3
-  (package
-    (name "rust-blakeout")
-    (version "0.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "blakeout" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0dxcg3sjxd82mn7mq4ammrfpidqf9zsagvhfzgblsi8g4b2fgvw1"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-blake2" ,rust-blake2-0.9)
-        ("rust-digest" ,rust-digest-0.9))))
-    (home-page "https://github.com/Revertron/Blakeout")
-    (synopsis "Memory hard hashing algorithm based on Blake2s")
-    (description "This package provides memory hard hashing algorithm
-based on Blake2s.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-blobby-0.3
   (package
     (name "rust-blobby")