[bug#68481] Update rbw to 1.9

[bug#68481] Update rbw to 1.9

[András Vöröskői]

Hi,

This series of patches update rbw to version 1.9. The master branch
version does not work at all. That has been updated to 1.8.3 in
`rust-team` branch, which also has a flaw
(https://github.com/doy/rbw/issues/145) which makes it unusable.

This was fixed in 1.9. The patchset is against the `rust-team` branch.

Thanks,

[bug#68481] [PATCH 01/32] gnu: rust-anstream: Update to 0.6.7.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-anstream): Update to 0.6.7.

Change-Id: If1c85bb59c783f2a2e363025e41662039fbeb9b6
---
 gnu/packages/crates-io.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5f12c4cce0..bb37447c2b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2066,14 +2066,14 @@ (define-public rust-ansi-parser-0.6
 (define-public rust-anstream-0.6
   (package
     (name "rust-anstream")
-    (version "0.6.4")
+    (version "0.6.7")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "anstream" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0i2a9390vwhc42c5njz38n56jfwg17v64nqw9232j9gb2sz1xf9a"))))
+        (base32 "1fkmc8vh3bwd5mycrkhzclax37yd4j374kdpj0lspyn179dl1ljc"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-1)
@@ -2084,6 +2084,7 @@ (define-public rust-anstream-0.6
                        ("rust-utf8parse" ,rust-utf8parse-0.2))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.5)
+        ("rust-lexopt" ,rust-lexopt-0.3)
         ("rust-owo-colors" ,rust-owo-colors-3)
         ("rust-proptest" ,rust-proptest-1)
         ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.2))))

base-commit: f57e7564c2eee8efd4c3735c4d9580ea342b6c6f
-- 
2.41.0

[bug#68481] [PATCH 02/32] gnu: Add rust-aws-lc-fips-sys-0.11.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-aws-lc-fips-sys): New variable.

Change-Id: Icf86143b6f7dd475193961f8cb9c05d954e63729
---
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bb37447c2b..f697cea1a7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5353,6 +5353,34 @@ (define-public rust-avro-rs-0.13
      "This package is a library for working with Apache Avro in Rust.")
     (license license:expat)))
 
+(define-public rust-aws-lc-fips-sys-0.11
+  (package
+    (name "rust-aws-lc-fips-sys")
+    (version "0.11.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "aws-lc-fips-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18fvkarjwqwsz13vgr866pmjpis4xrwd7qg0ilyrzvklsr5pjmhg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.69)
+                       ("rust-cmake" ,rust-cmake-0.1)
+                       ("rust-dunce" ,rust-dunce-1)
+                       ("rust-fs-extra" ,rust-fs-extra-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-paste" ,rust-paste-1))))
+    (home-page "https://github.com/aws/aws-lc-rs")
+    (synopsis
+     "AWS-LC is a general-purpose cryptographic library")
+    (description
+     "AWS-LC is a general-purpose cryptographic library maintained by the AWS
+Cryptography team for AWS and their customers.  This is the FIPS validated
+version of AWS-LC.")
+    (license (list license:isc license:asl2.0))))
+
 (define-public rust-az-1
   (package
     (name "rust-az")
-- 
2.41.0

[bug#68481] [PATCH 03/32] gnu: Add rust-aws-lc-sys-0.12.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-aws-lc-sys): New variable.

Change-Id: I170d66f60a7ec5542822a01089cb63721eebb4c4
---
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f697cea1a7..a536866c41 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5381,6 +5381,34 @@ (define-public rust-aws-lc-fips-sys-0.11
 version of AWS-LC.")
     (license (list license:isc license:asl2.0))))
 
+(define-public rust-aws-lc-sys-0.12
+  (package
+    (name "rust-aws-lc-sys")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "aws-lc-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0c93b7gw8r2w2r5s2iqya8n7m75ydn1vh0calb8bxlqvg94zkin2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.69)
+                       ("rust-cmake" ,rust-cmake-0.1)
+                       ("rust-dunce" ,rust-dunce-1)
+                       ("rust-fs-extra" ,rust-fs-extra-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-paste" ,rust-paste-1))))
+    (home-page "https://github.com/aws/aws-lc-rs")
+    (synopsis
+     "AWS-LC is a general-purpose cryptographic library")
+    (description
+     "AWS-LC is a general-purpose cryptographic library maintained by the AWS
+Cryptography team for AWS and their customers.  It is based on code from the
+Google @code{BoringSSL} project and the @code{OpenSSL} project.")
+    (license (list license:isc license:asl2.0))))
+
 (define-public rust-az-1
   (package
     (name "rust-az")
-- 
2.41.0

[bug#68481] [PATCH 03/32] gnu: Add rust-aws-lc-sys-0.12.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2348 bytes --]

We should try to unbundle aws-libcrypto. Generally if the crate has
'sys' in the name and uses cmake its because they're bundling code.

On Mon, Jan 15, 2024 at 08:28:30PM +0100, VÖRÖSKŐI András wrote:
> * gnu/packages/crates-io.scm (rust-aws-lc-sys): New variable.
> 
> Change-Id: I170d66f60a7ec5542822a01089cb63721eebb4c4
> ---
>  gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
> 
> diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
> index f697cea1a7..a536866c41 100644
> --- a/gnu/packages/crates-io.scm
> +++ b/gnu/packages/crates-io.scm
> @@ -5381,6 +5381,34 @@ (define-public rust-aws-lc-fips-sys-0.11
>  version of AWS-LC.")
>      (license (list license:isc license:asl2.0))))
>  
> +(define-public rust-aws-lc-sys-0.12
> +  (package
> +    (name "rust-aws-lc-sys")
> +    (version "0.12.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (crate-uri "aws-lc-sys" version))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32 "0c93b7gw8r2w2r5s2iqya8n7m75ydn1vh0calb8bxlqvg94zkin2"))))
> +    (build-system cargo-build-system)
> +    (arguments
> +     `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.69)
> +                       ("rust-cmake" ,rust-cmake-0.1)
> +                       ("rust-dunce" ,rust-dunce-1)
> +                       ("rust-fs-extra" ,rust-fs-extra-1)
> +                       ("rust-libc" ,rust-libc-0.2)
> +                       ("rust-paste" ,rust-paste-1))))
> +    (home-page "https://github.com/aws/aws-lc-rs")
> +    (synopsis
> +     "AWS-LC is a general-purpose cryptographic library")
> +    (description
> +     "AWS-LC is a general-purpose cryptographic library maintained by the AWS
> +Cryptography team for AWS and their customers.  It is based on code from the
> +Google @code{BoringSSL} project and the @code{OpenSSL} project.")
> +    (license (list license:isc license:asl2.0))))
> +
>  (define-public rust-az-1
>    (package
>      (name "rust-az")
> -- 
> 2.41.0
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#68481] [PATCH 03/32] gnu: Add rust-aws-lc-sys-0.12.

[András Vöröskői]

Hi,

On Thu, Jan 18, 2024 at 8:45 AM Efraim Flashner <efraim@flashner.co.il> wrote:
> We should try to unbundle aws-libcrypto. Generally if the crate has
> 'sys' in the name and uses cmake its because they're bundling code.

I have tried to do that, but failed. It is an optional dependency of
rustls and rustls-webpki, so I just removed it for now in v2 of the
patchset.

Thanks,

[bug#68481] [PATCH 04/32] gnu: Add rust-aws-lc-rs-1.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-aws-lc-rs): New variable.

Change-Id: Ic1f8485ef8524b68b0791eb35c8e47bdea0f637c
---
 gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a536866c41..0dc0e6c267 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5381,6 +5381,37 @@ (define-public rust-aws-lc-fips-sys-0.11
 version of AWS-LC.")
     (license (list license:isc license:asl2.0))))
 
+(define-public rust-aws-lc-rs-1
+  (package
+    (name "rust-aws-lc-rs")
+    (version "1.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "aws-lc-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dxsyspw79sxrrdpyq0sxk9ww659cx6zfsbsl3ypqgd56l5amhkv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-aws-lc-fips-sys" ,rust-aws-lc-fips-sys-0.11)
+                       ("rust-aws-lc-sys" ,rust-aws-lc-sys-0.12)
+                       ("rust-mirai-annotations" ,rust-mirai-annotations-1)
+                       ("rust-untrusted" ,rust-untrusted-0.7)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-clap" ,rust-clap-4)
+                                   ("rust-hex" ,rust-hex-0.4)
+                                   ("rust-lazy-static" ,rust-lazy-static-1)
+                                   ("rust-paste" ,rust-paste-1)
+                                   ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/awslabs/aws-lc-rs")
+    (synopsis "cryptographic library using AWS-LC for its cryptographic operations.")
+    (description
+     "A cryptographic library using AWS-LC for its cryptographic
+operations.  This library strives to be API-compatible with the popular Rust
+library named ring.")
+    (license (list license:isc license:asl2.0))))
+
 (define-public rust-aws-lc-sys-0.12
   (package
     (name "rust-aws-lc-sys")
-- 
2.41.0

[bug#68481] [PATCH 05/32] gnu: rust-clap-builder: Update to 4.4.16.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-clap-builder): Update to 4.4.16.

Change-Id: Id5c301d811f065ccb9ee90ad4f0c09e1d2c20e84
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0dc0e6c267..7d84fd0637 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12131,14 +12131,14 @@ (define-public rust-clap-2
 (define-public rust-clap-builder-4
   (package
     (name "rust-clap-builder")
-    (version "4.4.11")
+    (version "4.4.16")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "clap_builder" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1fxdsmw1ilgswz3lg2hjlvsdyyz04k78scjirlbd7c9bc83ba5m2"))))
+                "1fv06ivpzpkhjm4bvxzg3fl4y61mvlf481zms4pksq1iypbq5jsr"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
-- 
2.41.0

[bug#68481] [PATCH 06/32] gnu: rust-clap: Update to 4.4.16.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-clap): Update to 4.4.16.

Change-Id: I42c5f3bade44a387e5ea2beca4b7eec71b2d9c90
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7d84fd0637..cf59cdaf7a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12025,7 +12025,7 @@ (define-public rust-clap-derive-3
 (define-public rust-clap-4
   (package
     (name "rust-clap")
-    (version "4.4.11")
+    (version "4.4.16")
     (source
      (origin
        (method url-fetch)
@@ -12033,7 +12033,7 @@ (define-public rust-clap-4
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1wj5gb2fnqls00zfahg3490bdfc36d9cwpl80qjacb5jyrqzdbxz"))))
+         "0ialpybl8n8ybfikzy5f07d64pfdajls0s00bf4wgkh4q20liraq"))))
     (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
-- 
2.41.0

[bug#68481] [PATCH 07/32] gnu: rust-clap-complete: Update to 4.4.6.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-clap-complete): Update to 4.4.6.

Change-Id: Idc88f6feb62c97c3470878f71d8284d4599a7daa
---
 gnu/packages/crates-io.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cf59cdaf7a..65b16410f5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12169,24 +12169,25 @@ (define-public rust-clap-builder-4
 (define-public rust-clap-complete-4
   (package
     (name "rust-clap-complete")
-    (version "4.3.2")
+    (version "4.4.6")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "clap_complete" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "1khpx0fxmjh46s8354nn507ba4s9kfksiia6ambh9a419hrl7i2z"))))
+               (base32 "1kbz8f971x989cszfsbflb2j0g8ccy0zjqmnzcijzl3vanasmblp"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-clap" ,rust-clap-4)
-        ("rust-clap-lex" ,rust-clap-lex-0.5)
+        ("rust-clap-lex" ,rust-clap-lex-0.6)
         ("rust-is-executable" ,rust-is-executable-1)
         ("rust-pathdiff" ,rust-pathdiff-0.2)
         ("rust-shlex" ,rust-shlex-1)
         ("rust-unicode-xid" ,rust-unicode-xid-0.2))
        #:cargo-development-inputs
        (("rust-clap" ,rust-clap-4)
+        ("rust-completest" ,rust-completest-0.2)
         ("rust-snapbox" ,rust-snapbox-0.4)
         ("rust-trycmd" ,rust-trycmd-0.14))))
     (home-page "https://github.com/clap-rs/clap/tree/master/clap_complete")
-- 
2.41.0

[bug#68481] [PATCH 08/32] gnu: Add rust-completest-0.2.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-completest): New variable.

Change-Id: If7e32b5d2a5ee1c936bc9dcfa313db6f75279807
---
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 65b16410f5..68cf841923 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13210,6 +13210,34 @@ (define-public rust-const-fn-assert-0.1
     (description "Assertions for const functions.")
     (license license:expat)))
 
+(define-public rust-completest-0.2
+  (package
+    (name "rust-completest")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "completest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jzg2brz38qswcc134hdqwyx9jkpr78brpcccvcj772b7s39k0db"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-dunce" ,rust-dunce-1)
+                       ("rust-nu-cli" ,rust-nu-cli-0.88)
+                       ("rust-nu-cmd-lang" ,rust-nu-cmd-lang-0.88)
+                       ("rust-nu-command" ,rust-nu-command-0.88)
+                       ("rust-nu-parser" ,rust-nu-parser-0.88)
+                       ("rust-nu-protocol" ,rust-nu-protocol-0.88)
+                       ("rust-nu-test-support" ,rust-nu-test-support-0.88)
+                       ("rust-ptyprocess" ,rust-ptyprocess-0.4)
+                       ("rust-reedline" ,rust-reedline-0.27)
+                       ("rust-vt100" ,rust-vt100-0.15))))
+    (home-page "https://github.com/assert-rs/completest")
+    (synopsis "Run completions for your program")
+    (description "Run completions for your program")
+    (license (list license:expat license:asl2.0))))
+
 ;; This package requires features which are unavailable
 ;; on the stable releases of Rust.
 (define-public rust-compiler-builtins-0.1
-- 
2.41.0

[bug#68481] [PATCH 08/32] gnu: Add rust-completest-0.2.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2550 bytes --]

This package adds a bunch of dependencies on rust-nu-* but the
corresponding packages haven't been packaged yet so I wasn't able to
apply this patch.

On Mon, Jan 15, 2024 at 08:28:35PM +0100, VÖRÖSKŐI András wrote:
> * gnu/packages/crates-io.scm (rust-completest): New variable.
> 
> Change-Id: If7e32b5d2a5ee1c936bc9dcfa313db6f75279807
> ---
>  gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
> 
> diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
> index 65b16410f5..68cf841923 100644
> --- a/gnu/packages/crates-io.scm
> +++ b/gnu/packages/crates-io.scm
> @@ -13210,6 +13210,34 @@ (define-public rust-const-fn-assert-0.1
>      (description "Assertions for const functions.")
>      (license license:expat)))
>  
> +(define-public rust-completest-0.2
> +  (package
> +    (name "rust-completest")
> +    (version "0.2.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (crate-uri "completest" version))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32 "0jzg2brz38qswcc134hdqwyx9jkpr78brpcccvcj772b7s39k0db"))))
> +    (build-system cargo-build-system)
> +    (arguments
> +     `(#:cargo-inputs (("rust-dunce" ,rust-dunce-1)
> +                       ("rust-nu-cli" ,rust-nu-cli-0.88)
> +                       ("rust-nu-cmd-lang" ,rust-nu-cmd-lang-0.88)
> +                       ("rust-nu-command" ,rust-nu-command-0.88)
> +                       ("rust-nu-parser" ,rust-nu-parser-0.88)
> +                       ("rust-nu-protocol" ,rust-nu-protocol-0.88)
> +                       ("rust-nu-test-support" ,rust-nu-test-support-0.88)
> +                       ("rust-ptyprocess" ,rust-ptyprocess-0.4)
> +                       ("rust-reedline" ,rust-reedline-0.27)
> +                       ("rust-vt100" ,rust-vt100-0.15))))
> +    (home-page "https://github.com/assert-rs/completest")
> +    (synopsis "Run completions for your program")
> +    (description "Run completions for your program")
> +    (license (list license:expat license:asl2.0))))
> +
>  ;; This package requires features which are unavailable
>  ;; on the stable releases of Rust.
>  (define-public rust-compiler-builtins-0.1
> -- 
> 2.41.0
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#68481] [PATCH 08/32] gnu: Add rust-completest-0.2.

[András Vöröskői]

Hi,

On Thu, Jan 18, 2024 at 8:45 AM Efraim Flashner <efraim@flashner.co.il> wrote:
> This package adds a bunch of dependencies on rust-nu-* but the
> corresponding packages haven't been packaged yet so I wasn't able to
> apply this patch.

You are right, but I do not even use this crate, so I am not sure what
I was doing here, so it is removed in v2.

[bug#68481] [PATCH 09/32] gnu: rust-env-logger: Update to 0.10.1.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-env-logger): Update to 0.10.1.

Change-Id: Idbf902decfd60325ddc1ab117b3d50b6e8ad54a3
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 68cf841923..5c111950ea 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23421,14 +23421,14 @@ (define-public rust-enumset-derive-0.5
 (define-public rust-env-logger-0.10
   (package
     (name "rust-env-logger")
-    (version "0.10.0")
+    (version "0.10.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "env_logger" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1w797qgkrmqdacsbc0j6yvpnmvfc9lx6k8fm79rndkxci5mapkc5"))))
+        (base32 "1kmy9xmfjaqfvd4wkxr1f7d16ld3h9b487vqs2q9r0s8f3kg7cwm"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#68481] [PATCH 10/32] gnu: rust-hkdf: Update to 0.12.4.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-hkdf): Update to 0.12.4.

Change-Id: I14c474eecb5d2eaf6713296283c57743780111ca
---
 gnu/packages/crates-io.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5c111950ea..5b2dfbe77b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30684,23 +30684,22 @@ (define-public rust-hex-literal-impl-0.1
 (define-public rust-hkdf-0.12
   (package
     (name "rust-hkdf")
-    (version "0.12.3")
+    (version "0.12.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "hkdf" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0dyl16cf15hka32hv3l7dwgr3xj3brpfr27iyrbpdhlzdfgh46kr"))))
+        (base32 "1xxxzcarz151p1b858yn5skmhyrvn8fs4ivx5km3i1kjmnr8wpvv"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f      ; use of undeclared crate or module `sha1`
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-hmac" ,rust-hmac-0.12))
        #:cargo-development-inputs
        (("rust-blobby" ,rust-blobby-0.3)
         ("rust-hex-literal" ,rust-hex-literal-0.2)
-        ("rust-sha-1" ,rust-sha-1-0.10)
+        ("rust-sha1" ,rust-sha1-0.10)
         ("rust-sha2" ,rust-sha2-0.10))))
     (home-page "https://github.com/RustCrypto/KDFs/")
     (synopsis "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)")
-- 
2.41.0

[bug#68481] [PATCH 11/32] gnu: rust-is-terminal: Update to 0.4.10.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-is-terminal): Update to 0.4.10.

Change-Id: I996433ddb4d853dc3a27174abcc850c6f8c7e080
---
 gnu/packages/crates-io.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5b2dfbe77b..32dfe28734 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33764,20 +33764,20 @@ (define-public rust-is-executable-1
 (define-public rust-is-terminal-0.4
   (package
     (name "rust-is-terminal")
-    (version "0.4.9")
+    (version "0.4.10")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "is-terminal" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "12xgvc7nsrp3pn8hcxajfhbli2l5wnh3679y2fmky88nhj4qj26b"))))
+                "0m9la3f7cs77y85nkbcjsxkb7k861fc6bdhahyfidgh7gljh1b8b"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-hermit-abi" ,rust-hermit-abi-0.3)
         ("rust-rustix" ,rust-rustix-0.38)
-        ("rust-windows-sys" ,rust-windows-sys-0.48))
+        ("rust-windows-sys" ,rust-windows-sys-0.52))
        #:cargo-development-inputs
        (("rust-atty" ,rust-atty-0.2)
         ("rust-libc" ,rust-libc-0.2)
-- 
2.41.0

[bug#68481] [PATCH 12/32] gnu: rust-mio: Update to 0.8.10.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-mio): Update to 0.8.10.

Change-Id: Id4712fb45a90d12bb104d51d564f013cc3057bd4
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 32dfe28734..1c1372dab3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40586,14 +40586,14 @@ (define-public rust-mint-0.5
 (define-public rust-mio-0.8
   (package
     (name "rust-mio")
-    (version "0.8.8")
+    (version "0.8.10")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "mio" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1lhrdgcmcy8f0qy1n7357q0aprfkm5gld5mjcrp209pwsdf7cylj"))))
+        (base32 "02gyaxvaia9zzi4drrw59k9s0j6pa5d1y2kv7iplwjipdqlhngcg"))))
     (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
-- 
2.41.0

[bug#68481] [PATCH 13/32] gnu: Add rust-mirai-annotations-1.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-mirai-annotations): New variable.

Change-Id: Ia555b0f13d51854309638f03a3eb808ada9ebfcd
---
 gnu/packages/crates-io.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1c1372dab3..8e3a5c8cdf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40805,6 +40805,23 @@ (define-public rust-mio-uds-0.6
      "Unix domain socket bindings for mio.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-mirai-annotations-1
+  (package
+    (name "rust-mirai-annotations")
+    (version "1.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mirai-annotations" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lfkgarmzd7mdr739s9yidh0xhc9d3g4jjiwh246mwmkq5i0ign9"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/facebookexperimental/MIRAI")
+    (synopsis "Macros that provide source code annotations for MIRAI")
+    (description "Macros that provide source code annotations for MIRAI")
+    (license license:expat)))
+
 (define-public rust-mock-instant-0.2
   (package
     (name "rust-mock-instant")
-- 
2.41.0

[bug#68481] [PATCH 14/32] gnu: Add rust-rcgen-0.12.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-rcgen-0.12): New variable.

Change-Id: I3e37ab618be638896c622ce32e6ad13bb492af40
---
 gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8e3a5c8cdf..c268eb50df 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56394,6 +56394,48 @@ (define-public rust-rayon-core-1
     (description "This package provides core APIs for Rayon.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-rcgen-0.12
+  (package
+    (name "rust-rcgen")
+    (version "0.12.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rcgen" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0pfvmm1s8x12hiw810jv9ng1gnqnplh30xi6nw6mdix4qn08r4ax"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Don't use a vendored botan.
+                  (substitute* "Cargo.toml"
+                    ((".*vendored.*") ""))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-pem" ,rust-pem-3)
+        ("rust-ring" ,rust-ring-0.16)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-x509-parser" ,rust-x509-parser-0.15)
+        ("rust-yasna" ,rust-yasna-0.5)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-botan" ,rust-botan-0.10)
+        ("rust-openssl" ,rust-openssl-0.10)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rsa" ,rust-rsa-0.9)
+        ("rust-rustls-webpki" ,rust-rustls-webpki-0.101)
+        ("rust-x509-parser" ,rust-x509-parser-0.15))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list botan openssl))
+    (home-page "https://github.com/rustls/rcgen")
+    (synopsis "Rust X.509 certificate generator")
+    (description "Rust X.509 certificate generator.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rcgen-0.11
   (package
     (name "rust-rcgen")
-- 
2.41.0

[bug#68481] [PATCH 15/32] gnu: rust-rsa: Update to 0.9.6.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-rsa): Update to 0.9.6.

Change-Id: Icb90fcf37baa9330ae1e7de8513df3bd5deb60a6
---
 gnu/packages/crates-io.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c268eb50df..4c1417cbb5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59132,23 +59132,21 @@ (define-public rust-rowan-0.15
 (define-public rust-rsa-0.9
   (package
     (name "rust-rsa")
-    (version "0.9.2")
+    (version "0.9.6")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "rsa" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1a762gzj9xl14n8gmclsz8kcwp958nd1k05nnhqsdh93gns3pd3a"))))
+                "1z0d1aavfm0v4pv8jqmqhhvvhvblla1ydzlvwykpc3mkzhj523jx"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-byteorder" ,rust-byteorder-1)
-        ("rust-const-oid" ,rust-const-oid-0.9)
+       (("rust-const-oid" ,rust-const-oid-0.9)
         ("rust-digest" ,rust-digest-0.10)
         ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.8)
         ("rust-num-integer" ,rust-num-integer-0.1)
-        ("rust-num-iter" ,rust-num-iter-0.1)
         ("rust-num-traits" ,rust-num-traits-0.2)
         ("rust-pkcs1" ,rust-pkcs1-0.7)
         ("rust-pkcs8" ,rust-pkcs8-0.10)
-- 
2.41.0

[bug#68481] [PATCH 16/32] gnu: rust-serde-repr: Update to 0.1.18.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-serde-repr): Update to 0.1.18.

Change-Id: I27216b4027f40165a6f29cfb143197a2828d7c82
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4c1417cbb5..d30b389187 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64431,14 +64431,14 @@ (define-public rust-serde-regex-1
 (define-public rust-serde-repr-0.1
   (package
     (name "rust-serde-repr")
-    (version "0.1.16")
+    (version "0.1.18")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde_repr" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "005x2q9x6cdqp312mjhggbzd6vkg8r0abcg0biz0z9dkmpgy29c7"))))
+        (base32 "1nyzz7ph9nwmjrx6f7s37m9y7y5gc10f4vjxnqkgfgcxbsa6nbhb"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#68481] [PATCH 17/32] gnu: rust-socket2: Update to 0.5.5.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-socket2-0.5): Update to 0.5.5.

Change-Id: Ie76135474f88276dd5606bfc787eb1d4aab457e2
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d30b389187..7ac14fdce6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68134,14 +68134,14 @@ (define-public rust-snappy-cpp-0.1
 (define-public rust-socket2-0.5
   (package
     (name "rust-socket2")
-    (version "0.5.4")
+    (version "0.5.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "socket2" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "17lqx8w2b3nysrkdbdz8y7fkikz5v77c052q57lxwajmxchfhca0"))))
+        (base32 "1sgq315f1njky114ip7wcy83qlphv9qclprfjwvxcpfblmcsqpvv"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#68481] [PATCH 18/32] gnu: rust-spki: Update to 0.7.3.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-spki): Update to 0.7.3.

Change-Id: I3f235a3ce4c041ba7c6e81fe503e53ea03329d75
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7ac14fdce6..a58f22b88f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68531,14 +68531,14 @@ (define-public rust-spirv-std-0.4
 (define-public rust-spki-0.7
   (package
     (name "rust-spki")
-    (version "0.7.2")
+    (version "0.7.3")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "spki" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0jhq00sv4w3psdi6li3vjjmspc6z2d9b1wc1srbljircy1p9j7lx"))))
+                "17fj8k5fmx4w9mp27l970clrh5qa7r5sjdvbsln987xhb34dc7nr"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#68481] [PATCH 19/32] gnu: rust-subtle: Update to 2.5.0.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-subtle): Update to 2.5.0.

Change-Id: I9ac3f4f80387cb7a5a4c3d33cf5e8059cd90d103
---
 gnu/packages/crates-io.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a58f22b88f..7a800d3608 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70685,7 +70685,7 @@ (define-public rust-subprocess-0.2
 (define-public rust-subtle-2
   (package
     (name "rust-subtle")
-    (version "2.4.1")
+    (version "2.5.0")
     (source
      (origin
        (method url-fetch)
@@ -70694,10 +70694,10 @@ (define-public rust-subtle-2
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "00b6jzh9gzb0h9n25g06nqr90z3xzqppfhhb260s1hjhh4pg7pkb"))))
+         "1g2yjs7gffgmdvkkq0wrrh0pxds3q0dv6dhkw9cdpbib656xdkc1"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-development-inputs (("rust-rand" ,rust-rand-0.7))))
+     `(#:cargo-development-inputs (("rust-rand" ,rust-rand-0.8))))
     (home-page "https://dalek.rs/")
     (synopsis
      "Pure-Rust traits and utilities for cryptographic implementations")
-- 
2.41.0

[bug#68481] [PATCH 20/32] gnu: rust-thiserror-impl: Update to 1.0.56.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-thiserror-impl): Update to 1.0.56.

Change-Id: Iad34b705596c8369d745b18c2bc02743509e3be9
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7a800d3608..11cf6a9a63 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -74679,14 +74679,14 @@ (define-public rust-thiserror-core-impl-1
 (define-public rust-thiserror-impl-1
   (package
     (name "rust-thiserror-impl")
-    (version "1.0.50")
+    (version "1.0.56")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "thiserror-impl" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1f0lmam4765sfnwr4b1n00y14vxh10g0311mkk0adr80pi02wsr6"))))
+        (base32 "0w9ldp8fa574ilz4dn7y7scpcq66vdjy59qal8qdpwsh7faal3zs"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#68481] [PATCH 21/32] gnu: rust-thiserror: Update to 1.0.56.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-thiserror): Update to 1.0.56.

Change-Id: I1d0e17b0dfbc0fef546955ff35dc3560a7d5dd98
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 11cf6a9a63..263cc3fb19 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -74609,14 +74609,14 @@ (define-public rust-thin-slice-0.1
 (define-public rust-thiserror-1
   (package
     (name "rust-thiserror")
-    (version "1.0.50")
+    (version "1.0.56")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "thiserror" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1ll2sfbrxks8jja161zh1pgm3yssr7aawdmaa2xmcwcsbh7j39zr"))))
+        (base32 "1b9hnzngjan4d89zjs16i01bcpcnvdwklyh73lj16xk28p37hhym"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#68481] [PATCH 22/32] gnu: rust-zeroize: Update to 1.7.0.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-zeroize): Update to 1.7.0.

Change-Id: I7d992edf041a6daf896bc0ce8a8c1354a3e49d52
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 263cc3fb19..868231af25 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -84907,14 +84907,14 @@ (define-public rust-zerocopy-derive-0.2
 (define-public rust-zeroize-1
   (package
     (name "rust-zeroize")
-    (version "1.6.0")
+    (version "1.7.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "zeroize" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1ndar43r58zbmasjhrhgas168vxb4i0rwbkcnszhjybwpbqmc29a"))))
+        (base32 "0bfvby7k9pdp6623p98yz2irqnamcyzpn7zh20nqmdn68b0lwnsj"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#68481] [PATCH 23/32] gnu: Add rust-rustls-webpki-0.102.

[VÖRÖSKŐI András]

* gnu/packages/crates-tls.scm (rust-rustls-webpki-0.102): New variable.

Change-Id: I916376fa7a46022b1b2e7b21d938adc94267717a
---
 gnu/packages/crates-tls.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 8b246336a1..fadc4e6888 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -542,6 +542,36 @@ (define-public rust-rustls-pki-types-1
     (description "Shared types for the rustls PKI ecosystem.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rustls-webpki-0.102
+  (package
+    (name "rust-rustls-webpki")
+    (version "0.102.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rustls-webpki" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nz9d3xhy8cg6anmvq64scyiva8bglrc6j3v6bdxw2f96xha4k7g"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs (("rust-aws-lc-rs" ,rust-aws-lc-rs-1)
+                       ("rust-ring" ,rust-ring-0.17)
+                       ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+                       ("rust-untrusted" ,rust-untrusted-0.9))
+       #:cargo-development-inputs (("rust-base64" ,rust-base64-0.21)
+                                   ("rust-bencher" ,rust-bencher-0.1)
+                                   ("rust-bzip2" ,rust-bzip2-0.4)
+                                   ("rust-once-cell" ,rust-once-cell-1)
+                                   ("rust-rcgen" ,rust-rcgen-0.12)
+                                   ("rust-serde" ,rust-serde-1)
+                                   ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/rustls/webpki")
+    (synopsis "Web PKI X.509 Certificate Verification")
+    (description "Web PKI X.509 Certificate Verification.")
+    (license license:isc)))
+
 (define-public rust-rustls-webpki-0.101
   (package
     (name "rust-rustls-webpki")
-- 
2.41.0

[bug#68481] [PATCH 24/32] gnu: Add rust-rustls-native-certs-0.7.

[VÖRÖSKŐI András]

* gnu/packages/crates-tls.scm (rust-rustls-native-certs): New variable.

Change-Id: Ic66c11b391be69929d0884a060d9a3bcdbfd3406
---
 gnu/packages/crates-tls.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index fadc4e6888..ec4d6342cd 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -386,6 +386,37 @@ (define-public rust-rustls-ffi-0.8
     (description "Rustls bindings for non-Rust languages")
     (license (list license:asl2.0 license:isc license:expat))))
 
+(define-public rust-rustls-native-certs-0.7
+  (package
+    (name "rust-rustls-native-certs")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rustls-native-certs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14ip15dcr6fmjzi12lla9cpln7mmkdid4a7wsp344v4kz9gbh7wg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-openssl-probe" ,rust-openssl-probe-0.1)
+                       ("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
+                       ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+                       ("rust-schannel" ,rust-schannel-0.1)
+                       ("rust-security-framework" ,rust-security-framework-2))
+       #:cargo-development-inputs (("rust-ring" ,rust-ring-0.16)
+                                   ("rust-rustls" ,rust-rustls-0.22)
+                                   ("rust-rustls-webpki" ,rust-rustls-webpki-0.102)
+                                   ("rust-serial-test" ,rust-serial-test-2)
+                                   ("rust-untrusted" ,rust-untrusted-0.7)
+                                   ("rust-webpki-roots" ,rust-webpki-roots-0.26)
+                                   ("rust-x509-parser" ,rust-x509-parser-0.15))))
+    (home-page "https://github.com/ctz/rustls-native-certs")
+    (synopsis "Use the platform native certificate store with rustls")
+    (description "@code{rustls-native-certs} allows rustls to use the platform
+native certificate store.")
+    (license (list license:asl2.0 license:isc license:expat))))
+
 (define-public rust-rustls-native-certs-0.6
   (package
     (name "rust-rustls-native-certs")
-- 
2.41.0

[bug#68481] [PATCH 25/32] gnu: Add rust-rustls-0.22.

[VÖRÖSKŐI András]

* gnu/packages/crates-tls.scm (rust-rustls-0.22): New variable.

Change-Id: Idbf98162adc353d1247f6d66a7c0cca2d09225df
---
 gnu/packages/crates-tls.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index ec4d6342cd..851d24e8ed 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -131,6 +131,39 @@ (define-public rust-native-tls-0.2
 implementation.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rustls-0.22
+  (package
+    (name "rust-rustls")
+    (version "0.22.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rustls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hcxyhq6ynvws9v5b2h81s1nwmijmya7a3vyyyhsy1wqpmb9jz78"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-aws-lc-rs" ,rust-aws-lc-rs-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-ring" ,rust-ring-0.17)
+                       ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+                       ("rust-rustls-webpki" ,rust-rustls-webpki-0.102)
+                       ("rust-rustversion" ,rust-rustversion-1)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-base64" ,rust-base64-0.21)
+                                   ("rust-bencher" ,rust-bencher-0.1)
+                                   ("rust-env-logger" ,rust-env-logger-0.10)
+                                   ("rust-log" ,rust-log-0.4)
+                                   ("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
+                                   ("rust-webpki-roots" ,rust-webpki-roots-0.26))))
+    (home-page "https://github.com/rustls/rustls")
+    (synopsis "Modern TLS library written in Rust")
+    (description
+     "This package provides a modern TLS library written in Rust.")
+    (license (list license:asl2.0 license:isc license:expat))))
+
 (define-public rust-rustls-0.21
   (package
     (name "rust-rustls")
-- 
2.41.0

[bug#68481] [PATCH 26/32] gnu: Add rust-webpki-roots-0.26.

[VÖRÖSKŐI András]

* gnu/packages/crates-web.scm (rust-webpki-roots-0.26): New variable.

Change-Id: I3bd62f0ae0fbf08282bb8bee9b0e1c09dc1ee6e8
---
 gnu/packages/crates-web.scm | 42 +++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index ed94c526e8..4ca784b8a7 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3617,6 +3617,48 @@ (define-public rust-webpki-0.18
        #:cargo-development-inputs
        (("rust-base64" ,rust-base64-0.9))))))
 
+(define-public rust-webpki-roots-0.26
+  (package
+    (name "rust-webpki-roots")
+    (version "0.26.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "webpki-roots" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1221q07j5sv23bmwv8my49hdax70dwzdpsnjgrdbw88gk3dczqhd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             ;; This test wants network access.
+             "--skip=generated_code_is_fresh")
+       #:cargo-inputs (("rust-rustls-pki-types" ,rust-rustls-pki-types-1))
+       #:cargo-development-inputs (("rust-chrono" ,rust-chrono-0.4)
+                                   ("rust-csv" ,rust-csv-1)
+                                   ("rust-hex" ,rust-hex-0.4)
+                                   ("rust-num-bigint" ,rust-num-bigint-0.4)
+                                   ("rust-percent-encoding" ,rust-percent-encoding-2)
+                                   ("rust-rcgen" ,rust-rcgen-0.11)
+                                   ("rust-reqwest" ,rust-reqwest-0.11)
+                                   ("rust-ring" ,rust-ring-0.17)
+                                   ("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
+                                   ("rust-rustls-webpki" ,rust-rustls-webpki-0.102)
+                                   ("rust-serde" ,rust-serde-1)
+                                   ("rust-tokio" ,rust-tokio-1)
+                                   ("rust-x509-parser" ,rust-x509-parser-0.15)
+                                   ("rust-yasna" ,rust-yasna-0.5))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list openssl))
+    (home-page "https://github.com/rustls/webpki-roots")
+    (synopsis "Mozilla's CA root certificates for use with webpki")
+    (description "This package provides Mozilla's CA root certificates for use
+with webpki.")
+    (license license:mpl2.0)))
+
 (define-public rust-webpki-roots-0.25
   (package
     (name "rust-webpki-roots")
-- 
2.41.0

[bug#68481] [PATCH 27/32] gnu: Add rust-tokio-rustls-0.25.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-tokio-rustls-0.25): New variable.

Change-Id: Ia05a38eb629e81bccc54e67a554857d525974744
---
 gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 868231af25..d8341d96de 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -76687,6 +76687,36 @@ (define-public rust-tokio-reactor-0.1
      "Event loop that drives Tokio I/O resources.")
     (license license:expat)))
 
+(define-public rust-tokio-rustls-0.25
+  (package
+    (name "rust-tokio-rustls")
+    (version "0.25.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-rustls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03w6d5aqqf084rmcmrsyq5grhydl53blaiqcl0i2yfnv187hqpkp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-rustls" ,rust-rustls-0.22)
+                       ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-argh" ,rust-argh-0.1)
+                                   ("rust-futures-util" ,rust-futures-util-0.3)
+                                   ("rust-lazy-static" ,rust-lazy-static-1)
+                                   ("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
+                                   ("rust-rustls-webpki" ,rust-rustls-webpki-0.102)
+                                   ("rust-tokio" ,rust-tokio-1)
+                                   ("rust-webpki-roots" ,rust-webpki-roots-0.26))))
+    (home-page "https://github.com/tokio-rs/tls")
+    (synopsis "Asynchronous TLS/SSL streams for Tokio")
+    (description
+     "This package provides asynchronous TLS/SSL streams for Tokio using
+Rustls.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-tokio-rustls-0.24
   (package
     (name "rust-tokio-rustls")
-- 
2.41.0

[bug#68481] [PATCH 28/32] gnu: Add rust-tungstenite-0.21.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-tungstenite-0.21): New variable.

Change-Id: Iec966bd9ebe5c9bda43167a489df638d6ef9b08f
---
 gnu/packages/crates-io.scm | 44 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d8341d96de..a1a06870f3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79521,6 +79521,50 @@ (define-public rust-tuikit-0.2
        #:cargo-development-inputs
        (("rust-env-logger" ,rust-env-logger-0.6))))))
 
+(define-public rust-tungstenite-0.21
+  (package
+    (name "rust-tungstenite")
+    (version "0.21.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tungstenite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qaphb5kgwgid19p64grhv2b9kxy7f1059yy92l9kwrlx90sdwcy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-data-encoding" ,rust-data-encoding-2)
+                       ("rust-http" ,rust-http-1)
+                       ("rust-httparse" ,rust-httparse-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-native-tls" ,rust-native-tls-0.2)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rustls" ,rust-rustls-0.22)
+                       ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.7)
+                       ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+                       ("rust-sha1" ,rust-sha1-0.10)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-utf-8" ,rust-utf-8-0.7)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.26))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5)
+                                   ("rust-env-logger" ,rust-env-logger-0.10)
+                                   ("rust-input-buffer" ,rust-input-buffer-0.5)
+                                   ("rust-rand" ,rust-rand-0.8)
+                                   ("rust-socket2" ,rust-socket2-0.5))))
+    (home-page "https://github.com/snapview/tungstenite-rs")
+    (synopsis "Lightweight stream-based WebSocket implementation")
+    (description
+     "This library provides an implementation of WebSockets, RFC6455.  It
+allows for both synchronous (like TcpStream) and asynchronous usage and is
+easy to integrate into any third-party event loops including MIO.  The API
+design abstracts away all the internals of the WebSocket protocol but still
+makes them accessible for those who wants full control over the network.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-tungstenite-0.19
   (package
     (name "rust-tungstenite")
-- 
2.41.0

[bug#68481] [PATCH 29/32] gnu: Add rust-tokio-tungstenite-0.21.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-tokio-tungstenite-0.21): New variable.

Change-Id: I63d38fc179d5f972e008d39569ded9252efe3f62
---
 gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a1a06870f3..c8043310e4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77323,6 +77323,42 @@ (define-public rust-tokio-trace-core-0.2
     (description "Core primitives for tokio-trace.")
     (license license:expat)))
 
+(define-public rust-tokio-tungstenite-0.21
+  (package
+    (name "rust-tokio-tungstenite")
+    (version "0.21.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-tungstenite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0f5wj0crsx74rlll97lhw0wk6y12nhdnqvmnjx002hjn08fmcfy8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-native-tls" ,rust-native-tls-0.2)
+                       ("rust-rustls" ,rust-rustls-0.22)
+                       ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.7)
+                       ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)
+                       ("rust-tokio-rustls" ,rust-tokio-rustls-0.25)
+                       ("rust-tungstenite" ,rust-tungstenite-0.21)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.26))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10)
+                                   ("rust-futures-channel" ,rust-futures-channel-0.3)
+                                   ("rust-hyper" ,rust-hyper-0.14)
+                                   ("rust-tokio" ,rust-tokio-1)
+                                   ("rust-url" ,rust-url-2))))
+    (home-page "https://github.com/snapview/tokio-tungstenite")
+    (synopsis "Tokio binding for Tungstenite")
+    (description
+     "This package provides Tokio binding for Tungstenite, the lightweight
+stream-based WebSocket implementation.")
+    (license license:expat)))
+
 (define-public rust-tokio-tungstenite-0.19
   (package
     (name "rust-tokio-tungstenite")
-- 
2.41.0

[bug#68481] [PATCH 30/32] gnu: rust-tokio-macros: Update to 2.2.0.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-tokio-macros): Update to 2.2.0.

Change-Id: Ifaeb8f644b485914ef51691edf4ab819ddb42937
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c8043310e4..0c348199c9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -76277,14 +76277,14 @@ (define-public rust-tokio-io-timeout-1
 (define-public rust-tokio-macros-2
   (package
     (name "rust-tokio-macros")
-    (version "2.1.0")
+    (version "2.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tokio-macros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0pk7y9dfanab886iaqwcbri39jkw33kgl7y07v0kg1pp8prdq2v3"))))
+        (base32 "0fwjy4vdx1h9pi4g2nml72wi0fr27b5m954p13ji9anyy8l1x2jv"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags '("--release" "--lib")
-- 
2.41.0

[bug#68481] [PATCH 31/32] gnu: rust-tokio: Update to 1.35.1.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-tokio): Update to 1.35.1.

Change-Id: I05f01e275703697c26745ddf7da3d604b6a7b5d7
---
 gnu/packages/crates-io.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0c348199c9..41e7598fa2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -75793,14 +75793,14 @@ (define-public rust-tobj-2
 (define-public rust-tokio-1
   (package
     (name "rust-tokio")
-    (version "1.32.0")
+    (version "1.35.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tokio" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1yck1349q23l22bgxcbqd3wkaffw2vmkf7z26m3wgmkcxmvn1v8p"))))
+        (base32 "01613rkziqp812a288ga65aqygs254wgajdi57v8brivjkx4x6y8"))))
     (build-system cargo-build-system)
     (arguments
      (list #:tests? #f  ; unresolved imports `crate::runtime::task`
@@ -75824,7 +75824,7 @@ (define-public rust-tokio-1
              ("rust-loom" ,rust-loom-0.7)
              ("rust-mio-aio" ,rust-mio-aio-0.7)
              ("rust-mockall" ,rust-mockall-0.11)
-             ("rust-nix" ,rust-nix-0.26)
+             ("rust-nix" ,rust-nix-0.27)
              ("rust-rand" ,rust-rand-0.8)
              ("rust-socket2" ,rust-socket2-0.5)
              ("rust-tempfile" ,rust-tempfile-3)
-- 
2.41.0

[bug#68481] [PATCH 32/32] gnu: rbw: Update to 1.9.0.

[VÖRÖSKŐI András]

* gnu/packages/rust-apps.scm (rbw): Update to 1.9.0.

Change-Id: Ia3675326ad5a82a6668e10ea19a86cf3cb2f8199
---
 gnu/packages/rust-apps.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 0df46b9b1d..20490ef2ff 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1975,7 +1975,7 @@ (define-public watchexec
 (define-public rbw
   (package
     (name "rbw")
-    (version "1.8.3")
+    (version "1.9.0")
     (outputs '("out" "scripts"))
     (source
      (origin
@@ -1983,7 +1983,13 @@ (define-public rbw
        (uri (crate-uri "rbw" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1p8bzpqgdc20l2vbb80gsb2ri5j16af958bixpnnp73mfvwzxvg1"))))
+        (base32 "0rlp55kcac9k0rz1zfhyslkfgsim1ka6bkllfzqrayvdfyxqq51i"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "Cargo.toml"
+             ;; Change version requirement for rust-tungstenite
+             (("0.20") "0.21"))))))
     (build-system cargo-build-system)
     (arguments
      `(#:install-source? #f
@@ -1999,7 +2005,7 @@ (define-public rbw
         ("rust-cbc" ,rust-cbc-0.1)
         ("rust-clap" ,rust-clap-4)
         ("rust-clap-complete" ,rust-clap-complete-4)
-        ("rust-copypasta" ,rust-copypasta-0.8)
+        ("rust-copypasta" ,rust-copypasta-0.10)
         ("rust-daemonize" ,rust-daemonize-0.5)
         ("rust-directories" ,rust-directories-5)
         ("rust-env-logger" ,rust-env-logger-0.10)
@@ -2032,7 +2038,7 @@ (define-public rbw
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-tokio" ,rust-tokio-1)
         ("rust-tokio-stream" ,rust-tokio-stream-0.1)
-        ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.19)
+        ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.21)
         ("rust-totp-lite" ,rust-totp-lite-2)
         ("rust-url" ,rust-url-2)
         ("rust-uuid" ,rust-uuid-1)
-- 
2.41.0

[bug#68481] [PATCH 32/32] gnu: rbw: Update to 1.9.0.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2555 bytes --]

Was there something wrong with tungstenite@0.20?

On Mon, Jan 15, 2024 at 08:28:59PM +0100, VÖRÖSKŐI András wrote:
> * gnu/packages/rust-apps.scm (rbw): Update to 1.9.0.
> 
> Change-Id: Ia3675326ad5a82a6668e10ea19a86cf3cb2f8199
> ---
>  gnu/packages/rust-apps.scm | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
> index 0df46b9b1d..20490ef2ff 100644
> --- a/gnu/packages/rust-apps.scm
> +++ b/gnu/packages/rust-apps.scm
> @@ -1975,7 +1975,7 @@ (define-public watchexec
>  (define-public rbw
>    (package
>      (name "rbw")
> -    (version "1.8.3")
> +    (version "1.9.0")
>      (outputs '("out" "scripts"))
>      (source
>       (origin
> @@ -1983,7 +1983,13 @@ (define-public rbw
>         (uri (crate-uri "rbw" version))
>         (file-name (string-append name "-" version ".tar.gz"))
>         (sha256
> -        (base32 "1p8bzpqgdc20l2vbb80gsb2ri5j16af958bixpnnp73mfvwzxvg1"))))
> +        (base32 "0rlp55kcac9k0rz1zfhyslkfgsim1ka6bkllfzqrayvdfyxqq51i"))
> +       (modules '((guix build utils)))
> +       (snippet
> +        '(begin
> +           (substitute* "Cargo.toml"
> +             ;; Change version requirement for rust-tungstenite
> +             (("0.20") "0.21"))))))
>      (build-system cargo-build-system)
>      (arguments
>       `(#:install-source? #f
> @@ -1999,7 +2005,7 @@ (define-public rbw
>          ("rust-cbc" ,rust-cbc-0.1)
>          ("rust-clap" ,rust-clap-4)
>          ("rust-clap-complete" ,rust-clap-complete-4)
> -        ("rust-copypasta" ,rust-copypasta-0.8)
> +        ("rust-copypasta" ,rust-copypasta-0.10)
>          ("rust-daemonize" ,rust-daemonize-0.5)
>          ("rust-directories" ,rust-directories-5)
>          ("rust-env-logger" ,rust-env-logger-0.10)
> @@ -2032,7 +2038,7 @@ (define-public rbw
>          ("rust-thiserror" ,rust-thiserror-1)
>          ("rust-tokio" ,rust-tokio-1)
>          ("rust-tokio-stream" ,rust-tokio-stream-0.1)
> -        ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.19)
> +        ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.21)
>          ("rust-totp-lite" ,rust-totp-lite-2)
>          ("rust-url" ,rust-url-2)
>          ("rust-uuid" ,rust-uuid-1)
> -- 
> 2.41.0
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#68481] [PATCH 32/32] gnu: rbw: Update to 1.9.0.

[András Vöröskői]

Hi,

(Sorry for the late reply, I just started to work on this again.)

On Thu, Jan 18, 2024 at 8:45 AM Efraim Flashner <efraim@flashner.co.il> wrote:
>
> Was there something wrong with tungstenite@0.20?

No, I have not tried that version. The .21 version was already
available and I did not want to package the old version.
I completely understand if You prefer the version selected by
upstream, but was not sure about guix policy about that.

Thanks,

[bug#68481] [PATCH v2 01/13] gnu: rust-clap-builder: Update to 4.4.16.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-clap-builder): Update to 4.4.16.

Change-Id: Id5c301d811f065ccb9ee90ad4f0c09e1d2c20e84
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2cfaff10e3..cde2d41ff5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10619,14 +10619,14 @@ (define-public rust-clap-2
 (define-public rust-clap-builder-4
   (package
     (name "rust-clap-builder")
-    (version "4.4.11")
+    (version "4.4.16")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "clap_builder" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1fxdsmw1ilgswz3lg2hjlvsdyyz04k78scjirlbd7c9bc83ba5m2"))))
+                "1fv06ivpzpkhjm4bvxzg3fl4y61mvlf481zms4pksq1iypbq5jsr"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags

base-commit: 36315bde09efa660d38198f666b4e1582cb71db3
-- 
2.41.0

[bug#68481] [PATCH v2 02/13] gnu: rust-clap: Update to 4.4.16.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-clap): Update to 4.4.16.

Change-Id: I42c5f3bade44a387e5ea2beca4b7eec71b2d9c90
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cde2d41ff5..1074d8e9f4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10513,7 +10513,7 @@ (define-public rust-clap-derive-3
 (define-public rust-clap-4
   (package
     (name "rust-clap")
-    (version "4.4.11")
+    (version "4.4.16")
     (source
      (origin
        (method url-fetch)
@@ -10521,7 +10521,7 @@ (define-public rust-clap-4
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1wj5gb2fnqls00zfahg3490bdfc36d9cwpl80qjacb5jyrqzdbxz"))))
+         "0ialpybl8n8ybfikzy5f07d64pfdajls0s00bf4wgkh4q20liraq"))))
     (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
-- 
2.41.0

[bug#68481] [PATCH v2 03/13] gnu: Add rust-mirai-annotations-1.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-mirai-annotations): New variable.

Change-Id: Ia555b0f13d51854309638f03a3eb808ada9ebfcd
---
 gnu/packages/crates-io.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1074d8e9f4..05ed98b686 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37055,6 +37055,23 @@ (define-public rust-mio-uds-0.6
      "Unix domain socket bindings for mio.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-mirai-annotations-1
+  (package
+    (name "rust-mirai-annotations")
+    (version "1.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mirai-annotations" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lfkgarmzd7mdr739s9yidh0xhc9d3g4jjiwh246mwmkq5i0ign9"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/facebookexperimental/MIRAI")
+    (synopsis "Macros that provide source code annotations for MIRAI")
+    (description "Macros that provide source code annotations for MIRAI")
+    (license license:expat)))
+
 (define-public rust-mock-instant-0.2
   (package
     (name "rust-mock-instant")
-- 
2.41.0

[bug#68481] [PATCH v2 04/13] gnu: Add rust-rcgen-0.12.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-rcgen-0.12): New variable.

Change-Id: I3e37ab618be638896c622ce32e6ad13bb492af40
---
 gnu/packages/crates-io.scm | 152 +++++++++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 05ed98b686..6de12710a9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51789,6 +51789,158 @@ (define-public rust-rayon-core-1
     (description "This package provides core APIs for Rayon.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-rcgen-0.12
+  (package
+    (name "rust-rcgen")
+    (version "0.12.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rcgen" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0pfvmm1s8x12hiw810jv9ng1gnqnplh30xi6nw6mdix4qn08r4ax"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Don't use a vendored botan.
+                  (substitute* "Cargo.toml"
+                    ((".*vendored.*") ""))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-pem" ,rust-pem-3)
+        ("rust-ring" ,rust-ring-0.16)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-x509-parser" ,rust-x509-parser-0.15)
+        ("rust-yasna" ,rust-yasna-0.5)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-botan" ,rust-botan-0.10)
+        ("rust-openssl" ,rust-openssl-0.10)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rsa" ,rust-rsa-0.9)
+        ("rust-rustls-webpki" ,rust-rustls-webpki-0.101)
+        ("rust-x509-parser" ,rust-x509-parser-0.15))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list botan openssl))
+    (home-page "https://github.com/rustls/rcgen")
+    (synopsis "Rust X.509 certificate generator")
+    (description "Rust X.509 certificate generator.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-rcgen-0.11
+  (package
+    (name "rust-rcgen")
+    (version "0.11.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rcgen" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1iivv3xycr9mjfmp522xjqj47nsl5amlzzsfpbxpvg53984g7i2j"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Don't use a vendored botan.
+                  (substitute* "Cargo.toml"
+                    ((".*vendored.*") ""))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-pem" ,rust-pem-3)
+        ("rust-ring" ,rust-ring-0.16)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-x509-parser" ,rust-x509-parser-0.15)
+        ("rust-yasna" ,rust-yasna-0.5)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-botan" ,rust-botan-0.10)
+        ("rust-openssl" ,rust-openssl-0.10)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rsa" ,rust-rsa-0.9)
+        ("rust-rustls-webpki" ,rust-rustls-webpki-0.101)
+        ("rust-x509-parser" ,rust-x509-parser-0.15))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list botan openssl))
+    (home-page "https://github.com/rustls/rcgen")
+    (synopsis "Rust X.509 certificate generator")
+    (description "Rust X.509 certificate generator.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-rcgen-0.10
+  (package
+    (inherit rust-rcgen-0.11)
+    (name "rust-rcgen")
+    (version "0.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rcgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nvqgr697xzdzaavkcwcl59kxw7xfx9zdhdzx49fm3gkwbpq9gpz"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+                 ;; Don't use a vendored botan.
+                 (substitute* "Cargo.toml"
+                   ((".*vendored.*") ""))))))
+    (arguments
+     `(#:cargo-inputs (("rust-pem" ,rust-pem-1)
+                       ("rust-ring" ,rust-ring-0.16)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-x509-parser" ,rust-x509-parser-0.14)
+                       ("rust-yasna" ,rust-yasna-0.5)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-botan" ,rust-botan-0.8)
+                                   ("rust-openssl" ,rust-openssl-0.10)
+                                   ("rust-rand" ,rust-rand-0.8)
+                                   ("rust-rsa" ,rust-rsa-0.6)
+                                   ("rust-webpki" ,rust-webpki-0.22)
+                                   ("rust-x509-parser" ,rust-x509-parser-0.14))))))
+
+(define-public rust-rcgen-0.8
+  (package
+    (inherit rust-rcgen-0.11)
+    (name "rust-rcgen")
+    (version "0.8.14")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rcgen" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "19qvlcz8kl046q85xa40p3xg7l78jganj83hdbawjhs17x0d24ar"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Don't use a vendored botan.
+                  (substitute* "Cargo.toml"
+                    ((".*vendored.*") ""))))))
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=tests::test_dt_to_generalized"
+         "--skip=tests::test_dt_utc_strip_nanos")
+       #:cargo-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-pem" ,rust-pem-1)
+        ("rust-ring" ,rust-ring-0.16)
+        ("rust-x509-parser" ,rust-x509-parser-0.12)
+        ("rust-yasna" ,rust-yasna-0.4)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-botan" ,rust-botan-0.8)
+        ("rust-openssl" ,rust-openssl-0.10)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rsa" ,rust-rsa-0.5)
+        ("rust-webpki" ,rust-webpki-0.22)
+        ("rust-x509-parser" ,rust-x509-parser-0.12))))))
+
 (define-public rust-rctree-0.5
   (package
     (name "rust-rctree")
-- 
2.41.0

[bug#68481] [PATCH v2 05/13] gnu: rust-subtle: Update to 2.5.0.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-subtle): Update to 2.5.0.

Change-Id: I9ac3f4f80387cb7a5a4c3d33cf5e8059cd90d103
---
 gnu/packages/crates-io.scm | 96 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6de12710a9..07eaf59aa4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63779,6 +63779,102 @@ (define-public rust-subprocess-0.2
 inspired by Python's subprocess module, with Rust-specific extensions.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-subtle-2
+  (package
+    (name "rust-subtle")
+    (version "2.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "subtle" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1g2yjs7gffgmdvkkq0wrrh0pxds3q0dv6dhkw9cdpbib656xdkc1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://dalek.rs/")
+    (synopsis
+     "Pure-Rust traits and utilities for cryptographic implementations")
+    (description
+     "This package provides Pure-Rust traits and utilities for constant-time
+cryptographic implementations.")
+    (license license:bsd-3)))
+
+(define-public rust-subtle-1
+  (package
+    (inherit rust-subtle-2)
+    (name "rust-subtle")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "subtle" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1vm80mxbwfj334izwm8x8l65v1xl9hr0kwrg36r1rq565fkaarrd"))))))
+
+(define-public rust-subtle-ng-2
+  (package
+    (name "rust-subtle-ng")
+    (version "2.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "subtle-ng" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hj1wp8xl64bjhbvlfffmllqy7wdw2b505f32gn3qqic4vmpcikk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-rand" ,rust-rand-0.7))))
+    (home-page "https://dalek.rs/")
+    (synopsis "Pure-Rust for constant-time cryptographic implementations")
+    (description
+     "This package provides pure-Rust traits and utilities for constant-time
+cryptographic implementations.")
+    (license license:bsd-3)))
+
+(define-public rust-surf-2
+  (package
+    (name "rust-surf")
+    (version "2.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "surf" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0a33kw06jspi54rf38ncyqjj8861bid0wxhwzpk1ypkbr8rls59a"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-http-client" ,rust-http-client-6)
+        ("rust-http-types" ,rust-http-types-2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-mime-guess" ,rust-mime-guess-2)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-web-sys" ,rust-web-sys-0.3))))
+    (home-page "https://github.com/http-rs/surf")
+    (synopsis "HTTP client framework")
+    (description
+     "Surf is a friendly HTTP client built for casual Rustaceans and veterans
+alike.  It's completely modular, and built directly for @code{async/await}.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-supercow-0.1
   (package
     (name "rust-supercow")
-- 
2.41.0

[bug#68481] [PATCH v2 06/13] gnu: Add rust-rustls-native-certs-0.7.

[VÖRÖSKŐI András]

* gnu/packages/crates-tls.scm (rust-rustls-native-certs): New variable.

Change-Id: Ic66c11b391be69929d0884a060d9a3bcdbfd3406
---
 gnu/packages/crates-tls.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 40a0652119..0104d706a5 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -1117,6 +1117,37 @@ (define-public rust-rustls-ffi-0.8
     (description "Rustls bindings for non-Rust languages")
     (license (list license:asl2.0 license:isc license:expat))))
 
+(define-public rust-rustls-native-certs-0.7
+  (package
+    (name "rust-rustls-native-certs")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rustls-native-certs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14ip15dcr6fmjzi12lla9cpln7mmkdid4a7wsp344v4kz9gbh7wg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-openssl-probe" ,rust-openssl-probe-0.1)
+                       ("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
+                       ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+                       ("rust-schannel" ,rust-schannel-0.1)
+                       ("rust-security-framework" ,rust-security-framework-2))
+       #:cargo-development-inputs (("rust-ring" ,rust-ring-0.16)
+                                   ("rust-rustls" ,rust-rustls-0.22)
+                                   ("rust-rustls-webpki" ,rust-rustls-webpki-0.102)
+                                   ("rust-serial-test" ,rust-serial-test-2)
+                                   ("rust-untrusted" ,rust-untrusted-0.7)
+                                   ("rust-webpki-roots" ,rust-webpki-roots-0.26)
+                                   ("rust-x509-parser" ,rust-x509-parser-0.15))))
+    (home-page "https://github.com/ctz/rustls-native-certs")
+    (synopsis "Use the platform native certificate store with rustls")
+    (description "@code{rustls-native-certs} allows rustls to use the platform
+native certificate store.")
+    (license (list license:asl2.0 license:isc license:expat))))
+
 (define-public rust-rustls-native-certs-0.6
   (package
     (name "rust-rustls-native-certs")
-- 
2.41.0

[bug#68481] [PATCH v2 07/13] gnu: Add rust-rustls-webpki-0.102.

[VÖRÖSKŐI András]

* gnu/packages/crates-tls.scm (rust-rustls-webpki-0.102): New variable.

Change-Id: I916376fa7a46022b1b2e7b21d938adc94267717a
---
 gnu/packages/crates-tls.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 0104d706a5..7b71bee8d9 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -1304,6 +1304,35 @@ (define-public rust-rustls-pki-types-1
     (description "Shared types for the rustls PKI ecosystem.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rustls-webpki-0.102
+  (package
+    (name "rust-rustls-webpki")
+    (version "0.102.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rustls-webpki" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nz9d3xhy8cg6anmvq64scyiva8bglrc6j3v6bdxw2f96xha4k7g"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs (("rust-ring" ,rust-ring-0.17)
+                       ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+                       ("rust-untrusted" ,rust-untrusted-0.9))
+       #:cargo-development-inputs (("rust-base64" ,rust-base64-0.21)
+                                   ("rust-bencher" ,rust-bencher-0.1)
+                                   ("rust-bzip2" ,rust-bzip2-0.4)
+                                   ("rust-once-cell" ,rust-once-cell-1)
+                                   ("rust-rcgen" ,rust-rcgen-0.12)
+                                   ("rust-serde" ,rust-serde-1)
+                                   ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/rustls/webpki")
+    (synopsis "Web PKI X.509 Certificate Verification")
+    (description "Web PKI X.509 Certificate Verification.")
+    (license license:isc)))
+
 (define-public rust-rustls-webpki-0.101
   (package
     (name "rust-rustls-webpki")
-- 
2.41.0

[bug#68481] [PATCH v2 08/13] gnu: Add rust-rustls-0.22.

[VÖRÖSKŐI András]

* gnu/packages/crates-tls.scm (rust-rustls-0.22): New variable.

Change-Id: Idbf98162adc353d1247f6d66a7c0cca2d09225df
---
 gnu/packages/crates-tls.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 7b71bee8d9..c42172068c 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -859,6 +859,38 @@ (define-public rust-rcgen-0.8
         ("rust-webpki" ,rust-webpki-0.22)
         ("rust-x509-parser" ,rust-x509-parser-0.12))))))
 
+(define-public rust-rustls-0.22
+  (package
+    (name "rust-rustls")
+    (version "0.22.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rustls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hcxyhq6ynvws9v5b2h81s1nwmijmya7a3vyyyhsy1wqpmb9jz78"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-log" ,rust-log-0.4)
+                       ("rust-ring" ,rust-ring-0.17)
+                       ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+                       ("rust-rustls-webpki" ,rust-rustls-webpki-0.102)
+                       ("rust-rustversion" ,rust-rustversion-1)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-base64" ,rust-base64-0.21)
+                                   ("rust-bencher" ,rust-bencher-0.1)
+                                   ("rust-env-logger" ,rust-env-logger-0.10)
+                                   ("rust-log" ,rust-log-0.4)
+                                   ("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
+                                   ("rust-webpki-roots" ,rust-webpki-roots-0.26))))
+    (home-page "https://github.com/rustls/rustls")
+    (synopsis "Modern TLS library written in Rust")
+    (description
+     "This package provides a modern TLS library written in Rust.")
+    (license (list license:asl2.0 license:isc license:expat))))
+
 (define-public rust-rustls-0.21
   (package
     (name "rust-rustls")
-- 
2.41.0

[bug#68481] [PATCH v2 09/13] gnu: Add rust-webpki-roots-0.26.

[VÖRÖSKŐI András]

* gnu/packages/crates-web.scm (rust-webpki-roots-0.26): New variable.

Change-Id: I3bd62f0ae0fbf08282bb8bee9b0e1c09dc1ee6e8
---
 gnu/packages/crates-web.scm | 42 +++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 4e7024bcde..3595e47481 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -5042,6 +5042,48 @@ (define-public rust-webpki-0.18
        #:cargo-development-inputs
        (("rust-base64" ,rust-base64-0.9))))))
 
+(define-public rust-webpki-roots-0.26
+  (package
+    (name "rust-webpki-roots")
+    (version "0.26.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "webpki-roots" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1221q07j5sv23bmwv8my49hdax70dwzdpsnjgrdbw88gk3dczqhd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             ;; This test wants network access.
+             "--skip=generated_code_is_fresh")
+       #:cargo-inputs (("rust-rustls-pki-types" ,rust-rustls-pki-types-1))
+       #:cargo-development-inputs (("rust-chrono" ,rust-chrono-0.4)
+                                   ("rust-csv" ,rust-csv-1)
+                                   ("rust-hex" ,rust-hex-0.4)
+                                   ("rust-num-bigint" ,rust-num-bigint-0.4)
+                                   ("rust-percent-encoding" ,rust-percent-encoding-2)
+                                   ("rust-rcgen" ,rust-rcgen-0.11)
+                                   ("rust-reqwest" ,rust-reqwest-0.11)
+                                   ("rust-ring" ,rust-ring-0.17)
+                                   ("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
+                                   ("rust-rustls-webpki" ,rust-rustls-webpki-0.102)
+                                   ("rust-serde" ,rust-serde-1)
+                                   ("rust-tokio" ,rust-tokio-1)
+                                   ("rust-x509-parser" ,rust-x509-parser-0.15)
+                                   ("rust-yasna" ,rust-yasna-0.5))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list openssl))
+    (home-page "https://github.com/rustls/webpki-roots")
+    (synopsis "Mozilla's CA root certificates for use with webpki")
+    (description "This package provides Mozilla's CA root certificates for use
+with webpki.")
+    (license license:mpl2.0)))
+
 (define-public rust-webpki-roots-0.25
   (package
     (name "rust-webpki-roots")
-- 
2.41.0

[bug#68481] [PATCH v2 10/13] gnu: Add rust-tokio-rustls-0.25.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-tokio-rustls-0.25): New variable.

Change-Id: Ia05a38eb629e81bccc54e67a554857d525974744
---
 gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 07eaf59aa4..3037c6fdd4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69619,6 +69619,36 @@ (define-public rust-tokio-reactor-0.1
      "Event loop that drives Tokio I/O resources.")
     (license license:expat)))
 
+(define-public rust-tokio-rustls-0.25
+  (package
+    (name "rust-tokio-rustls")
+    (version "0.25.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-rustls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03w6d5aqqf084rmcmrsyq5grhydl53blaiqcl0i2yfnv187hqpkp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-rustls" ,rust-rustls-0.22)
+                       ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-argh" ,rust-argh-0.1)
+                                   ("rust-futures-util" ,rust-futures-util-0.3)
+                                   ("rust-lazy-static" ,rust-lazy-static-1)
+                                   ("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
+                                   ("rust-rustls-webpki" ,rust-rustls-webpki-0.102)
+                                   ("rust-tokio" ,rust-tokio-1)
+                                   ("rust-webpki-roots" ,rust-webpki-roots-0.26))))
+    (home-page "https://github.com/tokio-rs/tls")
+    (synopsis "Asynchronous TLS/SSL streams for Tokio")
+    (description
+     "This package provides asynchronous TLS/SSL streams for Tokio using
+Rustls.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-tokio-rustls-0.24
   (package
     (name "rust-tokio-rustls")
-- 
2.41.0

[bug#68481] [PATCH v2 11/13] gnu: Add rust-tungstenite-0.21.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-tungstenite-0.21): New variable.

Change-Id: Iec966bd9ebe5c9bda43167a489df638d6ef9b08f
---
 gnu/packages/crates-io.scm | 141 +++++++++++++++++++++++++++++++++++++
 1 file changed, 141 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3037c6fdd4..59008c83a7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -72191,6 +72191,147 @@ (define-public rust-tuikit-0.2
        #:cargo-development-inputs
        (("rust-env-logger" ,rust-env-logger-0.6))))))
 
+(define-public rust-tungstenite-0.21
+  (package
+    (name "rust-tungstenite")
+    (version "0.21.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tungstenite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qaphb5kgwgid19p64grhv2b9kxy7f1059yy92l9kwrlx90sdwcy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-data-encoding" ,rust-data-encoding-2)
+                       ("rust-http" ,rust-http-1)
+                       ("rust-httparse" ,rust-httparse-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-native-tls" ,rust-native-tls-0.2)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rustls" ,rust-rustls-0.22)
+                       ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.7)
+                       ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+                       ("rust-sha1" ,rust-sha1-0.10)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-utf-8" ,rust-utf-8-0.7)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.26))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5)
+                                   ("rust-env-logger" ,rust-env-logger-0.10)
+                                   ("rust-input-buffer" ,rust-input-buffer-0.5)
+                                   ("rust-rand" ,rust-rand-0.8)
+                                   ("rust-socket2" ,rust-socket2-0.5))))
+    (home-page "https://github.com/snapview/tungstenite-rs")
+    (synopsis "Lightweight stream-based WebSocket implementation")
+    (description
+     "This library provides an implementation of WebSockets, RFC6455.  It
+allows for both synchronous (like TcpStream) and asynchronous usage and is
+easy to integrate into any third-party event loops including MIO.  The API
+design abstracts away all the internals of the WebSocket protocol but still
+makes them accessible for those who wants full control over the network.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-tungstenite-0.19
+  (package
+    (name "rust-tungstenite")
+    (version "0.19.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tungstenite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0rxzxg4y22rsvdvs4la7igy9117yidc2m6lsfm2hf0xvsska3yqm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-data-encoding" ,rust-data-encoding-2)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-httparse" ,rust-httparse-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-native-tls" ,rust-native-tls-0.2)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rustls" ,rust-rustls-0.21)
+        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
+        ("rust-sha1" ,rust-sha1-0.10)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-url" ,rust-url-2)
+        ("rust-utf-8" ,rust-utf-8-0.7)
+        ("rust-webpki" ,rust-webpki-0.22)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.23))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-input-buffer" ,rust-input-buffer-0.5)
+        ("rust-net2" ,rust-net2-0.2)
+        ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/snapview/tungstenite-rs")
+    (synopsis "Lightweight stream-based WebSocket implementation")
+    (description
+     "This library provides an implementation of WebSockets, RFC6455.  It
+allows for both synchronous (like TcpStream) and asynchronous usage and is
+easy to integrate into any third-party event loops including MIO.  The API
+design abstracts away all the internals of the WebSocket protocol but still
+makes them accessible for those who wants full control over the network.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-tungstenite-0.11
+  (package
+    (inherit rust-tungstenite-0.19)
+    (name "rust-tungstenite")
+    (version "0.11.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tungstenite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "08ra94x3zqkmbsrcmwszknxv2a8g08gk5xlyif3wa037v208sc7h"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-base64" ,rust-base64-0.12)
+        ("rust-byteorder" ,rust-byteorder-1)
+        ("rust-bytes" ,rust-bytes-0.5)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-httparse" ,rust-httparse-1)
+        ("rust-input-buffer" ,rust-input-buffer-0.3)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-native-tls" ,rust-native-tls-0.2)
+        ("rust-rand" ,rust-rand-0.7)
+        ("rust-sha-1" ,rust-sha-1-0.9)
+        ("rust-url" ,rust-url-2)
+        ("rust-utf-8" ,rust-utf-8-0.7))))))
+
+(define-public rust-twofish-0.7
+  (package
+    (name "rust-twofish")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "twofish" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "04w0ii2c0c9ws08aw6c7illh9zql22il9lbwjk1mgir30aiq73m7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cipher" ,rust-cipher-0.4))
+       #:cargo-development-inputs
+       (("rust-cipher" ,rust-cipher-0.4)
+        ("rust-hex-literal" ,rust-hex-literal-0.3))))
+    (home-page "https://github.com/RustCrypto/block-ciphers")
+    (synopsis "Twofish block cipher")
+    (description "Twofish block cipher")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-twoway-0.2
   (package
     (name "rust-twoway")
-- 
2.41.0

[bug#68481] [PATCH v2 12/13] gnu: Add rust-tokio-tungstenite-0.21.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-tokio-tungstenite-0.21): New variable.

Change-Id: I63d38fc179d5f972e008d39569ded9252efe3f62
---
 gnu/packages/crates-io.scm | 59 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 59008c83a7..2df5b2733d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70232,6 +70232,65 @@ (define-public rust-tokio-tls-0.2
         ("rust-security-framework" ,rust-security-framework-0.2)
         ("rust-tokio" ,rust-tokio-0.1))))))
 
+(define-public rust-tokio-trace-core-0.2
+  (package
+    (name "rust-tokio-trace-core")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-trace-core" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "04y6c2r4ddzk02xb3hn60s9a1w92h0g8pzmxwaspqvwmsrba5j59"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1))))
+    (home-page "https://tokio.rs")
+    (synopsis "Core primitives for tokio-trace")
+    (description "Core primitives for tokio-trace.")
+    (license license:expat)))
+
+(define-public rust-tokio-tungstenite-0.21
+  (package
+    (name "rust-tokio-tungstenite")
+    (version "0.21.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-tungstenite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0f5wj0crsx74rlll97lhw0wk6y12nhdnqvmnjx002hjn08fmcfy8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-native-tls" ,rust-native-tls-0.2)
+                       ("rust-rustls" ,rust-rustls-0.22)
+                       ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.7)
+                       ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)
+                       ("rust-tokio-rustls" ,rust-tokio-rustls-0.25)
+                       ("rust-tungstenite" ,rust-tungstenite-0.21)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.26))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10)
+                                   ("rust-futures-channel" ,rust-futures-channel-0.3)
+                                   ("rust-hyper" ,rust-hyper-0.14)
+                                   ("rust-tokio" ,rust-tokio-1)
+                                   ("rust-url" ,rust-url-2))))
+    (home-page "https://github.com/snapview/tokio-tungstenite")
+    (synopsis "Tokio binding for Tungstenite")
+    (description
+     "This package provides Tokio binding for Tungstenite, the lightweight
+stream-based WebSocket implementation.")
+    (license license:expat)))
+
 (define-public rust-tokio-tungstenite-0.19
   (package
     (name "rust-tokio-tungstenite")
-- 
2.41.0

[bug#68481] [PATCH v2 13/13] gnu: rbw: Update to 1.9.0.

[VÖRÖSKŐI András]

* gnu/packages/rust-apps.scm (rbw): Update to 1.9.0.

Change-Id: Ia3675326ad5a82a6668e10ea19a86cf3cb2f8199
---
 gnu/packages/rust-apps.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 2d714c4861..aeae88fa21 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -2055,7 +2055,7 @@ (define-public watchexec
 (define-public rbw
   (package
     (name "rbw")
-    (version "1.8.3")
+    (version "1.9.0")
     (outputs '("out" "scripts"))
     (source
      (origin
@@ -2063,12 +2063,15 @@ (define-public rbw
        (uri (crate-uri "rbw" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1p8bzpqgdc20l2vbb80gsb2ri5j16af958bixpnnp73mfvwzxvg1"))
+        (base32 "0rlp55kcac9k0rz1zfhyslkfgsim1ka6bkllfzqrayvdfyxqq51i"))
        (modules '((guix build utils)))
        (snippet
-        '(begin (substitute* "Cargo.toml"
-                  (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
-                   (string-append "\"^" version)))))))
+        '(begin
+           (substitute* "Cargo.toml"
+             ;; Change version requirement for rust-tungstenite
+             (("0.20") "0.21")
+             ;; Change version requirement for directories
+             (("=5.0.0") "^5.0.0"))))))
     (build-system cargo-build-system)
     (arguments
      `(#:install-source? #f
@@ -2084,7 +2087,7 @@ (define-public rbw
         ("rust-cbc" ,rust-cbc-0.1)
         ("rust-clap" ,rust-clap-4)
         ("rust-clap-complete" ,rust-clap-complete-4)
-        ("rust-copypasta" ,rust-copypasta-0.8)
+        ("rust-copypasta" ,rust-copypasta-0.10)
         ("rust-daemonize" ,rust-daemonize-0.5)
         ("rust-directories" ,rust-directories-5)
         ("rust-env-logger" ,rust-env-logger-0.10)
@@ -2117,7 +2120,7 @@ (define-public rbw
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-tokio" ,rust-tokio-1)
         ("rust-tokio-stream" ,rust-tokio-stream-0.1)
-        ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.19)
+        ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.21)
         ("rust-totp-lite" ,rust-totp-lite-2)
         ("rust-url" ,rust-url-2)
         ("rust-uuid" ,rust-uuid-1)
-- 
2.41.0

bug#68481: [PATCH v2 13/13] gnu: rbw: Update to 1.9.0.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 481 bytes --]

I ended up grabbing your aws-lc patches since they were necessary for a
couple of the packages and we can unbundle them later.  I made a couple
of adjustments to make sure that all the new and updated packages would
build.  Patches pushed to the rust-team branch.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]