Subject: [PATCH 6/41] gnu: rust-rbw: adding rust-subtle-2.4
From: Nicolas Graves <[email-masked]>
To: [email-masked]
Date: Fri, 07 Jan 2022 14:57:44 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

From 6354c1e0184467f40033274914601457cc969878 Mon Sep 17 00:00:00 2001
From: Nicolas Graves <[email-masked]>
Date: Fri, 7 Jan 2022 02:12:08 +0100
Subject: [PATCH 07/42] rust-rbw dependencies : adding rust-subtle-2.4

---
 gnu/packages/crates-io.scm | 43 ++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 61822ae431..0b21e290d7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1345,7 +1345,7 @@ (define-public rust-aes-gcm-0.6
         ("rust-aes" ,rust-aes-0.4)
         ("rust-block-cipher" ,rust-block-cipher-0.7)
         ("rust-ghash" ,rust-ghash-0.3)
-        ("rust-subtle" ,rust-subtle-2)
+        ("rust-subtle" ,rust-subtle-2.2)
         ("rust-zeroize" ,rust-zeroize-1.1))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
@@ -1379,7 +1379,7 @@ (define-public rust-aes-gcm-0.5
         ("rust-aes" ,rust-aes-0.3)
         ("rust-block-cipher-trait" ,rust-block-cipher-trait-0.6)
         ("rust-ghash" ,rust-ghash-0.2)
-        ("rust-subtle" ,rust-subtle-2)
+        ("rust-subtle" ,rust-subtle-2.2)
         ("rust-zeroize" ,rust-zeroize-1.1))))))
 
 (define-public rust-aes-soft-0.6
@@ -12841,7 +12841,7 @@ (define-public rust-crypto-mac-0.11
        (("rust-blobby" ,rust-blobby-0.3)
         ("rust-cipher" ,rust-cipher-0.3)
         ("rust-generic-array" ,rust-generic-array-0.14)
-        ("rust-subtle" ,rust-subtle-2))))
+        ("rust-subtle" ,rust-subtle-2.2))))
     (home-page "https://github.com/RustCrypto/traits")
     (synopsis "Trait for Message Authentication Code (MAC) algorithms")
     (description "This package provides trait for @dfn{Message Authentication
@@ -12867,7 +12867,7 @@ (define-public rust-crypto-mac-0.10
        (("rust-blobby" ,rust-blobby-0.3)
         ("rust-cipher" ,rust-cipher-0.2)
         ("rust-generic-array" ,rust-generic-array-0.14)
-        ("rust-subtle" ,rust-subtle-2))))))
+        ("rust-subtle" ,rust-subtle-2.2))))))
 
 (define-public rust-crypto-mac-0.8
   (package
@@ -12887,7 +12887,7 @@ (define-public rust-crypto-mac-0.8
      `(#:cargo-inputs
        (("rust-blobby" ,rust-blobby-0.1)
         ("rust-generic-array" ,rust-generic-array-0.14)
-        ("rust-subtle" ,rust-subtle-2))))))
+        ("rust-subtle" ,rust-subtle-2.2))))))
 
 (define-public rust-crypto-mac-0.7
   (package
@@ -13560,7 +13560,7 @@ (define-public rust-curve25519-dalek-3
          ("rust-packed-simd" ,rust-packed-simd-0.3)
          ("rust-rand-core" ,rust-rand-core-0.5)
          ("rust-serde" ,rust-serde-1)
-         ("rust-subtle" ,rust-subtle-2)
+         ("rust-subtle" ,rust-subtle-2.2)
          ("rust-zeroize" ,rust-zeroize-1.1))))
     (home-page "https://dalek.rs/curve25519-dalek")
     (synopsis "Group operations on ristretto255 and Curve25519")
@@ -16701,7 +16701,7 @@ (define-public rust-eax-0.3
          ("rust-cipher" ,rust-cipher-0.2)
          ("rust-cmac" ,rust-cmac-0.5)
          ("rust-ctr" ,rust-ctr-0.6)
-         ("rust-subtle" ,rust-subtle-2))))
+         ("rust-subtle" ,rust-subtle-2.2))))
     (home-page "https://docs.rs/eax/")
     (synopsis "Pure Rust implementation of the EAX Authenticated Encryption
 with Associated Data (AEAD)")
@@ -36926,7 +36926,7 @@ (define-public rust-pbkdf2-0.4
         ("rust-rand-core" ,rust-rand-core-0.5)
         ("rust-rayon" ,rust-rayon-1)
         ("rust-sha2" ,rust-sha2-0.9)
-        ("rust-subtle" ,rust-subtle-2))
+        ("rust-subtle" ,rust-subtle-2.2))
        #:cargo-development-inputs
        (("rust-hmac" ,rust-hmac-0.8)
         ("rust-sha-1" ,rust-sha-1-0.9)
@@ -47428,7 +47428,7 @@ (define-public rust-scrypt-0.3
         ("rust-rand" ,rust-rand-0.7)
         ("rust-rand-core" ,rust-rand-core-0.5)
         ("rust-sha2" ,rust-sha2-0.9)
-        ("rust-subtle" ,rust-subtle-2))))
+        ("rust-subtle" ,rust-subtle-2.2))))
     (home-page "https://github.com/RustCrypto/password-hashes")
     (synopsis "Scrypt password-based key derivation function")
     (description
@@ -53324,7 +53324,7 @@ (define-public rust-strum-macros-0.18
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-subtle-2
+(define-public rust-subtle-2.2
   (package
     (name "rust-subtle")
     (version "2.2.3")
@@ -53346,9 +53346,26 @@ (define-public rust-subtle-2
 cryptographic implementations.")
     (license license:bsd-3)))
 
+(define-public rust-subtle-2.4
+  (package
+    (inherit rust-subtle-2.2)
+    (name "rust-subtle")
+    (version "2.4.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "subtle" version))
+        (file-name
+         (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "00b6jzh9gzb0h9n25g06nqr90z3xzqppfhhb260s1hjhh4pg7pkb"))))
+    (arguments `(#:skip-build? #t))     ; FIXME rust-nightly
+    ))
+
 (define-public rust-subtle-1
   (package
-    (inherit rust-subtle-2)
+    (inherit rust-subtle-2.2)
     (name "rust-subtle")
     (version "1.0.0")
     (source
@@ -61486,7 +61503,7 @@ (define-public rust-universal-hash-0.4
     (arguments
      `(#:cargo-inputs
        (("rust-generic-array" ,rust-generic-array-0.14)
-        ("rust-subtle" ,rust-subtle-2))))
+        ("rust-subtle" ,rust-subtle-2.2))))
     (home-page "https://github.com/RustCrypto/traits")
     (synopsis "Trait for universal hash functions")
     (description "This package provides traits for universal hash functions.")
@@ -61508,7 +61525,7 @@ (define-public rust-universal-hash-0.3
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-generic-array" ,rust-generic-array-0.12)
-        ("rust-subtle" ,rust-subtle-2))))))
+        ("rust-subtle" ,rust-subtle-2.2))))))
 
 (define-public rust-unix-socket-0.5
   (package
-- 
2.34.0