diff mbox series

[bug#53995] gnu: rbw: Update to 1.4.3

Message ID 87r185y4gm.fsf@ngraves.fr
State New
Headers
Series [bug#53995] gnu: rbw: Update to 1.4.3 |

Commit Message

Nicolas Graves Feb. 14, 2022, 1:14 p.m. UTC

Comments

Maxime Devos Feb. 14, 2022, 7:23 p.m. UTC | #1 
Nicolas Graves via Guix-patches via schreef op ma 14-02-2022 om 14:14
[+0100]:
> From 21a2bac84228cbe89a49526941a8b5319bd3f14b Mon Sep 17 00:00:00
> 2001
> From: Nicolas Graves <ngraves@ngraves.fr>
> Date: Mon, 14 Feb 2022 13:55:44 +0100
> Subject: [PATCH] gnu: rbw: Update to 1.4.3
> 
> ---
>  gnu/packages/crates-io.scm | 469 ++++++++++++++++++-----------------
> --
>  gnu/packages/rust-apps.scm | 107 ++++-----
>  2 files changed, 275 insertions(+), 301 deletions(-)

Could you split this patch in individual patches for updating packages
and adding patches?  That would make reviewing easier.

Greetings,
Maxime.
Nicolas Graves Feb. 15, 2022, 7:50 a.m. UTC | #2 
Hi Maxime,

Do you mean updating packages and adding packages ?

I added two packages because they were now needed for rbw:
- rust-valuable-derive-0.1
- rust-valuable-0.1

Also I (maybe questionnably) updated 2 packages that are used elsewhere :
- rust-hyper-rustls-0.22 --> rust-hyper-rustls-0.23
- rust-tokio-rustls-0.22 --> rust-tokio-rustls-0.23

The sole "patch" I can see is that of rbw in rust-apps: the only change
is the deletion of now unneeded "relax-requirements".

Is it clearer ? What precisely can I split to ease the review ? Last
time I contributed, I made ~40 patches for each individual package
added, seemed too much.

Cheers,

Nicolas

Maxime Devos <maximedevos@telenet.be> writes:

> [[PGP Signed Part:Undecided]]
> Nicolas Graves via Guix-patches via schreef op ma 14-02-2022 om 14:14
> [+0100]:
>> From 21a2bac84228cbe89a49526941a8b5319bd3f14b Mon Sep 17 00:00:00
>> 2001
>> From: Nicolas Graves <ngraves@ngraves.fr>
>> Date: Mon, 14 Feb 2022 13:55:44 +0100
>> Subject: [PATCH] gnu: rbw: Update to 1.4.3
>>
>> ---
>>  gnu/packages/crates-io.scm | 469 ++++++++++++++++++-----------------
>> --
>>  gnu/packages/rust-apps.scm | 107 ++++-----
>>  2 files changed, 275 insertions(+), 301 deletions(-)
>
> Could you split this patch in individual patches for updating packages
> and adding patches?  That would make reviewing easier.
>
> Greetings,
> Maxime.
>
> [[End of PGP Signed Part]]
Maxime Devos Feb. 15, 2022, 8:45 a.m. UTC | #3 
Nicolas Graves schreef op di 15-02-2022 om 08:50 [+0100]:
> Hi Maxime,
> 
> Do you mean updating packages and adding packages ?
> 
> I added two packages because they were now needed for rbw:
> - rust-valuable-derive-0.1
> - rust-valuable-0.1
> 
> Also I (maybe questionnably) updated 2 packages that are used elsewhere :
> - rust-hyper-rustls-0.22 --> rust-hyper-rustls-0.23
> - rust-tokio-rustls-0.22 --> rust-tokio-rustls-0.23

I count at least 21 package updates.

> The sole "patch" I can see is that of rbw in rust-apps: the only change
> is the deletion of now unneeded "relax-requirements".

With 'patch', I meant 0001-gnu-rbw-Update-to-1.4.3.patch.

> Is it clearer ? What precisely can I split to ease the review ? Last
> time I contributed, I made ~40 patches for each individual package
> added, seemed too much.

To ease review, I recommend 1 patch per package update and 1 patch per
new package.  From (guix)Submitting Patches:

  13. Verify that your patch contains only one set of related changes.
      Bundling unrelated changes together makes reviewing harder and
      slower.

      Examples of unrelated changes include the addition of several
      packages, or a package update along with fixes to that package.

The total size of the changes remains the same, so splitting patches
does not make things ‘too much’ anymore than the original patch would
be ‘too much’.  Splitting patches makes it easier to respond to
individual parts.

Also, a commit message was missing.  Additionally, I recommend setting
the "--base"  option of "git format-patch/git send-email" to help with
rebasing.

Greetings,
Maxime.
Nicolas Graves Feb. 16, 2022, 1:25 a.m. UTC | #4 
Maxime Devos <maximedevos@telenet.be> writes:

> The total size of the changes remains the same, so splitting patches
> does not make things ‘too much’ anymore than the original patch would
> be ‘too much’.  Splitting patches makes it easier to respond to
> individual parts.

Sorry, I got confused, didn't fully understand N. Goaziou's answer last
time.

>
> Also, a commit message was missing.  Additionally, I recommend setting
> the "--base"  option of "git format-patch/git send-email" to help with
> rebasing.
>
> Greetings,
> Maxime.
>
> [[End of PGP Signed Part]]

Is everything OK with newly submitted patches ?

Cheers,

Nicolas
Tyler Wolf May 28, 2023, 5:52 p.m. UTC | #5 
Hi, I noticed that rbw is still on 1.4.1 (no longer usable). Is this
still an issue with rust-rsa, as it seems to build fine for me so if
that is the only issue does that mean the new rbw can be patched, or
is there something else.


Thanks!
diff mbox series

Patch

From 21a2bac84228cbe89a49526941a8b5319bd3f14b Mon Sep 17 00:00:00 2001
From: Nicolas Graves <ngraves@ngraves.fr>
Date: Mon, 14 Feb 2022 13:55:44 +0100
Subject: [PATCH] gnu: rbw: Update to 1.4.3

---
 gnu/packages/crates-io.scm | 469 ++++++++++++++++++-------------------
 gnu/packages/rust-apps.scm | 107 ++++-----
 2 files changed, 275 insertions(+), 301 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d21fb240a8..5ff0f830a7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2763,7 +2763,7 @@  (define-public rust-antidote-1
 (define-public rust-anyhow-1
   (package
     (name "rust-anyhow")
-    (version "1.0.46")
+    (version "1.0.53")
     (source
      (origin
        (method url-fetch)
@@ -2771,15 +2771,12 @@  (define-public rust-anyhow-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0w0zm1bqk5kbk834r4xszlzqiln4vw5k1lnlswyjkh24khi2ia1s"))))
+          (base32 "1q06xg4jn4lpad7lj1af28x5xdwymgl1k820zj2nnrhlbi2mp94l"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-development-inputs
-       (("rust-futures" ,rust-futures-0.3)
-        ("rust-rustversion" ,rust-rustversion-1)
-        ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-trybuild" ,rust-trybuild-1))))
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-backtrace" ,rust-backtrace-0.3))))
     (home-page "https://github.com/dtolnay/anyhow")
     (synopsis "Flexible concrete Error type")
     (description "This package provides a flexible concrete Error type built on
@@ -3266,7 +3263,7 @@  (define-public rust-arrayref-0.3
 (define-public rust-arrayvec-0.7
   (package
     (name "rust-arrayvec")
-    (version "0.7.0")
+    (version "0.7.2")
     (source
      (origin
        (method url-fetch)
@@ -3274,17 +3271,10 @@  (define-public rust-arrayvec-0.7
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1xza6jbs8x51yhh4qnwjw1crm33bhl975r965fpq1hqhpfq5hbss"))))
+          (base32 "1mjl8jjqxpl0x7sm9cij61cppi7yi38cdrd1l8zjw7h7qxk2v9cd"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-serde" ,rust-serde-1))
-       #:cargo-development-inputs
-       (("rust-bencher" ,rust-bencher-0.1)
-        ("rust-matches" ,rust-matches-0.1)
-        ("rust-serde-test" ,rust-serde-test-1))))
+      `(#:skip-build? #t #:cargo-inputs (("rust-serde" ,rust-serde-1))))
     (home-page "https://github.com/bluss/arrayvec")
     (synopsis "Vector with fixed capacity")
     (description
@@ -4970,26 +4960,21 @@  (define-public rust-async-tls-0.10
 (define-public rust-async-trait-0.1
   (package
     (name "rust-async-trait")
-    (version "0.1.42")
+    (version "0.1.52")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "async-trait" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0gd13pqgw5m6l4bqwjkickq13c4v0jxzxs5i4dwmldrlgvklafld"))))
+          (base32 "1qv5l9izrd96zcrlcr4x1kh41ylq1d9702f3vl8w11m2rb67l6h6"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))
-       #:cargo-development-inputs
-       (("rust-rustversion" ,rust-rustversion-1)
-        ("rust-tracing" ,rust-tracing-0.1)
-        ("rust-tracing-attributes" ,rust-tracing-attributes-0.1)
-        ("rust-tracing-futures" ,rust-tracing-futures-0.2)
-        ("rust-trybuild" ,rust-trybuild-1))))
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-proc-macro2" ,rust-proc-macro2-1)
+         ("rust-quote" ,rust-quote-1)
+         ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/dtolnay/async-trait")
     (synopsis "Type erasure for async trait methods")
     (description "This package provides type erasure for async trait
@@ -7799,7 +7784,7 @@  (define-public rust-block-modes-0.7
 (define-public rust-block-padding-0.2
   (package
     (name "rust-block-padding")
-    (version "0.2.0")
+    (version "0.2.1")
     (source
       (origin
         (method url-fetch)
@@ -7807,9 +7792,9 @@  (define-public rust-block-padding-0.2
         (file-name
          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "0x6b2dgink7rc3755r8jl4kmndydy5563h3wz7z9jqrb25ygv2y9"))))
+          (base32 "1bickjlmfw9iv63dp781n589rfybw879mik1va59833m1hvnqscd"))))
     (build-system cargo-build-system)
+    (arguments `(#:skip-build? #t))
     (home-page "https://github.com/RustCrypto/utils")
     (synopsis "Padding and unpadding of messages divided into blocks")
     (description
@@ -12810,10 +12795,10 @@  (define-public rust-cookie-factory-0.3
 similar to the nom parser combinators library.")
     (license license:expat)))
 
-(define-public rust-cookie-store-0.7
+(define-public rust-cookie-store-0.15
   (package
     (name "rust-cookie-store")
-    (version "0.7.0")
+    (version "0.15.1")
     (source
      (origin
        (method url-fetch)
@@ -12821,23 +12806,20 @@  (define-public rust-cookie-store-0.7
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "174i9k9g62pfx7y1nqynywdpjplkl3j4hi3ck6bz2r996qzhnxa6"))))
+          (base32 "0z0navy9k0ivrdvz492q8c4nhd3iv5l77hwfppskdp1j15607xxk"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-cookie" ,rust-cookie-0.12)
-        ("rust-idna" ,rust-idna-0.1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-publicsuffix" ,rust-publicsuffix-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-try-from" ,rust-try-from-0.3)
-        ("rust-url" ,rust-url-1))
-       #:cargo-development-inputs
-       (("rust-env-logger" ,rust-env-logger-0.6)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-0.6))))
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-cookie" ,rust-cookie-0.15)
+         ("rust-idna" ,rust-idna-0.2)
+         ("rust-indexmap" ,rust-indexmap-1)
+         ("rust-log" ,rust-log-0.4)
+         ("rust-publicsuffix" ,rust-publicsuffix-2)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-serde-json" ,rust-serde-json-1)
+         ("rust-time" ,rust-time-0.2)
+         ("rust-url" ,rust-url-2))))
     (home-page "https://github.com/pfernie/cookie_store")
     (synopsis "Implementation of Cookie storage and retrieval per RFC6265")
     (description
@@ -25478,14 +25460,14 @@  (define-public rust-gzip-header-0.3
 (define-public rust-h2-0.3
   (package
     (name "rust-h2")
-    (version "0.3.7")
+    (version "0.3.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "h2" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0mdf0x3cxj4rhx2zrm0gnx02i43gqcz3q4awzidargff5xb1kn3z"))))
+          (base32 "13pzhasjizgv0v21yvrx3majd4xpipc1z1vyvwvbmcn7vlbzgwfr"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -27543,31 +27525,29 @@  (define-public rust-hyper-old-types-0.11
 0.11.x.")
     (license license:expat)))
 
-(define-public rust-hyper-rustls-0.22
+(define-public rust-hyper-rustls-0.23
   (package
     (name "rust-hyper-rustls")
-    (version "0.22.1")
+    (version "0.23.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "hyper-rustls" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0r2szp06nzqx6gblcw69kwx8afjp218fc083kfpw0i3d66bpm7sz"))))
+          (base32 "1b2wi75qrmwfpw3pqwcg1xjndl4z0aris15296wf7i8d5v04hz6q"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-ct-logs" ,rust-ct-logs-0.8)
-        ("rust-futures-util" ,rust-futures-util-0.3)
-        ("rust-hyper" ,rust-hyper-0.14)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-rustls" ,rust-rustls-0.19)
-        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.5)
-        ("rust-tokio" ,rust-tokio-1)
-        ("rust-tokio-rustls" ,rust-tokio-rustls-0.22)
-        ("rust-webpki" ,rust-webpki-0.21)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.21))))
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-http" ,rust-http-0.2)
+         ("rust-hyper" ,rust-hyper-0.14)
+         ("rust-log" ,rust-log-0.4)
+         ("rust-rustls" ,rust-rustls-0.20)
+         ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
+         ("rust-tokio" ,rust-tokio-1)
+         ("rust-tokio-rustls" ,rust-tokio-rustls-0.23)
+         ("rust-webpki-roots" ,rust-webpki-roots-0.22))))
     (home-page "https://github.com/ctz/hyper-rustls")
     (synopsis "Rustls+Hyper integration for pure Rust HTTPS")
     (description
@@ -27577,7 +27557,7 @@  (define-public rust-hyper-rustls-0.22
 
 (define-public rust-hyper-rustls-0.21
   (package
-    (inherit rust-hyper-rustls-0.22)
+    (inherit rust-hyper-rustls-0.23)
     (name "rust-hyper-rustls")
     (version "0.21.0")
     (source
@@ -30600,18 +30580,19 @@  (define-public rust-lexopt-0.2
 (define-public rust-libc-0.2
   (package
     (name "rust-libc")
-    (version "0.2.112")
+    (version "0.2.117")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libc" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "09bik7pcck869kfr5i9hjhnck0mzpd9v0ijxbqnh8fja6rzx20qv"))))
+          (base32 "0v52a7r5kmgc97rjf1sm3p3gkw3djzrnld4sli65nnxnz7h74kg7"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
     (home-page "https://github.com/rust-lang/libc")
     (synopsis "Raw FFI bindings to platform libraries like libc")
     (description
@@ -35475,17 +35456,18 @@  (define-public rust-napi-sys-0.4
 (define-public rust-native-tls-0.2
   (package
     (name "rust-native-tls")
-    (version "0.2.7")
+    (version "0.2.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "native-tls" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1m6v16xl8h4pm32pw6yhrvgwznf60bqhj2qhb1yrb8wd3hp6pndq"))))
+        (base32 "0kdj0drgp8cqk3v430c5ac7dfpzvhm1621w96cpz985m35vrzfj8"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f                      ; tests require network access
+       #:skip-build? #t
        #:cargo-inputs
        (("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-libc" ,rust-libc-0.2)
@@ -35496,14 +35478,7 @@  (define-public rust-native-tls-0.2
         ("rust-schannel" ,rust-schannel-0.1)
         ("rust-security-framework" ,rust-security-framework-2)
         ("rust-security-framework-sys" ,rust-security-framework-sys-2)
-        ("rust-tempfile" ,rust-tempfile-3))
-       #:cargo-development-inputs
-       (("rust-hex" ,rust-hex-0.4)
-        ("rust-test-cert-gen" ,rust-test-cert-gen-0.1))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list openssl))
+        ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/sfackler/rust-native-tls")
     (synopsis "Wrapper over a platform's native TLS implementation")
     (description
@@ -47071,14 +47046,14 @@  (define-public rust-recycler-0.1
 (define-public rust-redox-syscall-0.2
   (package
     (name "rust-redox-syscall")
-    (version "0.2.5")
+    (version "0.2.10")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "redox_syscall" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1n878lpw577avdr5dzbkil02xwbx0a57mr2r3dcnnkz28i71wd4l"))))
+          (base32 "1zq36bhw4c6xig340ja1jmr36iy0d3djp8smsabxx71676bg70w3"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -47673,14 +47648,14 @@  (define-public rust-reopen-0.3
 (define-public rust-reqwest-0.11
   (package
     (name "rust-reqwest")
-    (version "0.11.4")
+    (version "0.11.9")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "reqwest" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "08kdxaa7c5wzlr2f4qkqlczc86p30sz84xllk83dyxxvp5hryvi4"))))
+          (base32 "0995ng67r8rry8864wxp2iwkpr4sc34fgny6p9wrllwa93ql5wl7"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -47688,15 +47663,16 @@  (define-public rust-reqwest-0.11
        (("rust-async-compression" ,rust-async-compression-0.3)
         ("rust-base64" ,rust-base64-0.13)
         ("rust-bytes" ,rust-bytes-1)
-        ("rust-cookie" ,rust-cookie-0.14)
-        ("rust-cookie-store" ,rust-cookie-store-0.12)
+        ("rust-cookie" ,rust-cookie-0.15)
+        ("rust-cookie-store" ,rust-cookie-store-0.15)
         ("rust-encoding-rs" ,rust-encoding-rs-0.8)
         ("rust-futures-core" ,rust-futures-core-0.3)
         ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-h2" ,rust-h2-0.3)
         ("rust-http" ,rust-http-0.2)
         ("rust-http-body" ,rust-http-body-0.4)
         ("rust-hyper" ,rust-hyper-0.14)
-        ("rust-hyper-rustls" ,rust-hyper-rustls-0.22)
+        ("rust-hyper-rustls" ,rust-hyper-rustls-0.23)
         ("rust-hyper-tls" ,rust-hyper-tls-0.5)
         ("rust-ipnet" ,rust-ipnet-2)
         ("rust-js-sys" ,rust-js-sys-0.3)
@@ -47707,15 +47683,16 @@  (define-public rust-reqwest-0.11
         ("rust-native-tls" ,rust-native-tls-0.2)
         ("rust-percent-encoding" ,rust-percent-encoding-2)
         ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
-        ("rust-rustls" ,rust-rustls-0.19)
-        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.5)
+        ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)
+        ("rust-rustls" ,rust-rustls-0.20)
+        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
+        ("rust-rustls-pemfile" ,rust-rustls-pemfile-0.2)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
-        ("rust-time" ,rust-time-0.2)
         ("rust-tokio" ,rust-tokio-1)
         ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)
-        ("rust-tokio-rustls" ,rust-tokio-rustls-0.22)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.23)
         ("rust-tokio-socks" ,rust-tokio-socks-0.5)
         ("rust-tokio-util" ,rust-tokio-util-0.6)
         ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.20)
@@ -47723,17 +47700,8 @@  (define-public rust-reqwest-0.11
         ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
         ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
         ("rust-web-sys" ,rust-web-sys-0.3)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.21)
-        ("rust-winreg" ,rust-winreg-0.7))
-       #:cargo-development-inputs
-       (("rust-brotli" ,rust-brotli-3)
-        ("rust-doc-comment" ,rust-doc-comment-0.3)
-        ("rust-env-logger" ,rust-env-logger-0.8)
-        ("rust-hyper" ,rust-hyper-0.14)
-        ("rust-libflate" ,rust-libflate-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-tokio" ,rust-tokio-1)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+        ("rust-webpki-roots" ,rust-webpki-roots-0.22)
+        ("rust-winreg" ,rust-winreg-0.7))))
     (home-page "https://github.com/seanmonstar/reqwest")
     (synopsis "High level HTTP client library")
     (description "This package provides a high level HTTP client library.")
@@ -47832,7 +47800,7 @@  (define-public rust-reqwest-0.9
        (("rust-base64" ,rust-base64-0.10)
         ("rust-bytes" ,rust-bytes-0.4)
         ("rust-cookie" ,rust-cookie-0.12)
-        ("rust-cookie-store" ,rust-cookie-store-0.7)
+        ("rust-cookie-store" ,rust-cookie-store-0.15)
         ("rust-encoding-rs" ,rust-encoding-rs-0.8)
         ("rust-flate2" ,rust-flate2-1)
         ("rust-futures" ,rust-futures-0.1)
@@ -53048,14 +53016,14 @@  (define-public rust-seq-macro-0.2
 (define-public rust-serde-1
   (package
     (name "rust-serde")
-    (version "1.0.133")
+    (version "1.0.136")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16lq33l09nkm0hxdhfjjmh3yjv83rrcqw9lbxb8y4q3va5km0mlp"))))
+          (base32 "12a791cbdd3gi08536i4frrqsps0ak8gvhpijvgj9rg1055y4cff"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -53444,22 +53412,21 @@  (define-public rust-serdeconv-0.4
 (define-public rust-serde-derive-1
   (package
     (name "rust-serde-derive")
-    (version "1.0.133")
+    (version "1.0.136")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde-derive" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0dym0l8a0pch0mkqnhrf89n4wngzwf0d1z88hb8dhs456acic87d"))))
+          (base32 "1yb28smlymba4qbj2bn4c4myvblypqvkxv9q33s0dlzwa9qpwn88"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))
-       #:cargo-development-inputs
-       (("rust-serde" ,rust-serde-1))))
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-proc-macro2" ,rust-proc-macro2-1)
+         ("rust-quote" ,rust-quote-1)
+         ("rust-syn" ,rust-syn-1))))
     (home-page "https://serde.rs")
     (synopsis
      "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]")
@@ -53548,28 +53515,22 @@  (define-public rust-serde-ignored-0.1
 (define-public rust-serde-json-1
   (package
     (name "rust-serde-json")
-    (version "1.0.74")
+    (version "1.0.79")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde-json" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0hiixjnrnrvvpyh58av73ds924zgzi4wl0mv8p9nan0w0v6vjazf"))))
+          (base32 "158xd1swdvw6y59bx4avb8vdpj727n54r77xw5f7c15kqfjrz3cf"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-indexmap" ,rust-indexmap-1)
-        ("rust-itoa" ,rust-itoa-1)
-        ("rust-ryu" ,rust-ryu-1)
-        ("rust-serde" ,rust-serde-1))
-       #:cargo-development-inputs
-       (("rust-automod" ,rust-automod-1)
-        ("rust-rustversion" ,rust-rustversion-1)
-        ("rust-serde-bytes" ,rust-serde-bytes-0.11)
-        ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-serde-stacker" ,rust-serde-stacker-0.1)
-        ("rust-trybuild" ,rust-trybuild-1))))
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-indexmap" ,rust-indexmap-1)
+         ("rust-itoa" ,rust-itoa-1)
+         ("rust-ryu" ,rust-ryu-1)
+         ("rust-serde" ,rust-serde-1))))
     (home-page "https://github.com/serde-rs/json")
     (synopsis "JSON serialization file format")
     (description
@@ -53640,7 +53601,7 @@  (define-public rust-serde-macros-0.4
 (define-public rust-serde-path-to-error-0.1
   (package
     (name "rust-serde-path-to-error")
-    (version "0.1.4")
+    (version "0.1.7")
     (source
       (origin
         (method url-fetch)
@@ -53648,16 +53609,10 @@  (define-public rust-serde-path-to-error-0.1
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0n5ilbsxvi174m2fd506ivd43kws0yh523li1xz0zqh60ngi1xj2"))))
+          (base32 "0xx3n62nyjvrjzg4ypm5419ywy22285j5a4rx858lshrp39qm1np"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-serde" ,rust-serde-1))
-        #:cargo-development-inputs
-        (("rust-serde-derive" ,rust-serde-derive-1)
-         ("rust-serde-json" ,rust-serde-json-1))))
+      `(#:skip-build? #t #:cargo-inputs (("rust-serde" ,rust-serde-1))))
     (home-page
       "https://github.com/dtolnay/path-to-error")
     (synopsis
@@ -53704,14 +53659,14 @@  (define-public rust-serde-qs-0.7
 (define-public rust-serde-repr-0.1
   (package
     (name "rust-serde-repr")
-    (version "0.1.6")
+    (version "0.1.7")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde_repr" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0xhwamlb1ax3w87mpq0awcphwchprh93y1hb47rm3c0p3favgiid"))))
+          (base32 "1mcy39p1g3z49rzzsadfhpy6yv2f3zx9ihhplbpjk32i01lm3l4q"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -54313,7 +54268,7 @@  (define-public rust-sha-1-0.9
   (package
     (inherit rust-sha-1-0.10)
     (name "rust-sha-1")
-    (version "0.9.1")
+    (version "0.9.8")
     (source
      (origin
        (method url-fetch)
@@ -54321,20 +54276,16 @@  (define-public rust-sha-1-0.9
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0w37j7swjkbzgi9mf7ihkw0zfik6vl97fs6jdpqs6r68hvm3c2hp"))))
+          (base32 "19jibp8l9k5v4dnhj5kfhaczdfd997h22qz0hin6pw9wvc9ngkcr"))))
     (arguments
-     `(#:cargo-inputs
-       (("rust-block-buffer" ,rust-block-buffer-0.9)
-        ("rust-cfg-if" ,rust-cfg-if-0.1)
-        ("rust-cpuid-bool" ,rust-cpuid-bool-0.1)
-        ("rust-digest" ,rust-digest-0.9)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-opaque-debug" ,rust-opaque-debug-0.3)
-        ("rust-sha1-asm" ,rust-sha1-asm-0.4))
-       #:cargo-development-inputs
-       (("rust-digest" ,rust-digest-0.9)
-        ("rust-hex-literal" ,rust-hex-literal-0.2))))))
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-block-buffer" ,rust-block-buffer-0.9)
+         ("rust-cfg-if" ,rust-cfg-if-1)
+         ("rust-cpufeatures" ,rust-cpufeatures-0.2)
+         ("rust-digest" ,rust-digest-0.9)
+         ("rust-opaque-debug" ,rust-opaque-debug-0.3)
+         ("rust-sha1-asm" ,rust-sha1-asm-0.5))))))
 
 (define-public rust-sha-1-0.8
   (package
@@ -54517,7 +54468,7 @@  (define-public rust-sha2-0.9
   (package
     (inherit rust-sha2-0.10)
     (name "rust-sha2")
-    (version "0.9.5")
+    (version "0.9.9")
     (source
       (origin
         (method url-fetch)
@@ -54525,19 +54476,16 @@  (define-public rust-sha2-0.9
         (file-name
          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "04lzf4swq6cijvxnc6facr3g72h5v7a5z8lz3xrkf8gxa9bswqmk"))))
+          (base32 "006q2f0ar26xcjxqz8zsncfgz86zqa5dkwlwv03rhx1rpzhs2n2d"))))
     (arguments
-     `(#:cargo-inputs
-       (("rust-block-buffer" ,rust-block-buffer-0.9)
-        ("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-cpufeatures" ,rust-cpufeatures-0.1)
-        ("rust-digest" ,rust-digest-0.9)
-        ("rust-opaque-debug" ,rust-opaque-debug-0.3)
-        ("rust-sha2-asm" ,rust-sha2-asm-0.6))
-       #:cargo-development-inputs
-       (("rust-digest" ,rust-digest-0.9)
-        ("rust-hex-literal" ,rust-hex-literal-0.2))))))
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-block-buffer" ,rust-block-buffer-0.9)
+         ("rust-cfg-if" ,rust-cfg-if-1)
+         ("rust-cpufeatures" ,rust-cpufeatures-0.2)
+         ("rust-digest" ,rust-digest-0.9)
+         ("rust-opaque-debug" ,rust-opaque-debug-0.3)
+         ("rust-sha2-asm" ,rust-sha2-asm-0.6))))))
 
 (define-public rust-sha2-0.8
   (package
@@ -58153,7 +58101,7 @@  (define-public rust-strsim-0.5
 (define-public rust-structopt-0.3
   (package
     (name "rust-structopt")
-    (version "0.3.21")
+    (version "0.3.26")
     (source
      (origin
        (method url-fetch)
@@ -58161,15 +58109,15 @@  (define-public rust-structopt-0.3
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "136j0lvjmpv5syi751vxg8vb30gfyv4k81x8d18kxrj6xvbsqxsj"))))
+          (base32 "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-structopt-derive" ,rust-structopt-derive-0.4)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-clap" ,rust-clap-2))))
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-clap" ,rust-clap-2)
+         ("rust-lazy-static" ,rust-lazy-static-1)
+         ("rust-paw" ,rust-paw-1)
+         ("rust-structopt-derive" ,rust-structopt-derive-0.4))))
     (home-page "https://github.com/TeXitoi/structopt")
     (synopsis "Parse command line argument by defining a struct")
     (description
@@ -58204,7 +58152,7 @@  (define-public rust-structopt-0.2
 (define-public rust-structopt-derive-0.4
   (package
    (name "rust-structopt-derive")
-   (version "0.4.14")
+   (version "0.4.18")
    (source
     (origin
      (method url-fetch)
@@ -58212,8 +58160,7 @@  (define-public rust-structopt-derive-0.4
      (file-name
       (string-append name "-" version ".tar.gz"))
      (sha256
-      (base32
-       "143gjwvz3s86hwp070km83y25n8kqp5f01kb1dr19f4ilkywvaav"))))
+          (base32 "1q5gcigmvw0cinjxzpyrkflliq5r1ivljmrvfrl3phcwgwraxdfw"))))
    (build-system cargo-build-system)
    (arguments
     `(#:skip-build? #t
@@ -58227,7 +58174,7 @@  (define-public rust-structopt-derive-0.4
    (synopsis "Parse command line argument by defining a struct, derive crate")
    (description
     "This package provides the derive Rust crate for the structopt crate.")
-   (license license:asl2.0)))
+    (license (list license:asl2.0 license:expat))))
 
 (define-public rust-structopt-derive-0.2
   (package
@@ -60555,26 +60502,26 @@  (define-public rust-tempdir-0.3
 (define-public rust-tempfile-3
   (package
     (name "rust-tempfile")
-    (version "3.2.0")
+    (version "3.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tempfile" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "08pbf3c1i42382dc44dil5bgiawcsi0qk6zdibw10f69rxiwdhfs"))))
+          (base32 "1r3rdp66f7w075mz6blh244syr3h0lbm07ippn7xrbgfxbs1xnsw"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-rand" ,rust-rand-0.8)
-        ("rust-redox-syscall" ,rust-redox-syscall-0.2)
-        ("rust-remove-dir-all" ,rust-remove-dir-all-0.5)
-        ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://stebalien.com/projects/tempfile-rs")
-    (synopsis "Library for managing temporary files and directories")
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-cfg-if" ,rust-cfg-if-1)
+         ("rust-fastrand" ,rust-fastrand-1)
+         ("rust-libc" ,rust-libc-0.2)
+         ("rust-redox-syscall" ,rust-redox-syscall-0.2)
+         ("rust-remove-dir-all" ,rust-remove-dir-all-0.5)
+         ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "http://stebalien.com/projects/tempfile-rs")
+    (synopsis "A library for managing temporary files and directories.")
     (description
      "This package provides a library for managing temporary files and
 directories.")
@@ -61265,7 +61212,7 @@  (define-public rust-thin-slice-0.1
 (define-public rust-thiserror-1
   (package
     (name "rust-thiserror")
-    (version "1.0.26")
+    (version "1.0.30")
     (source
      (origin
        (method url-fetch)
@@ -61273,18 +61220,12 @@  (define-public rust-thiserror-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1qmz542pq4wmz3p0s4kavsqv09h0x99klkf3k33ydjy1x97rw4ck"))))
+          (base32 "05y4wm29ck8flwq5k1q6nhwh00a3b30cz3xr0qvnbwad5vjsnjw5"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-thiserror-impl" ,rust-thiserror-impl-1))
-       #:cargo-development-inputs
-       (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-ref-cast" ,rust-ref-cast-1)
-        ("rust-rustversion" ,rust-rustversion-1)
-        ("rust-trybuild" ,rust-trybuild-1))))
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-thiserror-impl" ,rust-thiserror-impl-1))))
     (home-page "https://github.com/dtolnay/thiserror")
     (synopsis "derive(Error)")
     (description "This package provides @code{derive(Error)} in Rust.")
@@ -61293,7 +61234,7 @@  (define-public rust-thiserror-1
 (define-public rust-thiserror-impl-1
   (package
     (name "rust-thiserror-impl")
-    (version "1.0.26")
+    (version "1.0.30")
     (source
      (origin
        (method url-fetch)
@@ -61301,8 +61242,7 @@  (define-public rust-thiserror-impl-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0ia72qiynlws5avb8f1xqlazp4g6bqgzjbwy5vs6nyg7myh6j386"))))
+          (base32 "0jviwmvx6wzawsj6c9msic7h419wmsbjagl9dzhpydkzc8zzscma"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -62150,21 +62090,19 @@  (define-public rust-titlecase-1
 (define-public rust-tokio-1
   (package
     (name "rust-tokio")
-    (version "1.15.0")
+    (version "1.16.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tokio" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0f2qwp9ljc4gf955g7qcksp0jc1bwmzxb2nf6mb7h1n2irvirgzv"))))
+          (base32 "02pwb89x5lixdpfpxjdmngqwq782jfx1cxy5x04x7rjxc95sc9qc"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-autocfg" ,rust-autocfg-1)
-        ("rust-bytes" ,rust-bytes-1)
+       (("rust-bytes" ,rust-bytes-1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-memchr" ,rust-memchr-2)
         ("rust-mio" ,rust-mio-0.7)
@@ -63101,10 +63039,10 @@  (define-public rust-tokio-reactor-0.1
      "Event loop that drives Tokio I/O resources.")
     (license license:expat)))
 
-(define-public rust-tokio-rustls-0.22
+(define-public rust-tokio-rustls-0.23
   (package
     (name "rust-tokio-rustls")
-    (version "0.22.0")
+    (version "0.23.2")
     (source
      (origin
        (method url-fetch)
@@ -63112,14 +63050,14 @@  (define-public rust-tokio-rustls-0.22
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1dp1s2kai081f3fn9gjq92x2lw7lm7iqpcsl02cg2zg5fbg48s5w"))))
+          (base32 "06y1w47i6pd6w9mrf5ylik0bj22s1x9v06gscy1bs0lqhcmmyzd2"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-rustls" ,rust-rustls-0.19)
+       (("rust-rustls" ,rust-rustls-0.20)
         ("rust-tokio" ,rust-tokio-1)
-        ("rust-webpki" ,rust-webpki-0.21))))
+        ("rust-webpki" ,rust-webpki-0.22))))
     (home-page "https://github.com/tokio-rs/tls")
     (synopsis "Asynchronous TLS/SSL streams for Tokio")
     (description
@@ -63129,7 +63067,7 @@  (define-public rust-tokio-rustls-0.22
 
 (define-public rust-tokio-rustls-0.14
   (package
-    (inherit rust-tokio-rustls-0.22)
+    (inherit rust-tokio-rustls-0.23)
     (name "rust-tokio-rustls")
     (version "0.14.1")
     (source
@@ -64047,7 +63985,7 @@  (define-public rust-tonic-0.6
          ("rust-prost-derive" ,rust-prost-derive-0.9)
          ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.5)
          ("rust-tokio" ,rust-tokio-1)
-         ("rust-tokio-rustls" ,rust-tokio-rustls-0.22)
+         ("rust-tokio-rustls" ,rust-tokio-rustls-0.23)
          ("rust-tokio-stream" ,rust-tokio-stream-0.1)
          ("rust-tokio-util" ,rust-tokio-util-0.6)
          ("rust-tower" ,rust-tower-0.4)
@@ -64228,28 +64166,23 @@  (define-public rust-tower-util-0.3
 (define-public rust-tracing-0.1
   (package
     (name "rust-tracing")
-    (version "0.1.23")
+    (version "0.1.30")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tracing" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1ww7akgck54yc9a2yrl7qnvqpqgwiz6ab2cd1lq377h2zli0mm7p"))))
+          (base32 "1faza94zaf6cwd3fmrwj6bq2xz538wpaxxakb46yba729wsr739d"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-log" ,rust-log-0.4)
         ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
         ("rust-tracing-attributes" ,rust-tracing-attributes-0.1)
-        ("rust-tracing-core" ,rust-tracing-core-0.1))
-       #:cargo-development-inputs
-       (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-futures" ,rust-futures-0.1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-tokio" ,rust-tokio-0.2)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+        ("rust-tracing-core" ,rust-tracing-core-0.1))))
     (home-page "https://tokio.rs")
     (synopsis "Application-level tracing for Rust")
     (description "@code{rust-tracing} is a framework for instrumenting Rust
@@ -64259,27 +64192,21 @@  (define-public rust-tracing-0.1
 (define-public rust-tracing-attributes-0.1
   (package
     (name "rust-tracing-attributes")
-    (version "0.1.12")
+    (version "0.1.19")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tracing-attributes" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0iwzcbcrkyn7bnhdnzp4lanw3md2dx15jr3nyi7881s1gvm81w23"))))
+          (base32 "05m7wxidfsx3mnvi8adq8532cn1xnm8as0skmnvxfn55lfjdjxl2"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))
-       #:cargo-development-inputs
-       (("rust-async-trait" ,rust-async-trait-0.1)
-        ("rust-tokio-test" ,rust-tokio-test-0.2)
-        ("rust-tracing" ,rust-tracing-0.1)
-        ("rust-tracing-core" ,rust-tracing-core-0.1)
-        ("rust-tracing-futures" ,rust-tracing-futures-0.2))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://tokio.rs")
     (synopsis "Automatically instrument functions")
     (description "This package provides procedural macro attributes for
@@ -64289,18 +64216,20 @@  (define-public rust-tracing-attributes-0.1
 (define-public rust-tracing-core-0.1
   (package
     (name "rust-tracing-core")
-    (version "0.1.21")
+    (version "0.1.22")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tracing-core" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1r262wskhm6wmc5i2bxz44nglyzqaq3x50s0h5q0ffdq6xbdckhz"))))
+          (base32 "08wssa1n70vg02nfw6ykfzjhind88ws8vjqi64nsfch6718wpkq3"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-lazy-static" ,rust-lazy-static-1))))
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-valuable" ,rust-valuable-0.1))))
     (home-page "https://tokio.rs")
     (synopsis "Core primitives for application-level tracing")
     (description
@@ -64843,7 +64772,7 @@  (define-public rust-trust-dns-https-0.20
         ("rust-rustls" ,rust-rustls-0.19)
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-tokio" ,rust-tokio-1)
-        ("rust-tokio-rustls" ,rust-tokio-rustls-0.22)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.23)
         ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20)
         ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.20)
         ("rust-webpki" ,rust-webpki-0.21)
@@ -65351,7 +65280,7 @@  (define-public rust-trust-dns-resolver-0.20
         ("rust-tokio" ,rust-tokio-1)
         ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)
         ("rust-tokio-openssl" ,rust-tokio-openssl-0.6)
-        ("rust-tokio-rustls" ,rust-tokio-rustls-0.22)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.23)
         ("rust-trust-dns-https" ,rust-trust-dns-https-0.20)
         ("rust-trust-dns-native-tls" ,rust-trust-dns-native-tls-0.20)
         ("rust-trust-dns-openssl" ,rust-trust-dns-openssl-0.20)
@@ -65504,7 +65433,7 @@  (define-public rust-trust-dns-rustls-0.20
         ("rust-log" ,rust-log-0.4)
         ("rust-rustls" ,rust-rustls-0.19)
         ("rust-tokio" ,rust-tokio-1)
-        ("rust-tokio-rustls" ,rust-tokio-rustls-0.22)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.23)
         ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20)
         ("rust-webpki" ,rust-webpki-0.21))))
     (home-page "http://www.trust-dns.org/index.html")
@@ -67492,6 +67421,56 @@  (define-public rust-v-frame-0.2
 a part of rav1e.")
     (license license:bsd-2)))
 
+(define-public rust-valuable-derive-0.1
+  (package
+    (name "rust-valuable-derive")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "valuable-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cjvqljzsj891cjzlwv0ihrv4m0n5211a6pr6b7cz42ich66ji4x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build?
+       #t
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/tokio-rs/valuable")
+    (synopsis "Macros for the `valuable` crate.")
+    (description "Macros for the `valuable` crate.")
+    (license license:expat)))
+
+(define-public rust-valuable-0.1
+  (package
+    (name "rust-valuable")
+    (version "0.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "valuable" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "0v9gp3nkjbl30z0fd56d8mx7w1csk86wwjhfjhr400wh9mfpw2w3"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build?
+        #t
+        #:cargo-inputs
+        (("rust-valuable-derive" ,rust-valuable-derive-0.1))))
+    (home-page "https://github.com/tokio-rs/valuable")
+    (synopsis
+      "Object-safe value inspection, used to pass un-typed structured data across trait-object boundaries.
+")
+    (description
+      "Object-safe value inspection, used to pass un-typed structured data across
+trait-object boundaries.")
+    (license license:expat)))
+
 (define-public rust-value-bag-1
   (package
     (name "rust-value-bag")
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 5b27bf3647..f8d6dcc1ce 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1297,70 +1297,65 @@  (define-public watchexec
 (define-public rbw
   (package
     (name "rbw")
-    (version "1.4.1")
+    (version "1.4.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rbw" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0zszp9hvilpikbd66b5zbvspks0spv8dh0yry0sxnc5yqvl2ixnf"))))
+          (base32 "1177jjf3rksbi3rjw9215fkg1am3i6ph1wssf8svkd3in0sxqrhf"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'configure 'relax-requirements
-           (lambda _
-             (substitute*
-                 "guix-vendor/rust-password-hash-0.3.2.tar.gz/Cargo.toml"
-               (("version = \">=1, <1.1.0\"") "version = \">=1\""))
-             (substitute*
-                 "guix-vendor/rust-rsa-0.5.0.tar.gz/Cargo.toml"
-               (("version = \">=1, <1.5\"") "version = \"^1\""))
-             (substitute*
-                 "Cargo.toml"
-               (("version = \"1.4\"") "version = \"^1\"")))))
-       #:cargo-inputs
-       (("rust-aes" ,rust-aes-0.7)
-        ("rust-anyhow" ,rust-anyhow-1)
-        ("rust-arrayvec" ,rust-arrayvec-0.7)
-        ("rust-async-trait" ,rust-async-trait-0.1)
-        ("rust-base32" ,rust-base32-0.4)
-        ("rust-base64" ,rust-base64-0.13)
-        ("rust-block-modes" ,rust-block-modes-0.8)
-        ("rust-block-padding" ,rust-block-padding-0.2)
-        ("rust-daemonize" ,rust-daemonize-0.4)
-        ("rust-directories" ,rust-directories-4)
-        ("rust-env-logger" ,rust-env-logger-0.9)
-        ("rust-hkdf" ,rust-hkdf-0.11)
-        ("rust-hmac" ,rust-hmac-0.11)
-        ("rust-humantime" ,rust-humantime-2)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-nix" ,rust-nix-0.23)
-        ("rust-paw" ,rust-paw-1)
-        ("rust-pbkdf2" ,rust-pbkdf2-0.9)
-        ("rust-percent-encoding" ,rust-percent-encoding-2)
-        ("rust-rand" ,rust-rand-0.8)
-        ("rust-region" ,rust-region-3)
-        ("rust-reqwest" ,rust-reqwest-0.11)
-        ("rust-rsa" ,rust-rsa-0.5)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-serde-path-to-error" ,rust-serde-path-to-error-0.1)
-        ("rust-serde-repr" ,rust-serde-repr-0.1)
-        ("rust-sha-1" ,rust-sha-1-0.9)
-        ("rust-sha2" ,rust-sha2-0.9)
-        ("rust-structopt" ,rust-structopt-0.3)
-        ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-term-size" ,rust-term-size-0.3)
-        ("rust-textwrap" ,rust-textwrap-0.11)
-        ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-tokio" ,rust-tokio-1)
-        ("rust-totp-lite" ,rust-totp-lite-1)
-        ("rust-url" ,rust-url-2)
-        ("rust-uuid" ,rust-uuid-0.8)
-        ("rust-zeroize" ,rust-zeroize-1))))
+      `(#:phases
+        (modify-phases %standard-phases
+          (add-after 'configure 'relax-requirements
+            (lambda _
+              (substitute*
+                  "guix-vendor/rust-rsa-0.5.0.tar.gz/Cargo.toml"
+                (("version = \">=1, <1.5\"") "version = \"^1\""))
+              )))
+        #:cargo-inputs
+        (("rust-aes" ,rust-aes-0.7)
+         ("rust-anyhow" ,rust-anyhow-1)
+         ("rust-arrayvec" ,rust-arrayvec-0.7)
+         ("rust-async-trait" ,rust-async-trait-0.1)
+         ("rust-base32" ,rust-base32-0.4)
+         ("rust-base64" ,rust-base64-0.13)
+         ("rust-block-modes" ,rust-block-modes-0.8)
+         ("rust-block-padding" ,rust-block-padding-0.2)
+         ("rust-daemonize" ,rust-daemonize-0.4)
+         ("rust-directories" ,rust-directories-4)
+         ("rust-env-logger" ,rust-env-logger-0.9)
+         ("rust-hkdf" ,rust-hkdf-0.11)
+         ("rust-hmac" ,rust-hmac-0.11)
+         ("rust-humantime" ,rust-humantime-2)
+         ("rust-libc" ,rust-libc-0.2)
+         ("rust-log" ,rust-log-0.4)
+         ("rust-nix" ,rust-nix-0.23)
+         ("rust-paw" ,rust-paw-1)
+         ("rust-pbkdf2" ,rust-pbkdf2-0.9)
+         ("rust-percent-encoding" ,rust-percent-encoding-2)
+         ("rust-rand" ,rust-rand-0.8)
+         ("rust-region" ,rust-region-3)
+         ("rust-reqwest" ,rust-reqwest-0.11)
+         ("rust-rsa" ,rust-rsa-0.5)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-serde-json" ,rust-serde-json-1)
+         ("rust-serde-path-to-error" ,rust-serde-path-to-error-0.1)
+         ("rust-serde-repr" ,rust-serde-repr-0.1)
+         ("rust-sha-1" ,rust-sha-1-0.9)
+         ("rust-sha2" ,rust-sha2-0.9)
+         ("rust-structopt" ,rust-structopt-0.3)
+         ("rust-tempfile" ,rust-tempfile-3)
+         ("rust-term-size" ,rust-term-size-0.3)
+         ("rust-textwrap" ,rust-textwrap-0.11)
+         ("rust-thiserror" ,rust-thiserror-1)
+         ("rust-tokio" ,rust-tokio-1)
+         ("rust-totp-lite" ,rust-totp-lite-1)
+         ("rust-url" ,rust-url-2)
+         ("rust-uuid" ,rust-uuid-0.8)
+         ("rust-zeroize" ,rust-zeroize-1))))
     (home-page "https://git.tozt.net/rbw")
     (synopsis "Unofficial Bitwarden CLI")
     (description "This package is an unofficial command line client for
-- 
2.34.0