[bug#68312] [PATCH 000/156] Add atuin (WIP).

[bug#68312] [PATCH 000/156] Add atuin (WIP).

[Wilko Meyer]

Hi Guix,

I started packaging atuin[0], a tool written in Rust to keep ones shell
history in sync across systems/make it more easily searchable, for Guix.
It builds successfully on my system already from a manifest.scm, so I
decided to create a patchset for Guix proper. I'm almost certain,
there'll be a v2 of this patch series; as some package description do
not fully comply with the preferred style yet, I want to add the proper
cargo-development-inputs to dependencies where applicable, smooth rough
edges,and want to see if I get the sync server implementation for atuin
running as a shepherd service.

As this patch series got pretty big, I'm not sure what the best way is
to get all changes/atuin into Guix proper. Is it even feasible like this
from a reviewing perspective or should I see if I can split up this
patch series in 3 (atuin cli tool, and the two server implementations,
one for postgresql and one for sqlite) seperate ones?

Kind regards,

Wilko Meyer

[0]: https://github.com/atuinsh/atuin 

Wilko Meyer (156):
  gnu: Add rust-rocket-0.5.
  gnu: Add rust-asn1-rs-0.3.
  gnu: Add rust-rocket-codegen-0.5.
  gnu: Add rust-rocket-http-0.5.
  gnu: Add rust-webpki-roots-0.24.
  gnu: Add rust-asn1-rs-derive-0.1.
  gnu: rust-ascii-1: Update to 1.1.0.
  gnu: Add rust-atoi-2.
  gnu: Add rust-atomic-0.6.
  gnu: Add rust-atomic-write-file-0.1.
  gnu: Add rust-atuin-common-17.
  gnu: Add rust-atuin-client-17.
  gnu: Add rust-atuin-server-database-17.
  gnu: Add rust-atuin-server-17.
  gnu: Add rust-atuin-server-postgres-17.
  gnu: Add rust-axum-server-0.5.
  gnu: Add rust-axum-core-0.3.
  gnu: Add rust-axum-0.6.
  gnu: Add rust-axum-macros-0.3.
  gnu: Add rust-base16ct-0.1.
  gnu: Add rust-bigdecimal-0.4.
  gnu: Add rust-binascii-0.1.
  gnu: Add rust-bindgen-0.69.
  gnu: Add rust-borsh-1.
  gnu: Add rust-borsh-derive-1.
  gnu: Add rust-chacha20-0.9.
  gnu: Add rust-cint-0.3.
  gnu: Add rust-clipboard-0.4.
  gnu: Add rust-config-0.13.
  gnu: Add rust-cookie-0.18.
  gnu: Add rust-ubyte-0.10.
  gnu: Add rust-crypto-secretbox-0.1.
  gnu: Add rust-crypto-bigint-0.4.
  gnu: Add rust-csscolorparser-0.6.
  gnu: Add rust-curve25519-dalek-derive-0.1.
  gnu: Add rust-curve25519-dalek-4.
  gnu: Add rust-deltae-0.3.
  gnu: Add rust-rust-decimal-1.
  gnu: Add rust-der-parser-7.
  gnu: rust-derive-new-0.5: Update to 0.5.9.
  gnu: Add rust-devise-0.4.
  gnu: Add rust-devise-codegen-0.4.
  gnu: Add rust-devise-core-0.4.
  gnu: Add rust-diesel-2.
  gnu: Add rust-diesel-derives-2.
  gnu: Add rust-diesel-table-macro-syntax-0.1.
  gnu: rust-directories-5: Update to 5.0.1.
  gnu: Add rust-dlv-list-0.3.
  gnu: Add rust-ecdsa-0.14.
  gnu: Add rust-ed25519-2.
  gnu: Add rust-ed25519-dalek-2.
  gnu: Add rust-elliptic-curve-0.12.
  gnu: Add rust-ff-derive-0.12.
  gnu: Add rust-ff-0.12.
  gnu: Add rust-figment-0.10.
  gnu: Add rust-fiat-crypto-0.2.
  gnu: Add rust-finl-unicode-1.
  gnu: Add rust-flume-0.11.
  gnu: Add rust-futures-intrusive-0.5.
  gnu: Add rust-group-0.12.
  gnu: Add rust-http-range-header-0.3.
  gnu: rust-http-body-0.4: Update to 0.4.6.
  gnu: Add rust-iri-string-0.7.
  gnu: Add rust-inlinable-string-0.1.
  gnu: Add rust-indicatif-0.17.
  gnu: Add rust-interim-0.1.
  gnu: Add rust-ipnetwork-0.20.
  gnu: Add rust-iso8601-0.4.
  gnu: Add rust-rust-json5-0.4.
  gnu: Add rust-libsqlite3-sys-0.27.
  gnu: Add rust-logos-codegen-0.13.
  gnu: Add rust-logos-derive-0.13.
  gnu: Add rust-logos-0.13.
  gnu: Add rust-lru-0.12.
  gnu: rust-lru-0.7: Update to 0.7.8.
  gnu: Add rust-mach2-0.4.
  gnu: Add rust-mac-address-1.
  gnu: Add rust-matchit-0.7.
  gnu: Add rust-memmem-0.1.
  gnu: Add rust-merlin-3.
  gnu: Add rust-metrics-util-0.15.
  gnu: Add rust-metrics-exporter-prometheus-0.12.
  gnu: Add rust-metrics-macros-0.7.
  gnu: Add rust-metrics-0.21.
  gnu: rust-mime-0.3: Update to 0.3.17.
  gnu: Add rust-minspan-0.1.
  gnu: Add rust-multer-2.
  gnu: Add rust-nu-ansi-term-0.49.
  gnu: Add rust-oid-registry-0.4.
  gnu: Add rust-ordered-multimap-0.4.
  gnu: Add rust-p384-0.11.
  gnu: Add rust-parse-duration-2.
  gnu: Add rust-pear-0.2.
  gnu: Add rust-pear-codegen-0.2.
  gnu: Add rust-platforms-3.
  gnu: Add rust-poly1305-0.8.
  gnu: Add rust-proc-macro-crate-2.
  gnu: rust-proc-macro2-1: Update to 1.0.76.
  gnu: Add rust-proc-macro-diagnostics-0.10.
  gnu: Add rust-prost-derive-0.11.
  gnu: Add rust-prost-0.11.
  gnu: Add rust-prost-types-0.11.
  gnu: Add rust-quanta-0.11.
  gnu: Add rust-ratatui-0.24.
  gnu: Add rust-rfc6979-0.3.
  gnu: Add rust-runtime-format-0.1.
  gnu: Add rust-rust-ini-0.18.
  gnu: rust-schemars-0.8: Update to 0.8.16.
  gnu: rust-schemars-derive-0.8: Update to 0.8.16.
  gnu: Add rust-sec1-0.3.
  gnu: Add rust-rusty-parserk-0.3.
  gnu: Add rust-rusty-paseto-0.6.
  gnu: Add rust-serde-derive-internals-0.26.
  gnu: Update rust-serde-json-1 to 1.0.111.
  gnu: Add rust-serdect-0.1.
  gnu: rust-signature-1: Update to 1.6.4.
  gnu: rust-signature-derive-1: Update to 1.0.0-pre.7.
  gnu: Add rust-sketches-ddsketch-0.2.
  gnu: Add rust-sqlformat-0.2.
  gnu: Add rust-sqlx-core-0.7.
  gnu: Add rust-sqlx-0.7.
  gnu: Add rust-sqlx-macros-core-0.7.
  gnu: Add rust-sqlx-macros-0.7.
  gnu: Add rust-sqlx-postgres-0.7.
  gnu: Add rust-sqlx-mysql-0.7.
  gnu: Add rust-sqlx-sqlite-0.7.
  gnu: Add rust-sql-builder-3.
  gnu: Add rust-stable-pattern-0.1.
  gnu: Add rust-state-0.6.
  gnu: rust-subtle-2: Update to 2.5.0.
  gnu: rust-syn-2: Update to 2.0.48.
  gnu: Add rust-syn-derive-0.1.
  gnu: Add rust-sync-wrapper-0.1.
  gnu: Add rust-termwiz-0.20.
  gnu: Add rust-tiny-bip39-1.
  gnu: Add tokio-tunkstenite-0.20.
  gnu: Add rust-tower-http-0.4.
  gnu: Add rust-tracing-log-0.2.
  gnu: Add rust-tracing-tree-0.3.
  gnu: Add rust-tree-magic-db-3.
  gnu: Add rust-tree-magic-mini-3.
  gnu: Add rust-tungstenite-0.20.
  gnu: Add rust-type-builder-macro-0.18.
  gnu: Add rust-type-builder-0.18.
  gnu: rust-universal-hash-0.5: Update to 0.5.1.
  gnu: Add rust-urlencoding-2.
  gnu: Add rust-vt100-0.15.
  gnu: Add rust-vtparse-0.6.
  gnu: Add rust-wl-clipboard-rs-0.7.
  gnu: Add rust-wezterm-color-types-0.2.
  gnu: Add rust-wezterm-dynamic-derive-0.1.
  gnu: Add rust-wezterm-dynamic-0.1.
  gnu: Add rust-wezterm-bidi-0.2.
  gnu: Add rust-x509-parser-0.13.
  gnu: Add rust-yansi-1.
  gnu: Add atuin.

 gnu/packages/crates-io.scm  | 4125 ++++++++++++++++++++++++++++++++---
 gnu/packages/crates-web.scm |  161 +-
 gnu/packages/rust-apps.scm  |   57 +
 3 files changed, 4005 insertions(+), 338 deletions(-)


base-commit: d15ee33955b704a5eb43ddb6535ae1a38034884a
-- 
2.41.0

[bug#68312] [PATCH 001/156] gnu: Add rust-rocket-0.5.

[Wilko Meyer]

* gnu/packages/crates-web.scm (rust-rocket-0.5): New variable.

Change-Id: I9aa77833fc06a47a1c7eb307605698ce4bcd2f18
---
 gnu/packages/crates-web.scm | 57 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index e25abcb0859..25b17495ba4 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -2315,8 +2315,63 @@ (define-public rust-nickel-0.11
 @code{express} framework for JavaScript.")
     (license license:expat)))
 
+(define-public rust-rocket-0.5
+  (package
+    (name "rust-rocket")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rocket" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0l4i93dai7pyzlkvdjkqg2g7ni1r6749cwx4nrrhsrr6rdybaywy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-async-stream" ,rust-async-stream-0.3)
+                       ("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-atomic" ,rust-atomic-0.5)
+                       ("rust-binascii" ,rust-binascii-0.1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-either" ,rust-either-1)
+                       ("rust-figment" ,rust-figment-0.10)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-multer" ,rust-multer-2)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-ref-cast" ,rust-ref-cast-1)
+                       ("rust-rmp-serde" ,rust-rmp-serde-1)
+                       ("rust-rocket-codegen" ,rust-rocket-codegen-0.5)
+                       ("rust-rocket-http" ,rust-rocket-http-0.5)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-state" ,rust-state-0.6)
+                       ("rust-tempfile" ,rust-tempfile-3)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+                       ("rust-tokio-util" ,rust-tokio-util-0.7)
+                       ("rust-ubyte" ,rust-ubyte-0.10)
+                       ("rust-uuid" ,rust-uuid-1)
+                       ("rust-version-check" ,rust-version-check-0.9)
+                       ("rust-yansi" ,rust-yansi-1))))
+    (home-page "https://rocket.rs")
+    (synopsis
+     "Web framework with focus on ease-of-use, expressibility, and speed")
+    (description
+     "Rocket is a web framework with a focus on ease-of-use, expressibility,
+and speed.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rocket-0.4
   (package
+    (inherit rust-rocket-0.5)
     (name "rust-rocket")
     (version "0.4.7")
     (source
@@ -2343,7 +2398,7 @@ (define-public rust-rocket-0.4
         ("rust-toml" ,rust-toml-0.4)
         ("rust-version-check" ,rust-version-check-0.9)
         ("rust-yansi" ,rust-yansi-0.5)
-        ("rust-yansi" ,rust-yansi-0.5))))
+        ("rust-yansi" ,rust-yansi-0.5))))))
     (home-page "https://rocket.rs")
     (synopsis
      "Web framework with focus on ease-of-use, expressibility, and speed")
-- 
2.41.0

[bug#68312] [PATCH 002/156] gnu: Add rust-asn1-rs-0.3.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f659f8ef1e1..fe40c027c97 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3407,6 +3407,32 @@ (define-public rust-asn1-rs-0.5
     (description "Parser/encoder for ASN.1 BER/DER data")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-asn1-rs-0.3
+  (package
+    (inherit rust-asn1-rs-0.5)
+    (name "rust-asn1-rs")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "asn1-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0czsk1nd4dx2k83f7jzkn8klx05wbmblkx1jh51i4c170akhbzrh"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-asn1-rs-derive" ,rust-asn1-rs-derive-0.1)
+                       ("rust-asn1-rs-impl" ,rust-asn1-rs-impl-0.1)
+                       ("rust-bitvec" ,rust-bitvec-1)
+                       ("rust-cookie-factory" ,rust-cookie-factory-0.3)
+                       ("rust-displaydoc" ,rust-displaydoc-0.2)
+                       ("rust-nom" ,rust-nom-7)
+                       ("rust-num-bigint" ,rust-num-bigint-0.4)
+                       ("rust-num-traits" ,rust-num-traits-0.2)
+                       ("rust-rusticata-macros" ,rust-rusticata-macros-4)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-time" ,rust-time-0.3))))))
+
 (define-public rust-asn1-rs-derive-0.4
   (package
     (name "rust-asn1-rs-derive")
-- 
2.41.0

[bug#68312] [PATCH 003/156] gnu: Add rust-rocket-codegen-0.5.

[Wilko Meyer]

* gnu/packages/crates-web.scm (rust-rocket-codegen-0.5): New variable.

Change-Id: Ie443c05a6956f010d933294e0968ed1bf179e85b
---
 gnu/packages/crates-web.scm | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 25b17495ba4..059ce96248c 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -2399,16 +2399,39 @@ (define-public rust-rocket-0.4
         ("rust-version-check" ,rust-version-check-0.9)
         ("rust-yansi" ,rust-yansi-0.5)
         ("rust-yansi" ,rust-yansi-0.5))))))
+
+(define-public rust-rocket-codegen-0.5
+  (package
+    (name "rust-rocket-codegen")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rocket_codegen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0k6hdf9s9y73kzj89qs688gnfjj1sl4imp6pdjz22pzpmdk808x2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-devise" ,rust-devise-0.4)
+                       ("rust-glob" ,rust-glob-0.3)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-rocket-http" ,rust-rocket-http-0.5)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-unicode-xid" ,rust-unicode-xid-0.2)
+                       ("rust-version-check" ,rust-version-check-0.9))))
     (home-page "https://rocket.rs")
-    (synopsis
-     "Web framework with focus on ease-of-use, expressibility, and speed")
+    (synopsis "Procedural macros for the Rocket web framework")
     (description
-     "Rocket is a web framework with a focus on ease-of-use, expressibility,
-and speed.")
+     "This package provides procedural macros for the Rocket web framework.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-rocket-codegen-0.4
   (package
+    (inherit rust-rocket-codegen-0.5)
     (name "rust-rocket-codegen")
     (version "0.4.7")
     (source
@@ -2418,7 +2441,6 @@ (define-public rust-rocket-codegen-0.4
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "18s2dll8c4sd26s8cfr6cizj5z55xwnk6r6x7b2wvcf8n9ajrb6f"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -2428,7 +2450,7 @@ (define-public rust-rocket-codegen-0.4
         ("rust-quote" ,rust-quote-0.6)
         ("rust-rocket-http" ,rust-rocket-http-0.4)
         ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5))))
+        ("rust-yansi" ,rust-yansi-0.5))))))
     (home-page "https://rocket.rs")
     (synopsis "Procedural macros for the Rocket web framework")
     (description
-- 
2.41.0

[bug#68312] [PATCH 004/156] gnu: Add rust-rocket-http-0.5.

[Wilko Meyer]

* gnu/packages/crates-web.scm (rust-rocket-http-0.5): New variable.

Change-Id: Ia12f2f50f80a455e954c17a7227bbb7ac3cb5463
---
 gnu/packages/crates-web.scm | 54 ++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 059ce96248c..ebae229dd11 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -2451,14 +2451,55 @@ (define-public rust-rocket-codegen-0.4
         ("rust-rocket-http" ,rust-rocket-http-0.4)
         ("rust-version-check" ,rust-version-check-0.9)
         ("rust-yansi" ,rust-yansi-0.5))))))
+
+(define-public rust-rocket-http-0.5
+  (package
+    (name "rust-rocket-http")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rocket_http" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17iq208zf9rfxdnx8hfjxnn51074cc9li99yjigzwnfhjhv6d89p"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-cookie" ,rust-cookie-0.18)
+                       ("rust-either" ,rust-either-1)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-hyper" ,rust-hyper-0.14)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-pear" ,rust-pear-0.2)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-ref-cast" ,rust-ref-cast-1)
+                       ("rust-rustls" ,rust-rustls-0.21)
+                       ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-stable-pattern" ,rust-stable-pattern-0.1)
+                       ("rust-state" ,rust-state-0.6)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-rustls" ,rust-tokio-rustls-0.24)
+                       ("rust-uncased" ,rust-uncased-0.9)
+                       ("rust-uuid" ,rust-uuid-1)
+                       ("rust-x509-parser" ,rust-x509-parser-0.13))))
     (home-page "https://rocket.rs")
-    (synopsis "Procedural macros for the Rocket web framework")
+    (synopsis "HTTP requests, responses and headers tooling for Rocket")
     (description
-     "This package provides procedural macros for the Rocket web framework.")
+     "This package provides types, traits, and parsers for HTTP requests,
+responses, and headers for the Rocket web framework.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-rocket-http-0.4
   (package
+    (inherit rust-rocket-http-0.5)
     (name "rust-rocket-http")
     (version "0.4.7")
     (source
@@ -2468,7 +2509,6 @@ (define-public rust-rocket-http-0.4
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0ga98nbcga8amg4xhrfkn1wljnqx9h0vv7mnay9g66vsxl042dnf"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -2482,13 +2522,7 @@ (define-public rust-rocket-http-0.4
         ("rust-smallvec" ,rust-smallvec-1)
         ("rust-state" ,rust-state-0.4)
         ("rust-time" ,rust-time-0.1)
-        ("rust-unicode-xid" ,rust-unicode-xid-0.1))))
-    (home-page "https://rocket.rs")
-    (synopsis "HTTP requests, responses and headers tooling for Rocket")
-    (description
-     "This package provides types, traits, and parsers for HTTP requests,
-responses, and headers for the Rocket web framework.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-unicode-xid" ,rust-unicode-xid-0.1))))))
 
 (define-public rust-trust-dns-client-0.22
   (package
-- 
2.41.0

[bug#68312] [PATCH 005/156] gnu: Add rust-webpki-roots-0.24.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index ebae229dd11..88ba324c5f0 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3760,6 +3760,22 @@ (define-public rust-webpki-roots-0.25
 with webpki.")
     (license license:mpl2.0)))
 
+(define-public rust-webpki-roots-0.24
+  (package
+    (inherit rust-webpki-roots-0.25)
+    (name "rust-webpki-roots")
+    (version "0.24.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "webpki-roots" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "120q85pvzpckvvrg085a5jhh91fby94pgiv9y1san7lxbmnm94dj"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-rustls-webpki" ,rust-rustls-webpki-0.101))))))
+
 (define-public rust-webpki-roots-0.23
   (package
     (inherit rust-webpki-roots-0.25)
-- 
2.41.0

[bug#68312] [PATCH 006/156] gnu: Add rust-asn1-rs-derive-0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-asn1-rs-derive-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fe40c027c97..2e00ae8c49d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3457,6 +3457,29 @@ (define-public rust-asn1-rs-derive-0.4
      "This package provides derive macros for the @code{asn1-rs} crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-asn1-rs-derive-0.1
+  (package
+    (name "rust-asn1-rs-derive")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "asn1-rs-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gzf9vab06lk0zjvbr07axx64fndkng2s28bnj27fnwd548pb2yv"))))
+    (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)
+                       ("rust-synstructure" ,rust-synstructure-0.12))))
+    (home-page "https://github.com/rusticata/asn1-rs")
+    (synopsis "Derive macros for the `asn1-rs` crate")
+    (description "Derive macros for the `asn1-rs` crate")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-asn1-rs-impl-0.1
   (package
     (name "rust-asn1-rs-impl")
-- 
2.41.0

[bug#68312] [PATCH 007/156] gnu: rust-ascii-1: Update to 1.1.0.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-ascii-1): Update to 1.1.0.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2e00ae8c49d..08db262eaf0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3564,7 +3564,7 @@ (define-public rust-as-slice-0.1
 (define-public rust-ascii-1
   (package
     (name "rust-ascii")
-    (version "1.0.0")
+    (version "1.1.0")
     (source
       (origin
         (method url-fetch)
@@ -3572,8 +3572,7 @@ (define-public rust-ascii-1
         (file-name
          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "0281gc828q4j692gb66jfdr5k16gyszgqflylh0pp30rllv63xdv"))))
+         (base32 "05nyyp39x4wzc1959kv7ckwqpkdzjd9dw4slzyjh73qbhjcfqayr"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.41.0

[bug#68312] [PATCH 008/156] gnu: Add rust-atoi-2.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 08db262eaf0..ae249452d22 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4814,6 +4814,26 @@ (define-public rust-async-trait-0.1
 methods.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-atoi-2
+  (package
+    (name "rust-atoi")
+    (version "2.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "atoi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0a05h42fggmy7h0ajjv6m7z72l924i7igbx13hk9d8pyign9k3gj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-num-traits" ,rust-num-traits-0.2))))
+    (home-page "https://github.com/pacman82/atoi-rs")
+    (synopsis "Parse integers directly from `[u8]` slices in safe code")
+    (description "Parse integers directly from `[u8]` slices in safe code")
+    (license license:expat)))
+
 (define-public rust-atom-0.3
   (package
     (name "rust-atom")
-- 
2.41.0

[bug#68312] [PATCH 009/156] gnu: Add rust-atomic-0.6.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-atomic-0.6): New variable.
(rust-atomic-0.5): Inherit from rust-atomic-0.6.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ae249452d22..3e924650a6a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4852,20 +4852,21 @@ (define-public rust-atom-0.3
     (description "This package provides a safe abstraction around AtomicPtr.")
     (license license:asl2.0)))
 
-(define-public rust-atomic-0.5
+(define-public rust-atomic-0.6
   (package
     (name "rust-atomic")
-    (version "0.5.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "atomic" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0k135q1qfmxxyzrlhr47r0j38r5fnd4163rgl552qxyagrk853dq"))))
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "atomic" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15193mfhmrq3p6vi1a10hw3n6kvzf5h32zikhby3mdj0ww1q10cd"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-autocfg" ,rust-autocfg-1))))
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-bytemuck" ,rust-bytemuck-1))))
     (home-page "https://github.com/Amanieu/atomic-rs")
     (synopsis "Generic @code{Atomic<T>} wrapper type")
     (description
@@ -4875,6 +4876,21 @@ (define-public rust-atomic-0.5
     ;; The user can choose either license.
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-atomic-0.5
+  (package
+    (inherit rust-atomic-0.6)
+    (name "rust-atomic")
+    (version "0.5.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "atomic" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0k135q1qfmxxyzrlhr47r0j38r5fnd4163rgl552qxyagrk853dq"))))
+    (arguments
+     `(#:cargo-inputs (("rust-autocfg" ,rust-autocfg-1))))))
+
 (define-public rust-atomic-polyfill-1
   (package
     (name "rust-atomic-polyfill")
-- 
2.41.0

[bug#68312] [PATCH 010/156] gnu: Add rust-atomic-write-file-0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-atomic-write-file-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3e924650a6a..ae60fb96d1c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4933,6 +4933,27 @@ (define-public rust-atomic-polyfill-0.1
 they're not available.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-atomic-write-file-0.1
+  (package
+    (name "rust-atomic-write-file")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "atomic-write-file" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dl4x0srdwjxm3zz3fj1c7m44i3b7mjiad550fqklj1n4bfbxkgd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-nix" ,rust-nix-0.27)
+                       ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/andreacorbellini/rust-atomic-write-file")
+    (synopsis "Write files atomically to a file system")
+    (description "Write files atomically to a file system")
+    (license license:bsd-3)))
+
 (define-public rust-atomic-waker-1
   (package
     (name "rust-atomic-waker")
-- 
2.41.0

[bug#68312] [PATCH 011/156] gnu: Add rust-atuin-common-17.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-atuin-common-17): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ae60fb96d1c..1aa715d7674 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5024,6 +5024,33 @@ (define-public rust-atty-0.2.11
          ("rust-termion" ,rust-termion-1)
          ("rust-winapi" ,rust-winapi-0.3))))))
 
+(define-public rust-atuin-common-17
+  (package
+    (name "rust-atuin-common")
+    (version "17.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "atuin-common" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ag1jb4xx4q976vdg9bmwvpypzj7hx4lkz8pfdqdgrsymhj7agwj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-eyre" ,rust-eyre-0.6)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-semver" ,rust-semver-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sqlx" ,rust-sqlx-0.7)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-typed-builder" ,rust-typed-builder-0.18)
+                       ("rust-uuid" ,rust-uuid-1))))
+    (home-page "https://atuin.sh")
+    (synopsis "common library for atuin")
+    (description "common library for atuin")
+    (license license:expat)))
 (define-public rust-auto-impl-0.5
   (package
     (name "rust-auto-impl")
-- 
2.41.0

[bug#68312] [PATCH 012/156] gnu: Add rust-atuin-client-17.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-atuin-client-17): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1aa715d7674..64bc578efc1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5051,6 +5051,64 @@ (define-public rust-atuin-common-17
     (synopsis "common library for atuin")
     (description "common library for atuin")
     (license license:expat)))
+
+(define-public rust-atuin-client-17
+  (package
+    (name "rust-atuin-client")
+    (version "17.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "atuin-client" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gqnv2n5mjj9j1x4xicmw0m80fhpjb5ldlkjggz4yhjgzcscsmf0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-atuin-common" ,rust-atuin-common-17)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-clap" ,rust-clap-4)
+                       ("rust-config" ,rust-config-0.13)
+                       ("rust-crypto-secretbox" ,rust-crypto-secretbox-0.1)
+                       ("rust-directories" ,rust-directories-5)
+                       ("rust-eyre" ,rust-eyre-0.6)
+                       ("rust-fs-err" ,rust-fs-err-2)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-generic-array" ,rust-generic-array-0.14)
+                       ("rust-hex" ,rust-hex-0.4)
+                       ("rust-interim" ,rust-interim-0.1)
+                       ("rust-itertools" ,rust-itertools-0.12)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-minspan" ,rust-minspan-0.1)
+                       ("rust-parse-duration" ,rust-parse-duration-2)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-reqwest" ,rust-reqwest-0.11)
+                       ("rust-rmp" ,rust-rmp-0.8)
+                       ("rust-rusty-paserk" ,rust-rusty-paserk-0.3)
+                       ("rust-rusty-paseto" ,rust-rusty-paseto-0.6)
+                       ("rust-semver" ,rust-semver-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-serde-regex" ,rust-serde-regex-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-shellexpand" ,rust-shellexpand-3)
+                       ("rust-sql-builder" ,rust-sql-builder-3)
+                       ("rust-sqlx" ,rust-sqlx-0.7)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-typed-builder" ,rust-typed-builder-0.18)
+                       ("rust-urlencoding" ,rust-urlencoding-2)
+                       ("rust-uuid" ,rust-uuid-1)
+                       ("rust-whoami" ,rust-whoami-1))))
+    (home-page "https://atuin.sh")
+    (synopsis "client library for atuin")
+    (description "client library for atuin")
+    (license license:expat)))
 (define-public rust-auto-impl-0.5
   (package
     (name "rust-auto-impl")
-- 
2.41.0

[bug#68312] [PATCH 013/156] gnu: Add rust-atuin-server-database-17.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-atuin-server-database-17): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 64bc578efc1..11c942111e9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5109,6 +5109,32 @@ (define-public rust-atuin-client-17
     (synopsis "client library for atuin")
     (description "client library for atuin")
     (license license:expat)))
+
+(define-public rust-atuin-server-database-17
+  (package
+    (name "rust-atuin-server-database")
+    (version "17.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "atuin-server-database" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18azqyw641qcfkl5yz2hpgq4rx5kvzrmdsv5d8xcf42krsbnf507"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-atuin-common" ,rust-atuin-common-17)
+                       ("rust-eyre" ,rust-eyre-0.6)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-uuid" ,rust-uuid-1))))
+    (home-page "https://atuin.sh")
+    (synopsis "server database library for atuin")
+    (description "server database library for atuin")
+    (license license:expat)))
 (define-public rust-auto-impl-0.5
   (package
     (name "rust-auto-impl")
-- 
2.41.0

[bug#68312] [PATCH 014/156] gnu: Add rust-atuin-server-17.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-atuin-server-17): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 11c942111e9..a307c81fb94 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5135,6 +5135,53 @@ (define-public rust-atuin-server-database-17
     (synopsis "server database library for atuin")
     (description "server database library for atuin")
     (license license:expat)))
+
+(define-public rust-atuin-server-17
+  (package
+    (name "rust-atuin-server")
+    (version "17.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "atuin-server" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lsqjhin1jnqcf6w1xa639349hvcgwh9r4a2dkx1hbzvlqzn6a03"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-argon2" ,rust-argon2-0.5)
+                       ("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-atuin-common" ,rust-atuin-common-17)
+                       ("rust-atuin-server-database" ,rust-atuin-server-database-17)
+                       ("rust-axum" ,rust-axum-0.6)
+                       ("rust-axum-server" ,rust-axum-server-0.5)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-config" ,rust-config-0.13)
+                       ("rust-eyre" ,rust-eyre-0.6)
+                       ("rust-fs-err" ,rust-fs-err-2)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-hyper" ,rust-hyper-0.14)
+                       ("rust-hyper-rustls" ,rust-hyper-rustls-0.24)
+                       ("rust-metrics" ,rust-metrics-0.21)
+                       ("rust-metrics-exporter-prometheus" ,rust-metrics-exporter-prometheus-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-reqwest" ,rust-reqwest-0.11)
+                       ("rust-rustls" ,rust-rustls-0.21)
+                       ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+                       ("rust-semver" ,rust-semver-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tower" ,rust-tower-0.4)
+                       ("rust-tower-http" ,rust-tower-http-0.4)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-uuid" ,rust-uuid-1))))
+    (home-page "https://atuin.sh")
+    (synopsis "server library for atuin")
+    (description "server library for atuin")
+    (license license:expat)))
 (define-public rust-auto-impl-0.5
   (package
     (name "rust-auto-impl")
-- 
2.41.0

[bug#68312] [PATCH 015/156] gnu: Add rust-atuin-server-postgres-17.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-atuin-server-postgres-17): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a307c81fb94..3b2e5a839b2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5182,6 +5182,35 @@ (define-public rust-atuin-server-17
     (synopsis "server library for atuin")
     (description "server library for atuin")
     (license license:expat)))
+
+(define-public rust-atuin-server-postgres-17
+  (package
+    (name "rust-atuin-server-postgres")
+    (version "17.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "atuin-server-postgres" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13bp6ljsp0k0gxj3g1frghkip8ladjhy3yxqa2s44am8m6x3z1pb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-atuin-common" ,rust-atuin-common-17)
+                       ("rust-atuin-server-database" ,rust-atuin-server-database-17)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sqlx" ,rust-sqlx-0.7)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-uuid" ,rust-uuid-1))))
+    (home-page "https://atuin.sh")
+    (synopsis "server postgres database library for atuin")
+    (description "server postgres database library for atuin")
+    (license license:expat)))
+
 (define-public rust-auto-impl-0.5
   (package
     (name "rust-auto-impl")
-- 
2.41.0

[bug#68312] [PATCH 016/156] gnu: Add rust-axum-server-0.5.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-axum-server-0.5): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3b2e5a839b2..2f3c3c66585 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5572,6 +5572,39 @@ (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-axum-server-0.5
+  (package
+    (name "rust-axum-server")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "axum-server" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qz06akddj31qvxzs2ihb9fda8ig98nz70m2pv0mq880b742hzs4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-arc-swap" ,rust-arc-swap-1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-http-body" ,rust-http-body-0.4)
+                       ("rust-hyper" ,rust-hyper-0.14)
+                       ("rust-openssl" ,rust-openssl-0.10)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-rustls" ,rust-rustls-0.21)
+                       ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-openssl" ,rust-tokio-openssl-0.6)
+                       ("rust-tokio-rustls" ,rust-tokio-rustls-0.24)
+                       ("rust-tower-service" ,rust-tower-service-0.3))))
+    (home-page "https://github.com/programatik29/axum-server")
+    (synopsis "High level server designed to be used with axum framework.")
+    (description "High level server designed to be used with axum framework.")
+    (license license:expat)))
+
 (define-public rust-az-1
   (package
     (name "rust-az")
-- 
2.41.0

[bug#68312] [PATCH 017/156] gnu: Add rust-axum-core-0.3.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-axum-core-0.3): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2f3c3c66585..59bfead0df7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5605,6 +5605,35 @@ (define-public rust-axum-server-0.5
     (description "High level server designed to be used with axum framework.")
     (license license:expat)))
 
+(define-public rust-axum-core-0.3
+  (package
+    (name "rust-axum-core")
+    (version "0.3.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "axum-core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b1d9nkqb8znaba4qqzxzc968qwj4ybn4vgpyz9lz4a7l9vsb7vm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-http-body" ,rust-http-body-0.4)
+                       ("rust-mime" ,rust-mime-0.3)
+                       ("rust-rustversion" ,rust-rustversion-1)
+                       ("rust-tower-http" ,rust-tower-http-0.4)
+                       ("rust-tower-layer" ,rust-tower-layer-0.3)
+                       ("rust-tower-service" ,rust-tower-service-0.3)
+                       ("rust-tracing" ,rust-tracing-0.1))))
+    (home-page "https://github.com/tokio-rs/axum")
+    (synopsis "Core types and traits for axum")
+    (description "Core types and traits for axum")
+    (license license:expat)))
 (define-public rust-az-1
   (package
     (name "rust-az")
-- 
2.41.0

[bug#68312] [PATCH 018/156] gnu: Add rust-axum-0.6.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 59bfead0df7..cedb2058182 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5634,6 +5634,57 @@ (define-public rust-axum-core-0.3
     (synopsis "Core types and traits for axum")
     (description "Core types and traits for axum")
     (license license:expat)))
+
+(define-public rust-axum-0.6
+  (package
+    (name "rust-axum")
+    (version "0.6.20")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "axum" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gynqkg3dcy1zd7il69h8a3zax86v6qq5zpawqyn87mr6979x0iv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-axum-core" ,rust-axum-core-0.3)
+                       ("rust-axum-macros" ,rust-axum-macros-0.3)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-headers" ,rust-headers-0.3)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-http-body" ,rust-http-body-0.4)
+                       ("rust-hyper" ,rust-hyper-0.14)
+                       ("rust-itoa" ,rust-itoa-1)
+                       ("rust-matchit" ,rust-matchit-0.7)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-mime" ,rust-mime-0.3)
+                       ("rust-multer" ,rust-multer-2)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-rustversion" ,rust-rustversion-1)
+                       ("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-urlencoded" ,rust-serde-urlencoded-0.7)
+                       ("rust-sha1" ,rust-sha1-0.10)
+                       ("rust-sync-wrapper" ,rust-sync-wrapper-0.1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.20)
+                       ("rust-tower" ,rust-tower-0.4)
+                       ("rust-tower-http" ,rust-tower-http-0.4)
+                       ("rust-tower-layer" ,rust-tower-layer-0.3)
+                       ("rust-tower-service" ,rust-tower-service-0.3)
+                       ("rust-tracing" ,rust-tracing-0.1))))
+    (home-page "https://github.com/tokio-rs/axum")
+    (synopsis "Web framework that focuses on ergonomics and modularity")
+    (description "Web framework that focuses on ergonomics and modularity")
+    (license license:expat)))
 (define-public rust-az-1
   (package
     (name "rust-az")
-- 
2.41.0

[bug#68312] [PATCH 019/156] gnu: Add rust-axum-macros-0.3.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-axum-macros-0.3): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cedb2058182..09cad125882 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5685,6 +5685,30 @@ (define-public rust-axum-0.6
     (synopsis "Web framework that focuses on ergonomics and modularity")
     (description "Web framework that focuses on ergonomics and modularity")
     (license license:expat)))
+
+(define-public rust-axum-macros-0.3
+  (package
+    (name "rust-axum-macros")
+    (version "0.3.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "axum-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qkb5cg06bnp8994ay0smk57shd5hpphcmp90kd7p65dxh86mjnd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-heck" ,rust-heck-0.4)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/tokio-rs/axum")
+    (synopsis "Macros for axum")
+    (description "Macros for axum")
+    (license license:expat)))
+
 (define-public rust-az-1
   (package
     (name "rust-az")
-- 
2.41.0

[bug#68312] [PATCH 020/156] gnu: Add rust-base16ct-0.1.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 09cad125882..af585f389a3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5845,6 +5845,21 @@ (define-public rust-base16ct-0.2
 embedded-friendly no_std support.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-base16ct-0.1
+  (package
+    (inherit rust-base16ct-0.2)
+    (name "rust-base16ct")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "base16ct" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1klccxr7igf73wpi0x3asjd8n0xjg0v6a7vxgvfk5ybvgh1hd6il"))))
+    (arguments
+     `(#:skip-build? #t))))
+
 (define-public rust-base32-0.4
   (package
     (name "rust-base32")
-- 
2.41.0

[bug#68312] [PATCH 021/156] gnu: Add rust-bigdecimal-0.4.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-bigdecimal-0.4): New variable.
(rust-bigdecimal-0.3): Inherit from rust-bigdecimal-0.4.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index af585f389a3..f5f49ea9dd1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6240,8 +6240,34 @@ (define-public rust-bencher-0.1
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-bigdecimal-0.4
+  (package
+    (name "rust-bigdecimal")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bigdecimal" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1jcbzgna6292vgq0slw5iah929wl0xbps22zr63bp99y8az1jrn0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-autocfg" ,rust-autocfg-1)
+                       ("rust-libm" ,rust-libm-0.2)
+                       ("rust-num-bigint" ,rust-num-bigint-0.4)
+                       ("rust-num-integer" ,rust-num-integer-0.1)
+                       ("rust-num-traits" ,rust-num-traits-0.2)
+                       ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/akubera/bigdecimal-rs")
+    (synopsis "Arbitrary precision decimal numbers")
+    (description "This package provides arbitrary precision decimal numbers.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-bigdecimal-0.3
   (package
+    (inherit rust-bigdecimal-0.4)
     (name "rust-bigdecimal")
     (version "0.3.0")
     (source
@@ -6251,18 +6277,13 @@ (define-public rust-bigdecimal-0.3
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0i1px8hk4l71n307c7h7igrdy37pzpm7dcni269gwab438ak7bva"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-num-bigint" ,rust-num-bigint-0.4)
         ("rust-num-integer" ,rust-num-integer-0.1)
         ("rust-num-traits" ,rust-num-traits-0.2)
-        ("rust-serde" ,rust-serde-1))))
-    (home-page "https://github.com/akubera/bigdecimal-rs")
-    (synopsis "Arbitrary precision decimal numbers")
-    (description "This package provides arbitrary precision decimal numbers.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-serde" ,rust-serde-1))))))
 
 (define-public rust-bigdecimal-0.2
   (package
-- 
2.41.0

[bug#68312] [PATCH 022/156] gnu: Add rust-binascii-0.1.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f5f49ea9dd1..d1d58164e27 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6329,6 +6329,27 @@ (define-public rust-bigdecimal-0.1
         #:cargo-development-inputs
         (("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-binascii-0.1
+  (package
+    (name "rust-binascii")
+    (version "0.1.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "binascii" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0wnaglgl72pn5ilv61q6y34w76gbg7crb8ifqk6lsxnq2gajjg9q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://github.com/naim94a/binascii-rs")
+    (synopsis
+     "Useful no-std binascii operations including base64, base32 and base16 (hex)")
+    (description
+     "Useful no-std binascii operations including base64, base32 and base16 (hex)")
+    (license license:expat)))
+
 (define-public rust-bincode-1
   (package
     (name "rust-bincode")
-- 
2.41.0

[bug#68312] [PATCH 023/156] gnu: Add rust-bindgen-0.69.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-bindgen-0.69): New variable.
(rust-bindgen-0.66): Inherit from rust-bindgen-0.69.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d1d58164e27..1370abd8ca8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6376,20 +6376,21 @@ (define-public rust-bincode-1
 that uses Serde for transforming structs into bytes and vice versa!")
     (license license:expat)))
 
-(define-public rust-bindgen-0.66
+(define-public rust-bindgen-0.69
   (package
     (name "rust-bindgen")
-    (version "0.66.1")
+    (version "0.69.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "bindgen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "19yj6fsb08x0l1pg871vvfvlx1mglamz8hyjpazhfc90zh34xf7j"))))
+        (base32 "1hkrccfri0223b2r5cvacy83ld6s76n2m68518bsfilrhk1ypz4z"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-annotate-snippets" ,rust-annotate-snippets-0.9)
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-annotate-snippets" ,rust-annotate-snippets-0.9)
                        ("rust-bitflags" ,rust-bitflags-2)
                        ("rust-cexpr" ,rust-cexpr-0.6)
                        ("rust-clang-sys" ,rust-clang-sys-1)
@@ -6413,6 +6414,36 @@ (define-public rust-bindgen-0.66
 bindings to C and C++ libraries.")
     (license license:bsd-3)))
 
+(define-public rust-bindgen-0.66
+  (package
+    (inherit rust-bindgen-0.69)
+    (name "rust-bindgen")
+    (version "0.66.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bindgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19yj6fsb08x0l1pg871vvfvlx1mglamz8hyjpazhfc90zh34xf7j"))))
+    (arguments
+     `(#:cargo-inputs (("rust-annotate-snippets" ,rust-annotate-snippets-0.9)
+                       ("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-cexpr" ,rust-cexpr-0.6)
+                       ("rust-clang-sys" ,rust-clang-sys-1)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-lazycell" ,rust-lazycell-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-peeking-take-while" ,rust-peeking-take-while-0.1)
+                       ("rust-prettyplease" ,rust-prettyplease-0.2)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-rustc-hash" ,rust-rustc-hash-1)
+                       ("rust-shlex" ,rust-shlex-1)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-which" ,rust-which-4))))))
+
 (define-public rust-bindgen-0.64
   (package
     (inherit rust-bindgen-0.66)
-- 
2.41.0

[bug#68312] [PATCH 024/156] gnu: Add rust-borsh-1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-borsh-1): New variable.
(rust-borsh-0.10): Inherit from rust-borsh-1.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1370abd8ca8..424aa46f49c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8135,8 +8135,37 @@ (define-public rust-blowfish-0.9
     (description "Blowfish block cipher")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-borsh-1
+  (package
+    (name "rust-borsh")
+    (version "1.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "borsh" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0a1hic4kj1rcy86qkmappi4ckch7iwap52akhx3bafqszkdddm16"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-ascii" ,rust-ascii-1)
+                       ("rust-borsh-derive" ,rust-borsh-derive-1)
+                       ("rust-bson" ,rust-bson-2)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-cfg-aliases" ,rust-cfg-aliases-0.1)
+                       ("rust-hashbrown" ,rust-hashbrown-0.14))))
+    (home-page "https://borsh.io")
+    (synopsis "Borsch is the binary object representation serializer for hashing")
+    (description "This crate implements @code{borsh}, the binary object
+representation serializer for hasing.  It is meant to be used in
+security-critical projects as it prioritizes consistency, safety, speed, and
+comes with a strict specification.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-borsh-0.10
   (package
+    (inherit rust-borsh-1)
     (name "rust-borsh")
     (version "0.10.3")
     (source
@@ -8146,7 +8175,6 @@ (define-public rust-borsh-0.10
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0sq4l9jfik5dmpy1islcj40bing1jkji2q1qbrkvq1d02n92f521"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; the trait bound `BytesMut: BorshSerialize` is not satisfied
        #:cargo-inputs
@@ -8154,7 +8182,7 @@ (define-public rust-borsh-0.10
         ("rust-bytes" ,rust-bytes-1)
         ("rust-hashbrown" ,rust-hashbrown-0.13))
        #:cargo-development-inputs
-       (("rust-bytes" ,rust-bytes-1))))
+       (("rust-bytes" ,rust-bytes-1))))))
     (home-page "https://borsh.io")
     (synopsis "Borsch is the binary object representation serializer for hashing")
     (description "This crate implements @code{borsh}, the binary object
-- 
2.41.0

[bug#68312] [PATCH 025/156] gnu: Add rust-borsh-derive-1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-borsh-derive-1): New variable.
(rust-borsh-derive-0.10): Inherit from rust-borsh-derive-1.

Change-Id: I3b9c5a27fe31d6269c0792d090f022c904e77e2f
---
 gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 424aa46f49c..4fc06fcc552 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8183,16 +8183,35 @@ (define-public rust-borsh-0.10
         ("rust-hashbrown" ,rust-hashbrown-0.13))
        #:cargo-development-inputs
        (("rust-bytes" ,rust-bytes-1))))))
+
+(define-public rust-borsh-derive-1
+  (package
+    (name "rust-borsh-derive")
+    (version "1.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "borsh-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1q0h8y7xpilasaqc3s7drjh3qzxk7k83wc5ns9x7gpf4kiq1hjdz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-proc-macro-crate" ,rust-proc-macro-crate-2)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-syn-derive" ,rust-syn-derive-0.1))))
     (home-page "https://borsh.io")
-    (synopsis "Borsch is the binary object representation serializer for hashing")
-    (description "This crate implements @code{borsh}, the binary object
-representation serializer for hasing.  It is meant to be used in
-security-critical projects as it prioritizes consistency, safety, speed, and
-comes with a strict specification.")
-    (license (list license:expat license:asl2.0))))
+    (synopsis "Derive proc-macros for @code{borsh}")
+    (description "This crate implements derive proc-macros for @code{borsh}.")
+    (license license:asl2.0)))
 
 (define-public rust-borsh-derive-0.10
   (package
+    (inherit rust-borsh-derive-1)
     (name "rust-borsh-derive")
     (version "0.10.3")
     (source
@@ -8202,18 +8221,13 @@ (define-public rust-borsh-derive-0.10
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1xslbx3qj531aq8ny1bkr45ibjmpsx0szsfc57rm33akj4v62m07"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-borsh-derive-internal" ,rust-borsh-derive-internal-0.10)
         ("rust-borsh-schema-derive-internal" ,rust-borsh-schema-derive-internal-0.10)
         ("rust-proc-macro-crate" ,rust-proc-macro-crate-0.1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://borsh.io")
-    (synopsis "Derive proc-macros for @code{borsh}")
-    (description "This crate implements derive proc-macros for @code{borsh}.")
-    (license license:asl2.0)))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-borsh-derive-internal-0.10
   (package
-- 
2.41.0

[bug#68312] [PATCH 026/156] gnu: Add rust-chacha20-0.9.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-chacha20-0.9): New variable.
(rust-chacha20-0.8): Inherit from rust-chacha20-0.9.

Change-Id: Ib23293e910769bebd97ce1c04dbb4fd88e3b78db
---
 gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4fc06fcc552..df5441e2ede 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11411,8 +11411,36 @@ (define-public rust-chan-0.1
     (description "DEPRECATED. Use crossbeam-channel instead.")
     (license (list license:unlicense license:expat))))
 
+(define-public rust-chacha20-0.9
+  (package
+    (name "rust-chacha20")
+    (version "0.9.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "chacha20" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0678wipx6kghp71hpzhl2qvx80q7caz3vm8vsvd07b1fpms3yqf3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-cipher" ,rust-cipher-0.4)
+                       ("rust-cpufeatures" ,rust-cpufeatures-0.2))))
+    (home-page "https://github.com/RustCrypto/stream-ciphers")
+    (synopsis "ChaCha20 stream cipher implemented in pure Rust")
+    (description
+     "The ChaCha20 stream cipher (RFC 8439) implemented in pure Rust using traits
+from the RustCrypto @code{cipher} crate, with optional architecture-specific
+hardware acceleration (AVX2, SSE2).  Additionally provides the ChaCha8, ChaCha12,
+XChaCha20, XChaCha12 and XChaCha8 stream ciphers, and also optional
+@code{rand_core-compatible} RNGs based on those ciphers.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-chacha20-0.8
   (package
+    (inherit rust-chacha20-0.9)
     (name "rust-chacha20")
     (version "0.8.1")
     (source
@@ -11427,7 +11455,6 @@ (define-public rust-chacha20-0.8
         '(begin
            (substitute* "Cargo.toml"
              (("version = \">=1, <1.5\"") "version = \"^1\""))))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
@@ -11437,16 +11464,7 @@ (define-public rust-chacha20-0.8
         ("rust-zeroize" ,rust-zeroize-1))
        #:cargo-development-inputs
        (("rust-cipher" ,rust-cipher-0.3)
-        ("rust-hex-literal" ,rust-hex-literal-0.2))))
-    (home-page "https://github.com/RustCrypto/stream-ciphers")
-    (synopsis "ChaCha20 stream cipher implemented in pure Rust")
-    (description
-     "The ChaCha20 stream cipher (RFC 8439) implemented in pure Rust using traits
-from the RustCrypto @code{cipher} crate, with optional architecture-specific
-hardware acceleration (AVX2, SSE2).  Additionally provides the ChaCha8, ChaCha12,
-XChaCha20, XChaCha12 and XChaCha8 stream ciphers, and also optional
-@code{rand_core-compatible} RNGs based on those ciphers.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-hex-literal" ,rust-hex-literal-0.2))))))
 
 (define-public rust-chacha20poly1305-0.9
   (package
-- 
2.41.0

[bug#68312] [PATCH 027/156] gnu: Add rust-cint-0.3.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index df5441e2ede..f20d11808cc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11851,6 +11851,29 @@ (define-public rust-chunked-transfer-0.3
        (sha256
         (base32 "11yghnd24w0i9p8g368c3pg7qh9nfz7kgri6pywja9pnmakj13a9"))))))
 
+(define-public rust-cint-0.3
+  (package
+    (name "rust-cint")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cint" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16l9glvaxshbp3awcga3s8cdfv00gb1n2s7ixzxxjwc5yz6qf3ks"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-bytemuck" ,rust-bytemuck-1))))
+    (home-page "https://github.com/termhn/cint")
+    (synopsis
+     "A lean, minimal, and stable set of types for color interoperation between crates in Rust.")
+    (description
+     "This package provides a lean, minimal, and stable set of types for color
+interoperation between crates in Rust.")
+    (license (list license:expat license:asl2.0 license:zlib))))
+
 (define-public rust-ciborium-0.2
   (package
     (name "rust-ciborium")
-- 
2.41.0

[bug#68312] [PATCH 028/156] gnu: Add rust-clipboard-0.4.

[Wilko Meyer]

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

Change-Id: Iec24066e9b3f050d9524fbcd8bd8882175ed56e2
---
 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 f20d11808cc..d6b6866900b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12719,6 +12719,34 @@ (define-public rust-clearscreen-1
      "This crate provides cross-platform terminal screen clearing.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-cli-clipboard-0.4
+  (package
+    (name "rust-cli-clipboard")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cli-clipboard" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0g9y1w3ln5wn202mwxwhsilhifwww2p34fan99w5k8ia98fpq204"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-clipboard-win" ,rust-clipboard-win-4)
+                       ("rust-objc" ,rust-objc-0.2)
+                       ("rust-objc-foundation" ,rust-objc-foundation-0.1)
+                       ("rust-objc-id" ,rust-objc-id-0.1)
+                       ("rust-wl-clipboard-rs" ,rust-wl-clipboard-rs-0.7)
+                       ("rust-x11-clipboard" ,rust-x11-clipboard-0.7))))
+    (home-page "https://github.com/actuallyallie/cli-clipboard")
+    (synopsis
+     "cli-clipboard is a cross-platform library for getting and setting the contents of the OS-level clipboard.")
+    (description
+     "cli-clipboard is a cross-platform library for getting and setting the contents
+of the OS-level clipboard.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-clicolors-control-1
   (package
     (name "rust-clicolors-control")
-- 
2.41.0

[bug#68312] [PATCH 029/156] gnu: Add rust-config-0.13.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-config-0.13): New variable.
(rust-config-0.11): Inherit from rust-config-0.13.

Change-Id: I3af5b4e5fe5f65727a02df4e244d7f04dc4bc26b
---
 gnu/packages/crates-io.scm | 43 +++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d6b6866900b..923aebec6c9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13923,8 +13923,42 @@ (define-public rust-concurrent-queue-1
        (("rust-easy-parallel" ,rust-easy-parallel-3)
         ("rust-fastrand" ,rust-fastrand-1))))))
 
+(define-public rust-config-0.13
+  (package
+    (name "rust-config")
+    (version "0.13.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "config" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1jjag1x3rl77zjykbrykzhd5fsiv8vy40y4lxkj46xicjw8qwwr3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-json5" ,rust-json5-0.4)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-nom" ,rust-nom-7)
+                       ("rust-pathdiff" ,rust-pathdiff-0.2)
+                       ("rust-ron" ,rust-ron-0.7)
+                       ("rust-rust-ini" ,rust-rust-ini-0.18)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-toml" ,rust-toml-0.5)
+                       ("rust-yaml-rust" ,rust-yaml-rust-0.4))))
+    (home-page "https://github.com/mehcode/config-rs")
+    (synopsis "Layered configuration system for Rust applications")
+    (description
+     "This package provides a layered configuration system for Rust
+applications.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-config-0.11
   (package
+    (inherit rust-config-0.13)
     (name "rust-config")
     (version "0.11.0")
     (source
@@ -13934,7 +13968,6 @@ (define-public rust-config-0.11
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0sdkxv77m65frsn3bx0r3v7asxar3gy3hmghcfk6h4rbijars6qv"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -13945,13 +13978,7 @@ (define-public rust-config-0.11
         ("rust-serde-hjson" ,rust-serde-hjson-0.9)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-toml" ,rust-toml-0.5)
-        ("rust-yaml-rust" ,rust-yaml-rust-0.4))))
-    (home-page "https://github.com/mehcode/config-rs")
-    (synopsis "Layered configuration system for Rust applications")
-    (description
-     "This package provides a layered configuration system for Rust
-applications.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-yaml-rust" ,rust-yaml-rust-0.4))))))
 
 (define-public rust-config-0.10
   (package
-- 
2.41.0

[bug#68312] [PATCH 030/156] gnu: Add rust-cookie-0.18.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-cookie-0.18): New variable.
(rust-cookie-0.17): Inherit from rust-cookie-0.18.

Change-Id: I1cb9f9adf7998af7c2b3848018ea427076fd050b
---
 gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 923aebec6c9..2b56e0c08ef 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14612,8 +14612,42 @@ (define-public rust-convert-case-0.4
        #:cargo-inputs
        (("rust-rand" ,rust-rand-0.7))))))
 
+(define-public rust-cookie-0.18
+  (package
+    (name "rust-cookie")
+    (version "0.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cookie" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1y2ywf9isq0dwpj7m7jq7r1g9cs3xr2i6qipw5v030hj2kv1rn9w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-aes-gcm" ,rust-aes-gcm-0.10)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-version-check" ,rust-version-check-0.9))))
+    (home-page "https://github.com/SergioBenitez/cookie-rs")
+    (synopsis
+     "Crate for parsing HTTP cookie headers and managing a cookie jar")
+    (description
+     "Parse HTTP cookie headers and manage a cookie jar with this crate.
+It supports signed and private (encrypted + signed) jars.")
+    ;; The user can choose either license.
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-cookie-0.17
   (package
+    (inherit rust-cookie-0.18)
     (name "rust-cookie")
     (version "0.17.0")
     (source (origin
@@ -14623,7 +14657,6 @@ (define-public rust-cookie-0.17
               (sha256
                (base32
                 "096c52jg9iq4lfcps2psncswv33fc30mmnaa2sbzzcfcw71kgyvy"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-aes-gcm" ,rust-aes-gcm-0.10)
@@ -14635,15 +14668,7 @@ (define-public rust-cookie-0.17
         ("rust-sha2" ,rust-sha2-0.10)
         ("rust-subtle" ,rust-subtle-2)
         ("rust-time" ,rust-time-0.3)
-        ("rust-version-check" ,rust-version-check-0.9))))
-    (home-page "https://github.com/SergioBenitez/cookie-rs")
-    (synopsis
-     "Crate for parsing HTTP cookie headers and managing a cookie jar")
-    (description
-     "Parse HTTP cookie headers and manage a cookie jar with this crate.
-It supports signed and private (encrypted + signed) jars.")
-    ;; The user can choose either license.
-    (license (list license:expat license:asl2.0))))
+        ("rust-version-check" ,rust-version-check-0.9))))))
 
 (define-public rust-cookie-0.16
   (package
-- 
2.41.0

[bug#68312] [PATCH 031/156] gnu: Add rust-ubyte-0.10.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2b56e0c08ef..35889ec5cc9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -15484,6 +15484,30 @@ (define-public rust-cpuprofiler-0.0
     (description "This package provides bindings to Google's cpu profiler.")
     (license license:bsd-2)))
 
+(define-public rust-ubyte-0.10
+  (package
+    (name "rust-ubyte")
+    (version "0.10.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ubyte" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1spj3k9sx6xvfn7am9vm1b463hsr79nyvj8asi2grqhyrvvdw87p"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/SergioBenitez/ubyte")
+    (synopsis
+     "A simple, complete, const-everything, saturating, human-friendly, no_std library for byte units.
+")
+    (description
+     "This package provides a simple, complete, const-everything, saturating,
+human-friendly, no_std library for byte units.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-uom-0.34
   (package
     (name "rust-uom")
-- 
2.41.0

[bug#68312] [PATCH 032/156] gnu: Add rust-crypto-secretbox-0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-crypto-secretbox-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 35889ec5cc9..515fd18e3b3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -17129,6 +17129,41 @@ (define-public rust-rusticata-macros-3
     (arguments
      `(#:cargo-inputs (("rust-nom" ,rust-nom-6))))))
 
+(define-public rust-crypto-secretbox-0.1
+  (package
+    (name "rust-crypto-secretbox")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "crypto_secretbox" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qa1w5s8dbyb88269zrmvbnillqahz394pl07bsds6gpmn3wzmmr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-aead" ,rust-aead-0.5)
+                       ("rust-chacha20" ,rust-chacha20-0.9)
+                       ("rust-cipher" ,rust-cipher-0.4)
+                       ("rust-generic-array" ,rust-generic-array-0.14)
+                       ("rust-poly1305" ,rust-poly1305-0.8)
+                       ("rust-salsa20" ,rust-salsa20-0.10)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page
+     "https://github.com/RustCrypto/nacl-compat/tree/master/crypto_secretbox")
+    (synopsis
+     "Pure Rust implementation of the XSalsa20Poly1305 (a.k.a. NaCl crypto_secretbox)
+authenticated encryption cipher as well as the libsodium variant of
+XChaCha20Poly1305
+")
+    (description
+     "Pure Rust implementation of the XSalsa20Poly1305 (a.k.a. @code{NaCl}
+crypto_secretbox) authenticated encryption cipher as well as the libsodium
+variant of X@code{ChaCha20Poly1305}")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-crypto-bigint-0.5
   (package
     (name "rust-crypto-bigint")
-- 
2.41.0

[bug#68312] [PATCH 033/156] gnu: Add rust-crypto-bigint-0.4.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-crypto-bigint-0.4): New variable.
(rust-crypto-bigint-0.3): Inherit from rust-crypto-bigint-0.4.

Change-Id: I48f1487beef1b13f26738a314fd62183173b5a09
---
 gnu/packages/crates-io.scm | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 515fd18e3b3..66f96a0f3f6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -17204,10 +17204,32 @@ (define-public rust-crypto-bigint-0.5
 using const generics.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-crypto-bigint-0.3
+(define-public rust-crypto-bigint-0.4
   (package
     (inherit rust-crypto-bigint-0.5)
     (name "rust-crypto-bigint")
+    (version "0.4.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "crypto-bigint" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vqprgj0aj1340w186zyspi58397ih78jsc0iydvhs6zrlilnazg"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-der" ,rust-der-0.6)
+                       ("rust-generic-array" ,rust-generic-array-0.14)
+                       ("rust-rand-core" ,rust-rand-core-0.6)
+                       ("rust-rlp" ,rust-rlp-0.5)
+                       ("rust-serdect" ,rust-serdect-0.1)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-zeroize" ,rust-zeroize-1))))))
+
+(define-public rust-crypto-bigint-0.3
+  (package
+    (inherit rust-crypto-bigint-0.4)
+    (name "rust-crypto-bigint")
     (version "0.3.2")
     (source
      (origin
-- 
2.41.0

[bug#68312] [PATCH 034/156] gnu: Add rust-csscolorparser-0.6.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 66f96a0f3f6..bb2629efa74 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -17607,6 +17607,30 @@ (define-public rust-cssparser-0.25
         ("rust-encoding-rs" ,rust-encoding-rs-0.8)
         ("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-csscolorparser-0.6
+  (package
+    (name "rust-csscolorparser")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "csscolorparser" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gxh11hajx96mf5sd0az6mfsxdryfqvcfcphny3yfbfscqq7sapb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-cint" ,rust-cint-0.3)
+                       ("rust-lab" ,rust-lab-0.11)
+                       ("rust-phf" ,rust-phf-0.11)
+                       ("rust-rgb" ,rust-rgb-0.8)
+                       ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/mazznoer/csscolorparser-rs")
+    (synopsis "CSS color parser library")
+    (description "CSS color parser library")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-cssparser-macros-0.6
   (package
     (name "rust-cssparser-macros")
-- 
2.41.0

[bug#68312] [PATCH 035/156] gnu: Add rust-curve25519-dalek-derive-0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-curve25519-dalek-derive-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bb2629efa74..0207fc18793 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18190,6 +18190,27 @@ (define-public rust-curve25519-dalek-3
 ristretto255 and Curve25519.")
     (license license:bsd-3)))
 
+(define-public rust-curve25519-dalek-derive-0.1
+  (package
+    (name "rust-curve25519-dalek-derive")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "curve25519-dalek-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1cry71xxrr0mcy5my3fb502cwfxy6822k4pm19cwrilrg7hq4s7l"))))
+    (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-2))))
+    (home-page "https://github.com/dalek-cryptography/curve25519-dalek")
+    (synopsis "curve25519-dalek Derives")
+    (description "curve25519-dalek Derives")
+    (license (list license:expat license:asl2.0))))
 (define-public rust-curve25519-dalek-ng-4
   (package
     (name "rust-curve25519-dalek-ng")
-- 
2.41.0

[bug#68312] [PATCH 036/156] gnu: Add rust-curve25519-dalek-4.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-curve25519-dalek-4): New variable.

Change-Id: I24a6af496a23885740f2a3b68c8af838bfba3c44
---
 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 0207fc18793..17075c62b8e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18211,6 +18211,42 @@ (define-public rust-curve25519-dalek-derive-0.1
     (synopsis "curve25519-dalek Derives")
     (description "curve25519-dalek Derives")
     (license (list license:expat license:asl2.0))))
+
+(define-public rust-curve25519-dalek-4
+  (package
+    (name "rust-curve25519-dalek")
+    (version "4.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "curve25519-dalek" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0p7ns5917k6369gajrsbfj24llc5zfm635yh3abla7sb5rm8r6z8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-cpufeatures" ,rust-cpufeatures-0.2)
+                       ("rust-curve25519-dalek-derive" ,rust-curve25519-dalek-derive-0.1)
+                       ("rust-digest" ,rust-digest-0.10)
+                       ("rust-ff" ,rust-ff-0.13)
+                       ("rust-fiat-crypto" ,rust-fiat-crypto-0.2)
+                       ("rust-group" ,rust-group-0.13)
+                       ("rust-platforms" ,rust-platforms-3)
+                       ("rust-rand-core" ,rust-rand-core-0.6)
+                       ("rust-rustc-version" ,rust-rustc-version-0.4)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://github.com/dalek-cryptography/curve25519-dalek")
+    (synopsis
+     "A pure-Rust implementation of group operations on ristretto255 and Curve25519")
+    (description
+     "This package provides a pure-Rust implementation of group operations on
+ristretto255 and Curve25519")
+    (license license:bsd-3)))
+
 (define-public rust-curve25519-dalek-ng-4
   (package
     (name "rust-curve25519-dalek-ng")
-- 
2.41.0

[bug#68312] [PATCH 037/156] gnu: Add rust-deltae-0.3.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 17075c62b8e..ff8da3e7d9a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19469,6 +19469,25 @@ (define-public rust-dbus-tree-0.9
      "This crate is a framework for writing D-Bus method handlers (legacy).")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-deltae-0.3
+  (package
+    (name "rust-deltae")
+    (version "0.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "deltae" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1d3hw9hpvicl9x0x34jr2ybjk5g5ym1lhbyz6zj31110gq8zaaap"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://gitlab.com/ryanobeirne/deltae")
+    (synopsis "Calculate Delta E between two colors in CIE Lab space.")
+    (description "Calculate Delta E between two colors in CIE Lab space.")
+    (license license:expat)))
+
 (define-public rust-deadpool-0.7
   (package
     (name "rust-deadpool")
-- 
2.41.0

[bug#68312] [PATCH 038/156] gnu: Add rust-rust-decimal-1.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ff8da3e7d9a..f422c2a47e2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19663,6 +19663,44 @@ (define-public rust-decimal-2
      "Decimal floating point arithmetic for Rust.")
     (license license:asl2.0)))
 
+(define-public rust-rust-decimal-1
+  (package
+    (name "rust-rust-decimal")
+    (version "1.33.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rust_decimal" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1i0xgwgdnhbcbj8x6lw7pcgg4jb5lkww1j1wfbdc33ybbkn6lrq6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1)
+                       ("rust-arrayvec" ,rust-arrayvec-0.7)
+                       ("rust-borsh" ,rust-borsh-1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-diesel" ,rust-diesel-1)
+                       ("rust-diesel" ,rust-diesel-2)
+                       ("rust-ndarray" ,rust-ndarray-0.15)
+                       ("rust-num-traits" ,rust-num-traits-0.2)
+                       ("rust-postgres" ,rust-postgres-0.19)
+                       ("rust-proptest" ,rust-proptest-1)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rkyv" ,rust-rkyv-0.7)
+                       ("rust-rocket" ,rust-rocket-0.5)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-tokio-postgres" ,rust-tokio-postgres-0.7))))
+    (home-page "https://github.com/paupino/rust-decimal")
+    (synopsis
+     "Decimal number implementation written in pure Rust suitable for financial and fixed-precision calculations.")
+    (description
+     "Decimal number implementation written in pure Rust suitable for financial and
+fixed-precision calculations.")
+    (license license:expat)))
+
 (define-public rust-defer-0.1
   (package
     (name "rust-defer")
-- 
2.41.0

[bug#68312] [PATCH 039/156] gnu: Add rust-der-parser-7.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-der-parser-7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f422c2a47e2..6c34fc2115c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20263,6 +20263,28 @@ (define-public rust-der-parser-8
 @code{nom} parser combinator framework.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-der-parser-7
+  (package
+    (inherit rust-der-parser-8)
+    (name "rust-der-parser")
+    (version "7.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "der-parser" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "10kfa2gzl3x20mwgrd43cyi79xgkqxyzcyrh0xylv4apa33qlfgy"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-asn1-rs" ,rust-asn1-rs-0.3)
+                       ("rust-cookie-factory" ,rust-cookie-factory-0.3)
+                       ("rust-displaydoc" ,rust-displaydoc-0.2)
+                       ("rust-nom" ,rust-nom-7)
+                       ("rust-num-bigint" ,rust-num-bigint-0.4)
+                       ("rust-num-traits" ,rust-num-traits-0.2)
+                       ("rust-rusticata-macros" ,rust-rusticata-macros-4))))))
+
 (define-public rust-der-parser-6
   (package
     (inherit rust-der-parser-8)
-- 
2.41.0

[bug#68312] [PATCH 040/156] gnu: rust-derive-new-0.5: Update to 0.5.9.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-derive-new-0.5): Update to 0.5.9.

Change-Id: I04039b9cb0d46697ab39dcb4e8020db439a56e51
---
 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 6c34fc2115c..a1c99279ab7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20797,14 +20797,14 @@ (define-public rust-derive-more-0.14
 (define-public rust-derive-new-0.5
   (package
     (name "rust-derive-new")
-    (version "0.5.8")
+    (version "0.5.9")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "derive-new" version))
       (file-name (string-append name "-" version ".tar.gz"))
       (sha256
-       (base32 "1ncibp4jhpkym7namg3viqyw8hljd32n6abg64af8qjwrn91iwvi"))))
+        (base32 "0d9m5kcj1rdmdjqfgj7rxxhdzx0as7p4rp1mjx5j6w5dl2f3461l"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#68312] [PATCH 041/156] gnu: Add rust-devise-0.4.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-devise-0.4): New variable.
(rust-devise-0.2): Inherit from rust-devise-0.4.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a1c99279ab7..0dbc8e5b712 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20929,8 +20929,32 @@ (define-public rust-deunicode-0.4
 intelligently transliterating them.  It supports Emoji and Chinese.")
     (license license:bsd-3)))
 
+(define-public rust-devise-0.4
+  (package
+    (name "rust-devise")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "devise" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1y45iag4hyvspkdsf6d856hf0ihf9vjnaga3c7y6c72l7zywxsnn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-devise-codegen" ,rust-devise-codegen-0.4)
+                       ("rust-devise-core" ,rust-devise-core-0.4))))
+    (home-page "https://github.com/SergioBenitez/Devise")
+    (synopsis "Library for devising derives and other procedural macros")
+    (description
+     "This package provides a library for devising derives and other
+procedural macros.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-devise-0.2
   (package
+    (inherit rust-devise-0.4)
     (name "rust-devise")
     (version "0.2.1")
     (source
@@ -20940,12 +20964,11 @@ (define-public rust-devise-0.2
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "09p52f54givb0g9l7clj11z755vldk8758y2lwm5mp3sa156qwfx"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-devise-codegen" ,rust-devise-codegen-0.2)
-        ("rust-devise-core" ,rust-devise-core-0.2))))
+        ("rust-devise-core" ,rust-devise-core-0.2))))))
     (home-page "https://github.com/SergioBenitez/Devise")
     (synopsis "Library for devising derives and other procedural macros")
     (description
-- 
2.41.0

[bug#68312] [PATCH 042/156] gnu: Add rust-devise-codegen-0.4.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-devise-codegen-0.4): New variable.
(rust-devise-codegen-0.2): Inherit from rust-devise-0.4.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0dbc8e5b712..2e46f69cb18 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20969,6 +20969,23 @@ (define-public rust-devise-0.2
        #:cargo-inputs
        (("rust-devise-codegen" ,rust-devise-codegen-0.2)
         ("rust-devise-core" ,rust-devise-core-0.2))))))
+
+(define-public rust-devise-codegen-0.4
+  (package
+    (name "rust-devise-codegen")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "devise_codegen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mpy5mmsigkj5f72gby82yk4advcqj97am2wzn0dwkj8vnwg934w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-devise-core" ,rust-devise-core-0.4)
+                       ("rust-quote" ,rust-quote-1))))
     (home-page "https://github.com/SergioBenitez/Devise")
     (synopsis "Library for devising derives and other procedural macros")
     (description
@@ -20976,8 +20993,10 @@ (define-public rust-devise-0.2
 procedural macros.")
     (license (list license:expat license:asl2.0))))
 
+
 (define-public rust-devise-codegen-0.2
   (package
+    (inherit rust-device-codegen-0.4)
     (name "rust-devise-codegen")
     (version "0.2.1")
     (source
@@ -20987,12 +21006,11 @@ (define-public rust-devise-codegen-0.2
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0lxbixni2v6snx2mkgi0kyq5dv8v6c5s57b6wc47q4hqs6884yza"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-devise-core" ,rust-devise-core-0.2)
-        ("rust-quote" ,rust-quote-0.6))))
+        ("rust-quote" ,rust-quote-0.6))))))
     (home-page "https://github.com/SergioBenitez/Devise")
     (synopsis "Library for devising derives and other procedural macros")
     (description
-- 
2.41.0

[bug#68312] [PATCH 043/156] gnu: Add rust-devise-core-0.4.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-devise-core-0.4): New variable.
(rust-devise-core-0.2): Inherit from rust-devise-core-0.4.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2e46f69cb18..e4abfd9d771 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21011,6 +21011,26 @@ (define-public rust-devise-codegen-0.2
        #:cargo-inputs
        (("rust-devise-core" ,rust-devise-core-0.2)
         ("rust-quote" ,rust-quote-0.6))))))
+
+(define-public rust-devise-core-0.4
+  (package
+    (name "rust-devise-core")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "devise_core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0sp5idq0idng9i5kwjd8slvc724s97r28arrhyqq1jpx1ax0vd9m"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.10)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
     (home-page "https://github.com/SergioBenitez/Devise")
     (synopsis "Library for devising derives and other procedural macros")
     (description
@@ -21020,6 +21040,7 @@ (define-public rust-devise-codegen-0.2
 
 (define-public rust-devise-core-0.2
   (package
+    (inherit rust-device-core-0.4)
     (name "rust-devise-core")
     (version "0.2.1")
     (source
@@ -21029,20 +21050,13 @@ (define-public rust-devise-core-0.2
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0wr3jdzzibpafz73hcca83wnzdgjinvm7axmxnyfkbasbnfkw1fi"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-proc-macro2" ,rust-proc-macro2-0.4)
         ("rust-quote" ,rust-quote-0.6)
-        ("rust-syn" ,rust-syn-0.15))))
-    (home-page "https://github.com/SergioBenitez/Devise")
-    (synopsis "Library for devising derives and other procedural macros")
-    (description
-     "This package provides a library for devising derives and other
-procedural macros.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-syn" ,rust-syn-0.15))))))
 
 (define-public rust-dhcp4r-0.2
   (package
-- 
2.41.0

[bug#68312] [PATCH 044/156] gnu: Add rust-diesel-2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-diesel-2): New variable.
(rust-diesel-1): Inherit from rust-diesel-2.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e4abfd9d771..2cab9822ebb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21130,8 +21130,56 @@ (define-public rust-dialoguer-0.10
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-zeroize" ,rust-zeroize-1))))))
 
+(define-public rust-diesel-2
+  (package
+    (name "rust-diesel")
+    (version "2.1.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "diesel" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1n1ihxd5zfqg94zy01zf85ml716fqmsivj7pxiw8qzzi8bwgrik2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release"
+         "--features" "sqlite"
+         "--"
+         "--skip=expression::count::count")
+       #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.3)
+                       ("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-diesel-derives" ,rust-diesel-derives-2)
+                       ("rust-ipnet" ,rust-ipnet-2)
+                       ("rust-ipnetwork" ,rust-ipnetwork-0.17)
+                       ("rust-itoa" ,rust-itoa-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.26)
+                       ("rust-mysqlclient-sys" ,rust-mysqlclient-sys-0.2)
+                       ("rust-num-bigint" ,rust-num-bigint-0.4)
+                       ("rust-num-integer" ,rust-num-integer-0.1)
+                       ("rust-num-traits" ,rust-num-traits-0.2)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-pq-sys" ,rust-pq-sys-0.4)
+                       ("rust-quickcheck" ,rust-quickcheck-1)
+                       ("rust-r2d2" ,rust-r2d2-0.8)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-uuid" ,rust-uuid-1))))
+    (native-inputs (list sqlite))
+    (home-page "https://diesel.rs")
+    (synopsis "Safe, extensible ORM and Query Builder")
+    (description "This package provides a safe, extensible ORM and Query
+Builder for PostgreSQL, SQLite, and MySQL.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-diesel-1
   (package
+    (inherit rust-diesel-2)
     (name "rust-diesel")
     (version "1.4.6")
     (source
@@ -21143,7 +21191,6 @@ (define-public rust-diesel-1
        (sha256
         (base32
          "0hpmwrc0zx3zvpgwp9zrm6wj8d8i8q8990grlrnfzlivbi6zqyq4"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
        '("--release"
@@ -21176,7 +21223,8 @@ (define-public rust-diesel-1
         ("rust-dotenv" ,rust-dotenv-0.10)
         ("rust-quickcheck" ,rust-quickcheck-0.4)
         ("rust-tempdir" ,rust-tempdir-0.3))))
-    (native-inputs (list sqlite))
+    (native-inputs (list sqlite))))
+
     (home-page "https://diesel.rs")
     (synopsis "Safe, extensible ORM and Query Builder")
     (description "This package provides a safe, extensible ORM and Query
-- 
2.41.0

[bug#68312] [PATCH 045/156] gnu: Add rust-diesel-derives-2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-diesel-derives-2): New variable.
(rust-diesel-derives-1): Inherit from rust-diesel-derives-2.

Change-Id: Ia7112f2589657fda1731208b04859d49bb519852
---
 gnu/packages/crates-io.scm | 39 ++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2cab9822ebb..b837611d3a0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21225,14 +21225,39 @@ (define-public rust-diesel-1
         ("rust-tempdir" ,rust-tempdir-0.3))))
     (native-inputs (list sqlite))))
 
+(define-public rust-diesel-derives-2
+  (package
+    (name "rust-diesel-derives")
+    (version "2.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "diesel_derives" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0i1bzp6rxnrrlgz1y946ap3203vjvack9a05h135mxblfmrkg0zg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; cannot find type `SqliteConnection` in this scope
+       #:cargo-test-flags
+       '("--release"
+         "--features" "sqlite"
+         "--"
+         "--skip=expression::count::count")
+       #:cargo-inputs (("rust-diesel-table-macro-syntax" ,rust-diesel-table-macro-syntax-0.1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
     (home-page "https://diesel.rs")
-    (synopsis "Safe, extensible ORM and Query Builder")
-    (description "This package provides a safe, extensible ORM and Query
-Builder for PostgreSQL, SQLite, and MySQL.")
+    (synopsis "Crate internal to Diesel")
+    (description "You should not use this crate directly, it is internal to
+Diesel.")
     (license (list license:expat license:asl2.0))))
 
+
 (define-public rust-diesel-derives-1
   (package
+    (inherit rust-diesel-derives-2)
     (name "rust-diesel-derives")
     (version "1.4.1")
     (source
@@ -21243,7 +21268,6 @@ (define-public rust-diesel-derives-1
        (sha256
         (base32
          "1lsq133fwk0zj8xvxhdxqgg0xs31zf3abnwdyshaf0ldca7hkxa5"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; cannot find type `SqliteConnection` in this scope
        #:cargo-test-flags
@@ -21259,12 +21283,7 @@ (define-public rust-diesel-derives-1
        (("rust-cfg-if" ,rust-cfg-if-0.1)
         ("rust-diesel" ,rust-diesel-1)
         ("rust-dotenv" ,rust-dotenv-0.10))))
-    (native-inputs (list sqlite))
-    (home-page "https://diesel.rs")
-    (synopsis "Crate internal to Diesel")
-    (description "You should not use this crate directly, it is internal to
-Diesel.")
-    (license (list license:expat license:asl2.0))))
+    (native-inputs (list sqlite))))
 
 (define-public rust-diesel-migrations-1
   (package
-- 
2.41.0

[bug#68312] [PATCH 046/156] gnu: Add rust-diesel-table-macro-syntax-0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-diesel-table-macro-syntax-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b837611d3a0..7cf7178a92c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21338,6 +21338,26 @@ (define-public rust-diff-0.1
      "An LCS based slice and string diffing implementation.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-diesel-table-macro-syntax-0.1
+  (package
+    (name "rust-diesel-table-macro-syntax")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "diesel_table_macro_syntax" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1i9115qgsnargr6a707lqcjc45wqzq351a2gbvnnyw2kqkpmfmgw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-syn" ,rust-syn-2))))
+    (home-page "https://diesel.rs")
+    (synopsis "Internal diesel crate")
+    (description "Internal diesel crate")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-difference-2
   (package
     (name "rust-difference")
-- 
2.41.0

[bug#68312] [PATCH 047/156] gnu: rust-directories-5: Update to 5.0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-directories-5): Update to 5.0.1.

Change-Id: I52680619ff4e87f77ff8c9d3698a561a2453021b
---
 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 7cf7178a92c..16be8d8d0c2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21568,14 +21568,14 @@ (define-public rust-digest-0.6
 (define-public rust-directories-5
   (package
     (name "rust-directories")
-    (version "5.0.0")
+    (version "5.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "directories" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1acv0z7vi7b8z0qn2xd8zirw8axva9351p1vwjfhi3n117l3pgkl"))))
+        (base32 "0dba6xzk79s1clqzxh2qlgzk3lmvvks1lzzjhhi3hd70hhxifjcs"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#68312] [PATCH 048/156] gnu: Add rust-dlv-list-0.3.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-dlv-list-0.3): New variable.
(rust-dlv-list-0.3): Inherit from rust-dlv-list-0.2.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 16be8d8d0c2..47ffaef8bb0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21977,22 +21977,20 @@ (define-public rust-dlib-0.4
     (inputs
      (list rust-libloading-0.6))))
 
-(define-public rust-dlv-list-0.2
+(define-public rust-dlv-list-0.3
   (package
     (name "rust-dlv-list")
-    (version "0.2.3")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "dlv-list" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "06r1nskj3x56p5wqz2bgl6q3rpyymrb0k0zpbvk8c6qcd4mkzpv8"))))
+        (base32 "0mqj5rdkcjksw3kvjj0nga6rzcpppx0kimjwi527yhifz6kw5206"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-rand" ,rust-rand-0.8))))
+     `(#:skip-build? #t))
     (home-page "https://github.com/sgodwincs/dlv-list-rs")
     (synopsis "Semi-doubly linked list implemented using a vector")
     (description
@@ -22000,6 +21998,23 @@ (define-public rust-dlv-list-0.2
 a vector.")
     (license license:expat)))
 
+(define-public rust-dlv-list-0.2
+  (package
+    (inherit rust-dlv-list-0.3)
+    (name "rust-dlv-list")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "dlv-list" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06r1nskj3x56p5wqz2bgl6q3rpyymrb0k0zpbvk8c6qcd4mkzpv8"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-rand" ,rust-rand-0.8))))))
+
 (define-public rust-dns-parser-0.8
   (package
     (name "rust-dns-parser")
-- 
2.41.0

[bug#68312] [PATCH 049/156] gnu: Add rust-ecdsa-0.14.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 47ffaef8bb0..356e0271797 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22766,6 +22766,26 @@ (define-public rust-ecdsa-0.16
 support for added entropy.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-ecdsa-0.14
+  (package
+    (inherit rust-ecdsa-0.16)
+    (name "rust-ecdsa")
+    (version "0.14.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ecdsa" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0p1wxap2s6jm06y2w3cal8dkz6p9223ir9wws70rgx8h929h2cs1"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-der" ,rust-der-0.6)
+                       ("rust-elliptic-curve" ,rust-elliptic-curve-0.12)
+                       ("rust-rfc6979" ,rust-rfc6979-0.3)
+                       ("rust-serdect" ,rust-serdect-0.1)
+                       ("rust-signature" ,rust-signature-1))))))
+
 (define-public rust-ecies-ed25519-0.5
   (package
     (name "rust-ecies-ed25519")
-- 
2.41.0

[bug#68312] [PATCH 050/156] gnu: Add rust-ed25519-2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-ed25519-2): New variable.
(rust-ed25519-1): Inherit from rust-ed25519-2.

Change-Id: I64677bdd0ea5d90a60c5dbc82433ac4862e32f15
---
 gnu/packages/crates-io.scm | 50 ++++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 356e0271797..ad58c75b48e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22819,8 +22819,42 @@ (define-public rust-ecies-ed25519-0.5
      "ECIES on Twisted Edwards Curve25519 using AES-GCM and HKDF-SHA256.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ed25519-2
+  (package
+    (name "rust-ed25519")
+    (version "2.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ed25519" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0lydzdf26zbn82g7xfczcac9d7mzm3qgx934ijjrd5hjpjx32m8i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-pkcs8" ,rust-pkcs8-0.10)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+                       ("rust-signature" ,rust-signature-2)
+                       ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://github.com/RustCrypto/signatures/tree/master/ed25519")
+    (synopsis "Edwards Digital Signature Algorithm (EdDSA) over Curve25519")
+    (description
+      "EdDSA over Curve25519 is specified in RFC 8032.  This package contains
+an ed25519::Signature type which other packages can use in conjunction with
+the signature::Signer and signature::Verifier traits It doesn't contain an
+implementation of Ed25519.
+
+These traits allow packages which produce and consume Ed25519 signatures to be
+written abstractly in such a way that different signer/verifier providers can
+be plugged in, enabling support for using different Ed25519 implementations,
+including HSMs or Cloud KMS services.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-ed25519-1
   (package
+    (inherit rust-ed25519-2)
     (name "rust-ed25519")
     (version "1.5.3")
     (source (origin
@@ -22830,7 +22864,6 @@ (define-public rust-ed25519-1
               (sha256
                (base32
                 "1rzydm5wd8szkddx3g55w4vm86y1ika8qp8qwckada5vf1fg7kwi"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-pkcs8" ,rust-pkcs8-0.9)
@@ -22842,20 +22875,7 @@ (define-public rust-ed25519-1
        (("rust-bincode" ,rust-bincode-1)
         ("rust-ed25519-dalek" ,rust-ed25519-dalek-1)
         ("rust-hex-literal" ,rust-hex-literal-0.3)
-        ("rust-rand-core" ,rust-rand-core-0.5))))
-    (home-page "https://github.com/RustCrypto/signatures/tree/master/ed25519")
-    (synopsis "Edwards Digital Signature Algorithm (EdDSA) over Curve25519")
-    (description
-      "EdDSA over Curve25519 is specified in RFC 8032.  This package contains
-an ed25519::Signature type which other packages can use in conjunction with
-the signature::Signer and signature::Verifier traits It doesn't contain an
-implementation of Ed25519.
-
-These traits allow packages which produce and consume Ed25519 signatures to be
-written abstractly in such a way that different signer/verifier providers can
-be plugged in, enabling support for using different Ed25519 implementations,
-including HSMs or Cloud KMS services.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-rand-core" ,rust-rand-core-0.5))))))
 
 (define-public rust-ed25519-compact-2
   (package
-- 
2.41.0

[bug#68312] [PATCH 051/156] gnu: Add rust-ed25519-dalek-2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-ed25519-dalek-2): New variable.
(rust-ed25519-dalek-1): Inherit from rust-ed25519-dalek-2.

Change-Id: Ia800295e33e837cb1c701acb7e07a62cd8baab60
---
 gnu/packages/crates-io.scm | 40 ++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ad58c75b48e..471de55c822 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22904,8 +22904,39 @@ (define-public rust-ed25519-compact-2
 implementation.")
     (license license:expat)))
 
+(define-public rust-ed25519-dalek-2
+  (package
+    (name "rust-ed25519-dalek")
+    (version "2.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ed25519-dalek" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1h13qm789m9gdjl6jazss80hqi8ll37m0afwcnw23zcbqjp8wqhz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-curve25519-dalek" ,rust-curve25519-dalek-4)
+                       ("rust-ed25519" ,rust-ed25519-2)
+                       ("rust-merlin" ,rust-merlin-3)
+                       ("rust-rand-core" ,rust-rand-core-0.6)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-signature" ,rust-signature-2)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://dalek.rs")
+    (synopsis "Ed25519 EdDSA key generations, signing, and verification")
+    (description
+      "This package provides fast and efficient ed25519 EdDSA key generations,
+signing, and verification in pure Rust.")
+    (license license:bsd-3)))
+
 (define-public rust-ed25519-dalek-1
   (package
+    (inherit rust-ed25519-dalek-2)
     (name "rust-ed25519-dalek")
     (version "1.0.1")
     (source
@@ -22915,7 +22946,6 @@ (define-public rust-ed25519-dalek-1
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
           (base32 "17bsriciv93nkm39z22w7mr0h2a3hnbmgf378v4c895gvkkblqn7"))))
-    (build-system cargo-build-system)
     (arguments
       `(#:skip-build? #t
         #:cargo-inputs
@@ -22927,13 +22957,7 @@ (define-public rust-ed25519-dalek-1
          ("rust-serde" ,rust-serde-1)
          ("rust-serde-bytes" ,rust-serde-bytes-0.11)
          ("rust-sha2" ,rust-sha2-0.9)
-         ("rust-zeroize" ,rust-zeroize-1))))
-    (home-page "https://dalek.rs")
-    (synopsis "Ed25519 EdDSA key generations, signing, and verification")
-    (description
-      "This package provides fast and efficient ed25519 EdDSA key generations,
-signing, and verification in pure Rust.")
-    (license license:bsd-3)))
+         ("rust-zeroize" ,rust-zeroize-1))))))
 
 (define-public rust-edit-distance-2
   (package
-- 
2.41.0

[bug#68312] [PATCH 052/156] gnu: Add rust-elliptic-curve-0.12.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 471de55c822..56450725a68 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23132,6 +23132,39 @@ (define-public rust-elliptic-curve-0.13
 curve forms, scalars, points, and public/secret keys composed thereof.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-elliptic-curve-0.12
+  (package
+    (inherit rust-elliptic-curve-0.13)
+    (name "rust-elliptic-curve")
+    (version "0.12.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "elliptic-curve" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lwi108mh6drw5nzqzlz7ighdba5qxdg5vmwwnw1j2ihnn58ifz7"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-base16ct" ,rust-base16ct-0.1)
+                       ("rust-base64ct" ,rust-base64ct-1)
+                       ("rust-crypto-bigint" ,rust-crypto-bigint-0.4)
+                       ("rust-der" ,rust-der-0.6)
+                       ("rust-digest" ,rust-digest-0.10)
+                       ("rust-ff" ,rust-ff-0.12)
+                       ("rust-generic-array" ,rust-generic-array-0.14)
+                       ("rust-group" ,rust-group-0.12)
+                       ("rust-hex-literal" ,rust-hex-literal-0.3)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-pem-rfc7468" ,rust-pem-rfc7468-0.6)
+                       ("rust-pkcs8" ,rust-pkcs8-0.9)
+                       ("rust-rand-core" ,rust-rand-core-0.6)
+                       ("rust-sec1" ,rust-sec1-0.3)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-serdect" ,rust-serdect-0.1)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-zeroize" ,rust-zeroize-1))))))
+
 (define-public rust-emacs-0.18
   (package
     (name "rust-emacs")
-- 
2.41.0

[bug#68312] [PATCH 053/156] gnu: Add rust-ff-derive-0.12.

[Wilko Meyer]

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

Change-Id: I170b30a1d4060104174918a024cd1904c1098976
---
 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 56450725a68..1aa022b8212 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26059,6 +26059,34 @@ (define-public rust-ff-derive-0.13
 prime field implementations in rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ff-derive-0.12
+  (package
+    (name "rust-ff-derive")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ff_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jvqilpzzbw3j3sh1sf0914n2l4v020iifmgvglnc7wgfjh6znqp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-addchain" ,rust-addchain-0.2)
+                       ("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-num-bigint" ,rust-num-bigint-0.3)
+                       ("rust-num-integer" ,rust-num-integer-0.1)
+                       ("rust-num-traits" ,rust-num-traits-0.2)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/zkcrypto/ff")
+    (synopsis
+     "Procedural macro library used to build custom prime field implementations")
+    (description
+     "Procedural macro library used to build custom prime field implementations")
+    (license (list license:expat license:asl2.0))))
 (define-public rust-fiat-crypto-0.1
   (package
     (name "rust-fiat-crypto")
-- 
2.41.0

[bug#68312] [PATCH 054/156] gnu: Add rust-ff-0.12.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1aa022b8212..d691e496a09 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26087,6 +26087,30 @@ (define-public rust-ff-derive-0.12
     (description
      "Procedural macro library used to build custom prime field implementations")
     (license (list license:expat license:asl2.0))))
+
+(define-public rust-ff-0.12
+  (package
+    (name "rust-ff")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ff" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0q3imz4m3dj2cy182i20wa8kbclgj13ddfngqb2miicc6cjzq4yh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-bitvec" ,rust-bitvec-1)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-ff-derive" ,rust-ff-derive-0.12)
+                       ("rust-rand-core" ,rust-rand-core-0.6)
+                       ("rust-subtle" ,rust-subtle-2))))
+    (home-page "https://github.com/zkcrypto/ff")
+    (synopsis "Library for building and interfacing with finite fields")
+    (description "Library for building and interfacing with finite fields")
+    (license (list license:expat license:asl2.0))))
 (define-public rust-fiat-crypto-0.1
   (package
     (name "rust-fiat-crypto")
-- 
2.41.0

[bug#68312] [PATCH 055/156] gnu: Add rust-figment-0.10.

[Wilko Meyer]

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

Change-Id: Ib0cda6d823915953b1eeb8cffe43845939769384
---
 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 d691e496a09..d8d34a5c557 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26111,6 +26111,36 @@ (define-public rust-ff-0.12
     (synopsis "Library for building and interfacing with finite fields")
     (description "Library for building and interfacing with finite fields")
     (license (list license:expat license:asl2.0))))
+
+(define-public rust-figment-0.10
+  (package
+    (name "rust-figment")
+    (version "0.10.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "figment" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14q9msp62m36q50qqp9n6i6bbkmkbcxjd2y8q9ra056jpk3vhabn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-atomic" ,rust-atomic-0.6)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-pear" ,rust-pear-0.2)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-serde-yaml" ,rust-serde-yaml-0.9)
+                       ("rust-tempfile" ,rust-tempfile-3)
+                       ("rust-toml" ,rust-toml-0.8)
+                       ("rust-uncased" ,rust-uncased-0.9)
+                       ("rust-version-check" ,rust-version-check-0.9))))
+    (home-page "https://github.com/SergioBenitez/Figment")
+    (synopsis "A configuration library so con-free, it's unreal.")
+    (description
+     "This package provides a configuration library so con-free, it's unreal.")
+    (license (list license:expat license:asl2.0))))
 (define-public rust-fiat-crypto-0.1
   (package
     (name "rust-fiat-crypto")
-- 
2.41.0

[bug#68312] [PATCH 056/156] gnu: Add rust-fiat-crypto-0.2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-fiat-crypto-0.2): New variable.
(rust-fiat-crypto-0.1): Inherit from rust-fiat-crypto-0.2.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d8d34a5c557..36414956375 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26141,24 +26141,40 @@ (define-public rust-figment-0.10
     (description
      "This package provides a configuration library so con-free, it's unreal.")
     (license (list license:expat license:asl2.0))))
-(define-public rust-fiat-crypto-0.1
+
+(define-public rust-fiat-crypto-0.2
   (package
     (name "rust-fiat-crypto")
-    (version "0.1.11")
+    (version "0.2.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "fiat-crypto" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "12gyr01z3bkahbxcrj2nsdq42qbqgq12w32dvpr6a7930i0qfxi1"))))
+        (base32 "1dxn0g50pv0ppal779vi7k40fr55pbhkyv4in7i13pgl4sn3wmr7"))))
     (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
     (home-page "https://github.com/mit-plv/fiat-crypto")
     (synopsis "Fiat-crypto generated Rust")
     (description "This crate provides the extracted Rust code from the Coq
 @code{fiat-crypto} libraries.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-fiat-crypto-0.1
+  (package
+    (inherit rust-fiat-crypto-0.2)
+    (name "rust-fiat-crypto")
+    (version "0.1.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fiat-crypto" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12gyr01z3bkahbxcrj2nsdq42qbqgq12w32dvpr6a7930i0qfxi1"))))))
+
 (define-public rust-file-diff-1
   (package
     (name "rust-file-diff")
-- 
2.41.0

[bug#68312] [PATCH 057/156] gnu: Add rust-finl-unicode-1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-finl-unicode-1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 36414956375..1cae9e485f0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26315,6 +26315,28 @@ (define-public rust-field-offset-0.3
 implementation.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-finl-unicode-1
+  (package
+    (name "rust-finl-unicode")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "finl_unicode" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ipdx778849czik798sjbgk5yhwxqybydac18d2g9jb20dxdrkwg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://finl.xyz")
+    (synopsis
+     "Library for handling Unicode functionality for finl (categories and grapheme segmentation)")
+    (description
+     "Library for handling Unicode functionality for finl (categories and grapheme
+segmentation)")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-find-crate-0.6
   (package
     (name "rust-find-crate")
-- 
2.41.0

[bug#68312] [PATCH 058/156] gnu: Add rust-flume-0.11.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-flume-0.11): New variable.
(rust-flume-0.10): Inherit from rust-flume-0.11.

Change-Id: I762f1d830191d09506ea0edae217d479a22d65e5
---
 gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1cae9e485f0..5b6f96ecbc4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26931,8 +26931,33 @@ (define-public rust-fluid-attributes-0.4
 crate.")
     (license license:asl2.0)))
 
+(define-public rust-flume-0.11
+  (package
+    (name "rust-flume")
+    (version "0.11.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "flume" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "10girdbqn77wi802pdh55lwbmymy437k7kklnvj12aaiwaflbb2m"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-sink" ,rust-futures-sink-0.3)
+                       ("rust-nanorand" ,rust-nanorand-0.7)
+                       ("rust-spin" ,rust-spin-0.9))))
+    (home-page "https://github.com/zesterer/flume")
+    (synopsis "Fast multi-producer channel")
+    (description
+     "This package provides a fast multi-producer channel.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-flume-0.10
   (package
+    (inherit rust-flume-0.11)
     (name "rust-flume")
     (version "0.10.14")
     (source
@@ -26942,7 +26967,6 @@ (define-public rust-flume-0.10
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0xvm1wpzkjvf99jxy9jp3dxw5nipa9blg7j0ngvxj0rl3i2b8mqn"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-futures-core" ,rust-futures-core-0.3)
@@ -26958,12 +26982,7 @@ (define-public rust-flume-0.10
         ("rust-futures" ,rust-futures-0.3)
         ("rust-rand" ,rust-rand-0.8)
         ("rust-tokio" ,rust-tokio-1)
-        ("rust-waker-fn" ,rust-waker-fn-1))))
-    (home-page "https://github.com/zesterer/flume")
-    (synopsis "Fast multi-producer channel")
-    (description
-     "This package provides a fast multi-producer channel.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-waker-fn" ,rust-waker-fn-1))))))
 
 (define-public rust-flume-0.9
   (package
-- 
2.41.0

[bug#68312] [PATCH 059/156] gnu: Add rust-futures-intrusive-0.5.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-futures-intrusive-0.5): New variable.
(rust-futures-intrusive-0.3): Inherit from rust-futures-intrusive-0.5.

Change-Id: Ie900d30a7bb0d3f9236b6b44edfdbcbfbda6a8c9
---
 gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5b6f96ecbc4..a7658d6b6e4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28090,24 +28090,23 @@ (define-public rust-futures-executor-preview-0.3
 library.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-futures-intrusive-0.3
+(define-public rust-futures-intrusive-0.5
   (package
     (name "rust-futures-intrusive")
-    (version "0.3.1")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "futures-intrusive" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "00qpir3q6j7blwpnpffj7ypf1z8wc87ldn62qr7sapymgg82j5dw"))))
+        (base32 "0vwm08d1pli6bdaj0i7xhk3476qlx4pll6i0w03gzdnh7lh0r4qx"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #true              ;XXX: need rust-async-std-1
-       #:cargo-inputs
-       (("rust-futures-core" ,rust-futures-core-0.3)
-        ("rust-lock-api" ,rust-lock-api-0.3)
-        ("rust-parking-lot" ,rust-parking-lot-0.10))))
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-lock-api" ,rust-lock-api-0.4)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12))))
     (home-page "https://github.com/Matthias247/futures-intrusive")
     (synopsis "Futures based on intrusive data structures")
     (description
@@ -28116,6 +28115,25 @@ (define-public rust-futures-intrusive-0.3
 intrusive collections.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-futures-intrusive-0.3
+  (package
+    (inherit rust-futures-intrusive-0.5)
+    (name "rust-futures-intrusive")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "futures-intrusive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "00qpir3q6j7blwpnpffj7ypf1z8wc87ldn62qr7sapymgg82j5dw"))))
+    (arguments
+     `(#:skip-build? #true              ;XXX: need rust-async-std-1
+       #:cargo-inputs
+       (("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-lock-api" ,rust-lock-api-0.3)
+        ("rust-parking-lot" ,rust-parking-lot-0.10))))))
+
 (define-public rust-futures-io-0.3
   (package
     (name "rust-futures-io")
-- 
2.41.0

[bug#68312] [PATCH 060/156] gnu: Add rust-group-0.12.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a7658d6b6e4..af598b0df8d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30458,6 +30458,31 @@ (define-public rust-group-0.13
     (description "Elliptic curve group traits and utilities.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-group-0.12
+  (package
+    (name "rust-group")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "group" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ixspxqdpq0hxg0hd9s6rngrp6rll21v4jjnr7ar1lzvdhxgpysx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-ff" ,rust-ff-0.12)
+                       ("rust-memuse" ,rust-memuse-0.2)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rand-core" ,rust-rand-core-0.6)
+                       ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)
+                       ("rust-subtle" ,rust-subtle-2))))
+    (home-page "https://github.com/zkcrypto/group")
+    (synopsis "Elliptic curve group traits and utilities")
+    (description "Elliptic curve group traits and utilities")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-groupable-0.2
   (package
     (name "rust-groupable")
-- 
2.41.0

[bug#68312] [PATCH 061/156] gnu: Add rust-http-range-header-0.3.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-http-range-header-0.3): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index af598b0df8d..4775e4d8af8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32425,6 +32425,25 @@ (define-public rust-http-auth-0.1
 extended with server support and additional auth schemes.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-http-range-header-0.3
+  (package
+    (name "rust-http-range-header")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "http-range-header" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13vm511vq3bhschkw2xi9nhxzkw53m55gn9vxg7qigfxc29spl5d"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://github.com/MarcusGrass/parse-range-headers")
+    (synopsis "No-dep range header parser")
+    (description "This crate provides a no-dep range header parser.")
+    (license license:expat)))
+
 (define-public rust-http-body-0.4
   (package
     (name "rust-http-body")
-- 
2.41.0

[bug#68312] [PATCH 062/156] gnu: rust-http-body-0.4: Update to 0.4.6.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-http-body-0.4): Update to 0.4.6.

Change-Id: I46dd80fece923bfb54f296523f54a27c43ae351b
---
 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 4775e4d8af8..5ce324c4da6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32447,14 +32447,14 @@ (define-public rust-http-range-header-0.3
 (define-public rust-http-body-0.4
   (package
     (name "rust-http-body")
-    (version "0.4.4")
+    (version "0.4.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "http-body" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1imjszmk34603m7chfnhd3rq263bxbdlaxhlbzd06wv7354zix0z"))))
+        (base32 "1lmyjfk6bqk6k9gkn1dxq770sb78pqbqshga241hr5p995bb5skw"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.41.0

[bug#68312] [PATCH 063/156] gnu: Add rust-iri-string-0.7.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-iri-string-0.7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5ce324c4da6..19cfed246ef 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32873,6 +32873,27 @@ (define-public rust-hyprland-macros-0.3
     (description "This package provides async closure macro for hyprland-rs.")
     (license license:gpl3+)))
 
+(define-public rust-iri-string-0.7
+  (package
+    (name "rust-iri-string")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "iri-string" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1h07hkfkkjjvgzlaqpr5fia7hrgv7qxqdw4xrpdc3936gmk9p191"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-memchr" ,rust-memchr-2)
+                       ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/lo48576/iri-string")
+    (synopsis "IRI as string types")
+    (description "IRI as string types")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-iai-0.1
   (package
     (name "rust-iai")
-- 
2.41.0

[bug#68312] [PATCH 064/156] gnu: Add rust-inlinable-string-0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-inlinable-string-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 19cfed246ef..efad46c1d03 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33427,6 +33427,32 @@ (define-public rust-impl-trait-for-tuples-0.2
 a trait for tuples.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-inlinable-string-0.1
+  (package
+    (name "rust-inlinable-string")
+    (version "0.1.15")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "inlinable_string" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ysjci8yfvxgf51z0ny2nnwhxrclhmb3vbngin8v4bznhr3ybyn8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/fitzgen/inlinable_string")
+    (synopsis
+     "The `inlinable_string` crate provides the `InlinableString` type -- an owned, grow-able UTF-8 string that stores small strings inline and avoids heap-allocation -- and the `StringExt` trait which abstracts string operations over both `std::string::String` and `InlinableString` (or even your own custom string type).")
+    (description
+     "The `inlinable_string` crate provides the `@code{InlinableString`} type -- an
+owned, grow-able UTF-8 string that stores small strings inline and avoids
+heap-allocation -- and the `@code{StringExt`} trait which abstracts string
+operations over both `std::string::String` and `@code{InlinableString`} (or even
+your own custom string type).")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-include-dir-0.7
   (package
     (name "rust-include-dir")
-- 
2.41.0

[bug#68312] [PATCH 065/156] gnu: Add rust-indicatif-0.17.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-indicatif-0.17): New variable.
(rust-indicatif-0.16): Inherit from rust-indicatif-0.17.

Change-Id: Ie317b977d3a3c103ba8e3695d15a81ff6b8e2601
---
 gnu/packages/crates-io.scm | 41 ++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index efad46c1d03..cec6eb810b6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33740,8 +33740,40 @@ (define-public rust-indextree-4
 of reference counted pointers.")
     (license license:expat)))
 
+(define-public rust-indicatif-0.17
+  (package
+    (name "rust-indicatif")
+    (version "0.17.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "indicatif" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "098ggvg7ps4097p5n9hmb3pqqy10bi8vjfzb7pci79xrklf78a7v"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-console" ,rust-console-0.15)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-instant" ,rust-instant-0.1)
+                       ("rust-number-prefix" ,rust-number-prefix-0.4)
+                       ("rust-portable-atomic" ,rust-portable-atomic-1)
+                       ("rust-rayon" ,rust-rayon-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+                       ("rust-unicode-width" ,rust-unicode-width-0.1)
+                       ("rust-vt100" ,rust-vt100-0.15))))
+    (home-page "https://github.com/console-rs/indicatif")
+    (synopsis "Progress bar and cli reporting library for Rust")
+    (description
+     "This package provides a progress bar and cli reporting library for
+Rust.")
+    (license license:expat)))
+
 (define-public rust-indicatif-0.16
   (package
+    (inherit rust-indicatif-0.17)
     (name "rust-indicatif")
     (version "0.16.2")
     (source (origin
@@ -33751,7 +33783,6 @@ (define-public rust-indicatif-0.16
               (sha256
                (base32
                 "06xyjs0kzqiqkjn60n1miwm2l87sa9p2lmzz0ymq18y72z37s81d"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-console" ,rust-console-0.15)
@@ -33763,13 +33794,7 @@ (define-public rust-indicatif-0.16
         ("rust-unicode-width" ,rust-unicode-width-0.1))
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.8)
-        ("rust-tokio" ,rust-tokio-1))))
-    (home-page "https://github.com/console-rs/indicatif")
-    (synopsis "Progress bar and cli reporting library for Rust")
-    (description
-     "This package provides a progress bar and cli reporting library for
-Rust.")
-    (license license:expat)))
+        ("rust-tokio" ,rust-tokio-1))))))
 
 (define-public rust-indicatif-0.15
   (package
-- 
2.41.0

[bug#68312] [PATCH 066/156] gnu: Add rust-interim-0.1.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cec6eb810b6..6795db803ff 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34397,6 +34397,31 @@ (define-public rust-integer-encoding-1
         ("rust-futures-util" ,rust-futures-util-0.3)
         ("rust-tokio" ,rust-tokio-0.2))))))
 
+(define-public rust-interim-0.1
+  (package
+    (name "rust-interim")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "interim" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0d32gcccw1iyjg79jbzzhsib52ikxkddzk5fxax274ji2x43jyqi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-logos" ,rust-logos-0.13)
+                       ("rust-time" ,rust-time-0.3))))
+    (home-page "https://github.com/conradludgate/interim")
+    (synopsis
+     "parses simple English dates, inspired by Linux date command, and forked from chrono-english")
+    (description
+     "parses simple English dates, inspired by Linux date command, and forked from
+chrono-english")
+    (license license:expat)))
+
 (define-public rust-interpolate-name-0.2
   (package
     (name "rust-interpolate-name")
-- 
2.41.0

[bug#68312] [PATCH 067/156] gnu: Add rust-ipnetwork-0.20.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-ipnetwork-0.20): New variable.
(rust-ipnetwork-0.17): Inherit from rust-ipnetwork-0.20.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6795db803ff..749367f175c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34820,8 +34820,31 @@ (define-public rust-ipnet-2
 stable toolchain.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ipnetwork-0.20
+  (package
+    (name "rust-ipnetwork")
+    (version "0.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ipnetwork" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03hhmxyimz0800z44wl3z1ak8iw91xcnk7sgx5p5jinmx50naimz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-schemars" ,rust-schemars-0.8)
+                       ("rust-serde" ,rust-serde-1))))
+    (home-page "https://crates.io/crates/ipnetwork")
+    (synopsis "Work with IP CIDRs in Rust")
+    (description "This package provides a library to work with IP CIDRs in
+Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-ipnetwork-0.17
   (package
+    (inherit rust-ipnetwork-0.20)
     (name "rust-ipnetwork")
     (version "0.17.0")
     (source
@@ -34832,19 +34855,13 @@ (define-public rust-ipnetwork-0.17
        (sha256
         (base32
          "0sviri9ksb3cmhx3h0rcfy8pvpx7f0cx5ba1z87ydvf07amymhq2"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
         ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-serde-json" ,rust-serde-json-1))))
-    (home-page "https://crates.io/crates/ipnetwork")
-    (synopsis "Work with IP CIDRs in Rust")
-    (description "This package provides a library to work with IP CIDRs in
-Rust.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-serde-json" ,rust-serde-json-1))))))
 
 (define-public rust-is-debug-1
   (package
-- 
2.41.0

[bug#68312] [PATCH 068/156] gnu: Add rust-iso8601-0.4.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-iso8601-0.4): New variable.
(rust-iso8601-0.3): Inherit from rust-iso8601-0.4.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 749367f175c..c3b1bbd34d3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34934,8 +34934,29 @@ (define-public rust-is-terminal-0.4
 stream runs in a TTY.")
     (license license:expat)))
 
+(define-public rust-iso8601-0.4
+  (package
+    (name "rust-iso8601")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "iso8601" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15nfg6d4qlniw4gk7039s5y07lzgr1dp9snsw63lsxarnyz4zfg5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-nom" ,rust-nom-7))))
+    (home-page "https://github.com/badboy/iso8601")
+    (synopsis "Parsing ISO8601 dates using nom")
+    (description "Parsing ISO8601 dates using nom.")
+    (license license:expat)))
+
 (define-public rust-iso8601-0.3
   (package
+    (inherit rust-iso8601-0.4)
     (name "rust-iso8601")
     (version "0.3.0")
     (source
@@ -34947,13 +34968,8 @@ (define-public rust-iso8601-0.3
         (sha256
          (base32
           "0vvn6f9gv2295ik77nvaz99wzbwz1bmasrd787sz6d9mlwa6ks23"))))
-    (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-nom" ,rust-nom-4))))
-    (home-page "https://github.com/badboy/iso8601")
-    (synopsis "Parsing ISO8601 dates using nom")
-    (description "Parsing ISO8601 dates using nom.")
-    (license license:expat)))
+     `(#:cargo-inputs (("rust-nom" ,rust-nom-4))))))
 
 (define-public rust-isolang-2
   (package
-- 
2.41.0

[bug#68312] [PATCH 069/156] gnu: Add rust-rust-json5-0.4.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c3b1bbd34d3..dc9349c92d7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -35962,6 +35962,30 @@ (define-public rust-js-sys-0.3
 wasm-bindgen crate.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-json5-0.4
+  (package
+    (name "rust-json5")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "json5" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1h9hni897zmn3vcixfbwwkj2gkz27h7z9dah8bk1qv37mwhxpc4n"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-pest" ,rust-pest-2)
+                       ("rust-pest-derive" ,rust-pest-derive-2)
+                       ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/callum-oakley/json5-rs")
+    (synopsis "A Rust JSON5 serializer and deserializer which speaks Serde.")
+    (description
+     "This package provides a Rust JSON5 serializer and deserializer which speaks
+Serde.")
+    (license license:isc)))
+
 (define-public rust-json-0.12
   (package
     (name "rust-json")
-- 
2.41.0

[bug#68312] [PATCH 070/156] gnu: Add rust-libsqlite3-sys-0.27.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-libsqlite3-sys-0.27): New variable.
(rust-libsqlite3-sys-0.26): Inherit from rust-libsqlite3-sys-0.27.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dc9349c92d7..f2de8407296 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38028,8 +38028,37 @@ (define-public rust-librespot-protocol-0.4
 This package contains the protobuf logic.")
     (license license:expat)))
 
+(define-public rust-libsqlite3-sys-0.27
+  (package
+    (name "rust-libsqlite3-sys")
+    (version "0.27.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libsqlite3-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "05pp60ncrmyjlxxjj187808jkvpxm06w5lvvdwwvxd2qrmnj4kng"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.69)
+                       ("rust-cc" ,rust-cc-1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3)
+                       ("rust-prettyplease" ,rust-prettyplease-0.2)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-vcpkg" ,rust-vcpkg-0.2))))
+    (inputs
+     (list sqlite))
+    (home-page "https://github.com/rusqlite/rusqlite")
+    (synopsis "Native bindings to the libsqlite3 library")
+    (description "Native bindings to the libsqlite3 library")
+    (license license:expat)))
+
 (define-public rust-libsqlite3-sys-0.26
   (package
+    (inherit rust-libsqlite3-sys-0.27)
     (name "rust-libsqlite3-sys")
     (version "0.26.0")
     (source (origin
@@ -38048,11 +38077,7 @@ (define-public rust-libsqlite3-sys-0.26
         ("rust-pkg-config" ,rust-pkg-config-0.3)
         ("rust-vcpkg" ,rust-vcpkg-0.2))))
     (inputs
-     (list sqlite))
-    (home-page "https://github.com/rusqlite/rusqlite")
-    (synopsis "Native bindings to the libsqlite3 library")
-    (description "Native bindings to the libsqlite3 library")
-    (license license:expat)))
+     (list sqlite))))
 
 (define-public rust-libsqlite3-sys-0.23
   (package
-- 
2.41.0

[bug#68312] [PATCH 071/156] gnu: Add rust-logos-codegen-0.13.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-logos-codegen-0.13): New variable.

Change-Id: Ia7e116266d17bf1f04be38934e7381372bc511cc
---
 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 f2de8407296..3ed32e56abc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38950,6 +38950,34 @@ (define-public rust-log-0.3
      `(#:cargo-inputs
        (("rust-log" ,rust-log-0.4))))))
 
+(define-public rust-logos-codegen-0.13
+  (package
+    (name "rust-logos-codegen")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "logos-codegen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0s7drl8vfp9viw9mfyz8dll1gfvp1dc6np82abj0402y548p6j6w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-beef" ,rust-beef-0.5)
+                       ("rust-fnv" ,rust-fnv-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-regex-syntax" ,rust-regex-syntax-0.6)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/maciejhirsz/logos")
+    (synopsis
+     "Implementation details for logos-codegen and logos-derive. Not for public consumption.")
+    (description
+     "Implementation details for logos-codegen and logos-derive.  Not for public
+consumption.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-loom-0.7
   (package
     (name "rust-loom")
-- 
2.41.0

[bug#68312] [PATCH 072/156] gnu: Add rust-logos-derive-0.13.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-logos-derive-0.13): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3ed32e56abc..14ac871725d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38978,6 +38978,26 @@ (define-public rust-logos-codegen-0.13
 consumption.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-logos-derive-0.13
+  (package
+    (name "rust-logos-derive")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "logos-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zi6s400yfw1ma7wnawyjjgbq1nqmx0xjdh18j8dfhhzkwi0vz6v"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-logos-codegen" ,rust-logos-codegen-0.13))))
+    (home-page "https://github.com/maciejhirsz/logos")
+    (synopsis "Create ridiculously fast Lexers")
+    (description "Create ridiculously fast Lexers")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-loom-0.7
   (package
     (name "rust-loom")
-- 
2.41.0

[bug#68312] [PATCH 073/156] gnu: Add rust-logos-0.13.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 14ac871725d..4c3cadfd7d3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38998,6 +38998,26 @@ (define-public rust-logos-derive-0.13
     (description "Create ridiculously fast Lexers")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-logos-0.13
+  (package
+    (name "rust-logos")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "logos" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hfjqmmcq6fbfwpca6874b1k3lsqi75n584kkg4qmwcgj16wl060"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-logos-derive" ,rust-logos-derive-0.13))))
+    (home-page "https://github.com/maciejhirsz/logos")
+    (synopsis "Create ridiculously fast Lexers")
+    (description "Create ridiculously fast Lexers")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-loom-0.7
   (package
     (name "rust-loom")
-- 
2.41.0

[bug#68312] [PATCH 074/156] gnu: Add rust-lru-0.12.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-lru-0.12): New variable.
(rust-lru-0.19): Inherit from rust-lru-0.12.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4c3cadfd7d3..8fc766d971a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39267,8 +39267,29 @@ (define-public rust-lopdf-0.26
         ("rust-rayon" ,rust-rayon-1)
         ("rust-time" ,rust-time-0.2))))))
 
+(define-public rust-lru-0.12
+  (package
+    (name "rust-lru")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "lru" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1myillpwqfcins062g28jvj48cxw8818zcx08ydzsl6misxfx519"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-hashbrown" ,rust-hashbrown-0.14))))
+    (home-page "https://github.com/jeromefroe/lru-rs")
+    (synopsis "A LRU cache implementation")
+    (description "This package provides a LRU cache implementation.")
+    (license license:expat)))
+
 (define-public rust-lru-0.9
   (package
+    (inherit rust-lru-0.12)
     (name "rust-lru")
     (version "0.9.0")
     (source
@@ -39278,16 +39299,11 @@ (define-public rust-lru-0.9
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "05yz4qqx7wxbhgxs5hx22j13g8mv9z3gn2pkspykyq48winx9rvi"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-hashbrown" ,rust-hashbrown-0.13))
        #:cargo-development-inputs
        (("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
-        ("rust-stats-alloc" ,rust-stats-alloc-0.1))))
-    (home-page "https://github.com/jeromefroe/lru-rs")
-    (synopsis "LRU cache")
-    (description "This package provides a LRU cache implementation.")
-    (license license:expat)))
+        ("rust-stats-alloc" ,rust-stats-alloc-0.1))))))
 
 (define-public rust-lru-0.7
   (package
-- 
2.41.0

[bug#68312] [PATCH 075/156] gnu: rust-lru-0.7: Update to 0.7.8.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-lru-0.7): Update to 0.7.8.

Change-Id: Ie6a47bef687cec921cb73da81d933820f053da05
---
 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 8fc766d971a..1dbf89442c0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39309,14 +39309,14 @@ (define-public rust-lru-0.7
   (package
     (inherit rust-lru-0.9)
     (name "rust-lru")
-    (version "0.7.2")
+    (version "0.7.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "lru" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "07sdl7gpg30hbz7cgph75n2xl8915rshi90c7jqr5j9mi62m6hr7"))))
+        (base32 "0yp4ai5rpr2czxklzxxx98p6l2aqv4g1906j3dr4b0vfgfxbx6g9"))))
     (arguments
      `(#:cargo-inputs
        (("rust-hashbrown" ,rust-hashbrown-0.11))
-- 
2.41.0

[bug#68312] [PATCH 076/156] gnu: Add rust-mach2-0.4.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1dbf89442c0..f854f8eb785 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39622,6 +39622,29 @@ (define-public rust-m-lexer-0.0.4
 lexer.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-mach2-0.4
+  (package
+    (name "rust-mach2")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mach2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02gpyq89rcrqdbz4hgp5bpjas21dllxfc70jgw8vj0iaxg6mbf8r"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://github.com/JohnTitor/mach2")
+    (synopsis
+     "A Rust interface to the user-space API of the Mach 3.0 kernel that underlies OSX.")
+    (description
+     "This package provides a Rust interface to the user-space API of the Mach 3.0
+kernel that underlies OSX.")
+    (license (list license:bsd-2 license:expat license:asl2.0))))
+
 (define-public rust-mac-0.1
   (package
     (name "rust-mac")
-- 
2.41.0

[bug#68312] [PATCH 077/156] gnu: Add rust-mac-address-1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-mac-address-1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f854f8eb785..4db57223adb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39666,6 +39666,29 @@ (define-public rust-mac-0.1
      "This package provides a collection of great and ubiqutitous macros.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-mac-address-1
+  (package
+    (name "rust-mac-address")
+    (version "1.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mac_address" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0miqmn1768vxr5f3gbsnr1dlnzc5ilrrj0n07fziblwyy6afwqs8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-nix" ,rust-nix-0.23)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/rep-nop/mac_address")
+    (synopsis "Cross-platform retrieval of a network interface MAC address.")
+    (description
+     "Cross-platform retrieval of a network interface MAC address.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-macrotest-1
   (package
     (name "rust-macrotest")
-- 
2.41.0

[bug#68312] [PATCH 078/156] gnu: Add rust-matchit-0.7.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4db57223adb..cb4528bd380 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40114,6 +40114,26 @@ (define-public rust-markup5ever-rcdom-0.1
        (("rust-rustc-test" ,rust-rustc-test-0.3)
         ("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-matchit-0.7
+  (package
+    (name "rust-matchit")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matchit" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "156bgdmmlv4crib31qhgg49nsjk88dxkdqp80ha2pk2rk6n6ax0f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://github.com/ibraheemdev/matchit")
+    (synopsis "A high performance, zero-copy URL router.")
+    (description
+     "This package provides a high performance, zero-copy URL router.")
+    (license (list license:expat license:bsd-3))))
+
 (define-public rust-match-cfg-0.1
   (package
     (name "rust-match-cfg")
-- 
2.41.0

[bug#68312] [PATCH 079/156] gnu: Add rust-memmem-0.1.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cb4528bd380..914f14f9663 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41070,6 +41070,25 @@ (define-public rust-memuse-0.2
     (description "Traits for measuring dynamic memory usage of types.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-memmem-0.1
+  (package
+    (name "rust-memmem")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "memmem" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "05ccifqgxdfxk6yls41ljabcccsz3jz6549l1h3cwi17kr494jm6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "http://github.com/jneem/memmem")
+    (synopsis "Substring searching")
+    (description "Substring searching")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-merge-derive-0.1
   (package
     (name "rust-merge-derive")
-- 
2.41.0

[bug#68312] [PATCH 080/156] gnu: Add rust-merlin-3.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-merlin-3): New variable.
(rust-merlin-2): Inherit from rust-merlin-3.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 914f14f9663..71dcf8bde34 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41142,8 +41142,37 @@ (define-public rust-merge-0.1
 to merge two objects of the same type into one.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-merlin-3
+  (package
+    (name "rust-merlin")
+    (version "3.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "merlin" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0z9rh9jlpcs0i0cijbs6pcq26gl4qwz05y7zbnv7h2gwk4kqxhsq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-hex" ,rust-hex-0.3)
+                       ("rust-keccak" ,rust-keccak-0.1)
+                       ("rust-rand-core" ,rust-rand-core-0.6)
+                       ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://docs.rs/merlin")
+    (synopsis "Composable proof transcripts for public-coin arguments of
+knowledge")
+    (description
+     "Merlin is a STROBE-based transcript construction for zero-knowledge
+proofs.  It automates the Fiat-Shamir transform, so that by using Merlin,
+non-interactive protocols can be implemented as if they were interactive.")
+    (license license:expat)))
+
 (define-public rust-merlin-2
   (package
+    (inherit rust-merlin-3)
     (name "rust-merlin")
     (version "2.0.0")
     (source
@@ -41161,15 +41190,7 @@ (define-public rust-merlin-2
          ("rust-hex" ,rust-hex-0.3)
          ("rust-keccak" ,rust-keccak-0.1)
          ("rust-rand-core" ,rust-rand-core-0.5)
-         ("rust-zeroize" ,rust-zeroize-1))))
-    (home-page "https://docs.rs/merlin")
-    (synopsis "Composable proof transcripts for public-coin arguments of
-knowledge")
-    (description
-     "Merlin is a STROBE-based transcript construction for zero-knowledge
-proofs.  It automates the Fiat-Shamir transform, so that by using Merlin,
-non-interactive protocols can be implemented as if they were interactive.")
-    (license license:expat)))
+         ("rust-zeroize" ,rust-zeroize-1))))))
 
 (define-public rust-metadeps-1
   (package
-- 
2.41.0

[bug#68312] [PATCH 081/156] gnu: Add rust-metrics-util-0.15.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-metrics-util-0.15): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 71dcf8bde34..3319fe16914 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41265,6 +41265,41 @@ (define-public rust-twox-hash-1
 and XXH3 algorithms.")
     (license license:expat)))
 
+(define-public rust-metrics-util-0.15
+  (package
+    (name "rust-metrics-util")
+    (version "0.15.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "metrics-util" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0glpkmrj7zkg9b290x6qxf93kmd9b4b4sbkk1fs19l8y95pfvqjd"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+           (substitute* "Cargo.toml"
+             (("=0\\.13\\.1") "^0.13.2"))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-ahash" ,rust-ahash-0.8)
+                       ("rust-aho-corasick" ,rust-aho-corasick-1)
+                       ("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.9)
+                       ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+                       ("rust-hashbrown" ,rust-hashbrown-0.13)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-metrics" ,rust-metrics-0.21)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-ordered-float" ,rust-ordered-float-3)
+                       ("rust-quanta" ,rust-quanta-0.11)
+                       ("rust-radix-trie" ,rust-radix-trie-0.2)
+                       ("rust-sketches-ddsketch" ,rust-sketches-ddsketch-0.2))))
+    (home-page "https://github.com/metrics-rs/metrics")
+    (synopsis "Helper types/functions used by the metrics ecosystem.")
+    (description "Helper types/functions used by the metrics ecosystem.")
+    (license license:expat)))
+
 (define-public rust-metrics-macros-0.2
   (package
     (name "rust-metrics-macros")
-- 
2.41.0

[bug#68312] [PATCH 082/156] gnu: Add rust-metrics-exporter-prometheus-0.12.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3319fe16914..e19f3d04385 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41300,6 +41300,38 @@ (define-public rust-metrics-util-0.15
     (description "Helper types/functions used by the metrics ecosystem.")
     (license license:expat)))
 
+(define-public rust-metrics-exporter-prometheus-0.12
+  (package
+    (name "rust-metrics-exporter-prometheus")
+    (version "0.12.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "metrics-exporter-prometheus" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0l19s21jfmwm72cxfjq35xb79a5wi4fv7c1p993dnqj8gk7afkqx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-base64" ,rust-base64-0.21)
+                       ("rust-hyper" ,rust-hyper-0.14)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-ipnet" ,rust-ipnet-2)
+                       ("rust-metrics" ,rust-metrics-0.21)
+                       ("rust-metrics-util" ,rust-metrics-util-0.15)
+                       ("rust-quanta" ,rust-quanta-0.11)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1))))
+    (home-page "https://github.com/metrics-rs/metrics")
+    (synopsis
+     "A metrics-compatible exporter for sending metrics to Prometheus.")
+    (description
+     "This package provides a metrics-compatible exporter for sending metrics to
+Prometheus.")
+    (license license:expat)))
+
 (define-public rust-metrics-macros-0.2
   (package
     (name "rust-metrics-macros")
-- 
2.41.0

[bug#68312] [PATCH 083/156] gnu: Add rust-metrics-macros-0.7.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-metrics-macros-0.7): New variable.
(rust-metrics-macros-0.2): Inherit from rust-metrics-macros-0.7.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e19f3d04385..061fd64df04 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41332,8 +41332,31 @@ (define-public rust-metrics-exporter-prometheus-0.12
 Prometheus.")
     (license license:expat)))
 
+(define-public rust-metrics-macros-0.7
+  (package
+    (name "rust-metrics-macros")
+    (version "0.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "metrics-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0krmj7zyr4g14jdpk1jasi1w2nw64hqdxb2lfx4zxphp0vqgmd1q"))))
+    (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-2))))
+    (home-page "https://github.com/metrics-rs/metrics")
+    (synopsis "Macros for the metrics crate.")
+    (description "This package provides macros for the metrics crate.")
+    (license license:expat)))
+
 (define-public rust-metrics-macros-0.2
   (package
+    (inherit rust-metrics-macros-0.7)
     (name "rust-metrics-macros")
     (version "0.2.0")
     (source (origin
@@ -41343,7 +41366,6 @@ (define-public rust-metrics-macros-0.2
               (sha256
                (base32
                 "0yy2dc9g3m1h8df6bmnqh1sngyvrgznz1fjpkp9rz1is9p6n1b0i"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-lazy-static" ,rust-lazy-static-1)
@@ -41351,7 +41373,8 @@ (define-public rust-metrics-macros-0.2
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-regex" ,rust-regex-1)
-        ("rust-syn" ,rust-syn-1))))
+        ("rust-syn" ,rust-syn-1))))))
+
     (home-page "https://github.com/metrics-rs/metrics")
     (synopsis "Macros for the metrics crate")
     (description "This package provides macros for the metrics crate.")
-- 
2.41.0

[bug#68312] [PATCH 084/156] gnu: Add rust-metrics-0.21.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-metrics-0.21): New variable.
(rust-metrics-0.14): Inherit from rust-metrics-0.21.

Change-Id: I68a9b9567ac78242aa05d67bc6ea8cbc62a2a653
---
 gnu/packages/crates-io.scm | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 061fd64df04..d3104a8feca 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41375,13 +41375,31 @@ (define-public rust-metrics-macros-0.2
         ("rust-regex" ,rust-regex-1)
         ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-metrics-0.21
+  (package
+    (name "rust-metrics")
+    (version "0.21.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "metrics" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ibndxzk0sja8cgwrr73b9vzbgfvwzwxwkxqiivnmmwy00dazqzx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-ahash" ,rust-ahash-0.8)
+                       ("rust-metrics-macros" ,rust-metrics-macros-0.7)
+                       ("rust-portable-atomic" ,rust-portable-atomic-1))))
     (home-page "https://github.com/metrics-rs/metrics")
-    (synopsis "Macros for the metrics crate")
-    (description "This package provides macros for the metrics crate.")
+    (synopsis "A lightweight metrics facade.")
+    (description "This package provides a lightweight metrics facade.")
     (license license:expat)))
 
 (define-public rust-metrics-0.14
   (package
+    (inherit rust-metrics-0.21)
     (name "rust-metrics")
     (version "0.14.2")
     (source (origin
@@ -41391,7 +41409,6 @@ (define-public rust-metrics-0.14
               (sha256
                (base32
                 "0lf80vznlh0p06nchj08nlqgf3bajnwr6w3syflg7ffg3mh8bqjq"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; Tests pass on earlier version of rust
        #:cargo-inputs
@@ -41399,11 +41416,7 @@ (define-public rust-metrics-0.14
         ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-trybuild" ,rust-trybuild-1))))
-    (home-page "https://github.com/metrics-rs/metrics")
-    (synopsis "Lightweight metrics facade")
-    (description "This package provides a lightweight metrics facade.")
-    (license license:expat)))
+        ("rust-trybuild" ,rust-trybuild-1))))))
 
 (define-public rust-metrohash-1
   (package
-- 
2.41.0

[bug#68312] [PATCH 085/156] gnu: rust-mime-0.3: Update to 0.3.17.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-mime-0.3): Update to 0.3.17.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d3104a8feca..cbb0c6c87f4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41618,15 +41618,14 @@ (define-public rust-mimalloc-rust-sys-1
 (define-public rust-mime-0.3
   (package
     (name "rust-mime")
-    (version "0.3.16")
+    (version "0.3.17")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "mime" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "13dcm9lh01hdwfjcg74ppljyjfj1c6w3a3cwkhxf0w8wa37cfq1a"))))
+        (base32 "16hkibgvb9klh0w0jk5crr5xv90l3wlf77ggymzjmvl1818vnxv8"))))
     (build-system cargo-build-system)
     (arguments '(#:skip-build? #t))
     (home-page "https://github.com/hyperium/mime")
-- 
2.41.0

[bug#68312] [PATCH 086/156] gnu: Add rust-minspan-0.1.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cbb0c6c87f4..6c383659886 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41700,6 +41700,27 @@ (define-public rust-mime-guess-1
         ("rust-phf-codegen" ,rust-phf-codegen-0.7)
         ("rust-unicase" ,rust-unicase-1))))))
 
+(define-public rust-minspan-0.1
+  (package
+    (name "rust-minspan")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "minspan" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1s7lh0ryq0kk6sm6z5f2ikqq437xca0gzc61ds80pbh8qdxa2s8j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "")
+    (synopsis
+     "a package for determining the minimum span of one vector within another")
+    (description
+     "a package for determining the minimum span of one vector within another")
+    (license license:expat)))
+
 (define-public rust-miniflux-api-0.3
   (package
     (name "rust-miniflux-api")
-- 
2.41.0

[bug#68312] [PATCH 087/156] gnu: Add rust-multer-2.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6c383659886..481b3c16f31 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42426,6 +42426,41 @@ (define-public rust-muldiv-1
 multiplication and division with overflow protection.")
     (license license:expat)))
 
+(define-public rust-multer-2
+  (package
+    (name "rust-multer")
+    (version "2.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "multer" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hjiphaypj3phqaj5igrzcia9xfmf4rr4ddigbh8zzb96k1bvb01"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-httparse" ,rust-httparse-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-mime" ,rust-mime-0.3)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-spin" ,rust-spin-0.9)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-util" ,rust-tokio-util-0.7)
+                       ("rust-version-check" ,rust-version-check-0.9))))
+    (home-page "https://github.com/rousan/multer-rs")
+    (synopsis
+     "An async parser for `multipart/form-data` content-type in Rust.")
+    (description
+     "An async parser for `multipart/form-data` content-type in Rust.")
+    (license license:expat)))
+
 (define-public rust-multimap-0.8
   (package
     (name "rust-multimap")
-- 
2.41.0

[bug#68312] [PATCH 088/156] gnu: Add rust-nu-ansi-term-0.49.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-nu-ansi-term-0.49): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 481b3c16f31..b0b4f295efe 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45761,6 +45761,24 @@ (define-public rust-nu-ansi-term-0.46
 underline) in rust.")
     (license license:expat)))
 
+(define-public rust-nu-ansi-term-0.49
+  (package
+    (inherit rust-nu-ansi-term-0.46)
+    (name "rust-nu-ansi-term")
+    (version "0.49.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nu-ansi-term" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0s2svfnircd9jp06wk55qcbb9v5cadkfcjfg99vm21qdjg0x6wy0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-serde" ,rust-serde-1)
+                       ("rust-windows-sys" ,rust-windows-sys-0.48))))))
+
 (define-public rust-num-0.4
   (package
     (name "rust-num")
-- 
2.41.0

[bug#68312] [PATCH 089/156] gnu: Add rust-oid-registry-0.4.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-oid-registry-0.4): New variable.
(rust-oid-registry-0.2): Inherit from rust-oid-registry-0.4.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b0b4f295efe..2b4f866bb5a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47005,10 +47005,26 @@ (define-public rust-oid-registry-0.6
 grammars and BER/DER encodings, for example.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-oid-registry-0.2
+(define-public rust-oid-registry-0.4
   (package
     (inherit rust-oid-registry-0.6)
     (name "rust-oid-registry")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "oid-registry" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0akbah3j8231ayrp2l1y5d9zmvbvqcsj0sa6s6dz6h85z8bhgqiq"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-asn1-rs" ,rust-asn1-rs-0.3))))))
+
+(define-public rust-oid-registry-0.2
+  (package
+    (inherit rust-oid-registry-0.4)
+    (name "rust-oid-registry")
     (version "0.2.0")
     (source (origin
               (method url-fetch)
-- 
2.41.0

[bug#68312] [PATCH 090/156] gnu: Add rust-ordered-multimap-0.4.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-ordered-multimap-0.4): New variable.
(rust-ordered-multimap-0.3): Inherit from rust-ordered-multimap-0.4.

Change-Id: Ia3a8d9c8d4e73f24720357c3410da955e86616eb
---
 gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2b4f866bb5a..aa7893dd3a2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47781,30 +47781,48 @@ (define-public rust-ordered-float-1
         (base32
          "0625x96987kspdxbikry5mb7hsf5pdc5bbanxd8wjwqlx0ar71hq"))))))
 
-(define-public rust-ordered-multimap-0.3
+(define-public rust-ordered-multimap-0.4
   (package
     (name "rust-ordered-multimap")
-    (version "0.3.1")
+    (version "0.4.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ordered-multimap" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1194q7sb2d6chbllsn7237dhhvx04iqr3sq0ii16w1pcv5x2qrqw"))))
+        (base32 "0jljv1257pfyf855jlwwas5mqkzk40b9lqfx40f73qbpf7ildmyc"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-dlv-list" ,rust-dlv-list-0.2)
-        ("rust-hashbrown" ,rust-hashbrown-0.9)
-        ("rust-serde" ,rust-serde-1))))
+       #:cargo-inputs (("rust-dlv-list" ,rust-dlv-list-0.3)
+                       ("rust-hashbrown" ,rust-hashbrown-0.12)
+                       ("rust-serde" ,rust-serde-1))))
     (home-page "https://github.com/sgodwincs/ordered-multimap-rs")
     (synopsis "Insertion ordered multimap")
     (description "This crate provides a multimap type object that maintains
 insertion order across all keys and values.")
     (license license:expat)))
 
+(define-public rust-ordered-multimap-0.3
+  (package
+    (inherit rust-ordered-multimap-0.4)
+    (name "rust-ordered-multimap")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ordered-multimap" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1194q7sb2d6chbllsn7237dhhvx04iqr3sq0ii16w1pcv5x2qrqw"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-dlv-list" ,rust-dlv-list-0.2)
+        ("rust-hashbrown" ,rust-hashbrown-0.9)
+        ("rust-serde" ,rust-serde-1))))))
+
 (define-public rust-ordered-stream-0.1
   (package
     (name "rust-ordered-stream")
-- 
2.41.0

[bug#68312] [PATCH 091/156] gnu: Add rust-p384-0.11.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index aa7893dd3a2..1b595d34425 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48414,6 +48414,26 @@ (define-public rust-p384-0.13
 signing/verification, and general purpose curve arithmetic support.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-p384-0.11
+  (package
+    (inherit from rust-p384-0.13)
+    (name "rust-p384")
+    (version "0.11.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "p384" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1al021z9j5y7nznqvngf5snglxjsrbcfrh47ksxm5pidcjzwbj6z"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-ecdsa" ,rust-ecdsa-0.14)
+                       ("rust-elliptic-curve" ,rust-elliptic-curve-0.12)
+                       ("rust-hex-literal" ,rust-hex-literal-0.3)
+                       ("rust-serdect" ,rust-serdect-0.1)
+                       ("rust-sha2" ,rust-sha2-0.10))))))
+
 (define-public rust-packed-simd-0.3
   (package
     (name "rust-packed-simd")
-- 
2.41.0

[bug#68312] [PATCH 092/156] gnu: Add rust-parse-duration-2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-parse-duration-2): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1b595d34425..82695f85f4a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49396,6 +49396,28 @@ (define-public rust-parquet2-0.4
         ("rust-streaming-iterator" ,rust-streaming-iterator-0.1)
         ("rust-zstd" ,rust-zstd-0.9))))))
 
+(define-public rust-parse-duration-2
+  (package
+    (name "rust-parse-duration")
+    (version "2.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "parse_duration" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0pd97dmlv1i6pvr2byi65q1fzv667gvhnf3ld2lsawh17vlyadvh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-num" ,rust-num-0.2)
+                       ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/zeta12ti/parse_duration/")
+    (synopsis "Parses a duration from a string.")
+    (description "Parses a duration from a string.")
+    (license license:expat)))
+
 (define-public rust-parse-zoneinfo-0.3
   (package
     (name "rust-parse-zoneinfo")
-- 
2.41.0

[bug#68312] [PATCH 093/156] gnu: Add rust-pear-0.2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-pear-0.2): New variable.
(rust-pear-0.1): Inherit from rust-pear-0.2.

Change-Id: I840a809db625fc096c362777778b9a2293d8bf2a
---
 gnu/packages/crates-io.scm | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 82695f85f4a..e22de86580e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50188,8 +50188,31 @@ (define-public rust-pdqselect-0.1
 pdqsort.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-pear-0.2
+  (package
+    (name "rust-pear")
+    (version "0.2.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pear" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1j03s6m80iqldnm6jzh3k1fbyk0lxirx8bi4ivgq3k3sq7va1k2c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-inlinable-string" ,rust-inlinable-string-0.1)
+                       ("rust-pear-codegen" ,rust-pear-codegen-0.2)
+                       ("rust-yansi" ,rust-yansi-1))))
+    (home-page "https://crates.io/crates/pear")
+    (synopsis "Pear is a fruit")
+    (description "This package provides a pear is a fruit.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-pear-0.1
   (package
+    (inherit rust-pear-0.2)
     (name "rust-pear")
     (version "0.1.5")
     (source
@@ -50199,7 +50222,6 @@ (define-public rust-pear-0.1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "02lnp8c414z5ds0lskd4zxlalrjljzpkg8g6kizszij4h52sgprj"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-- 
2.41.0

[bug#68312] [PATCH 094/156] gnu: Add rust-pear-codegen-0.2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-pear-codegen-0.2): New variable.
(rust-pear-codegen-0.1): Inherit from rust-pear-codegen-0.2.

Change-Id: I4ed58d199bcbbdd6af89d702cbf696e8a90a2d7d
---
 gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e22de86580e..220578631a5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50231,8 +50231,33 @@ (define-public rust-pear-0.1
     (description "This package provides a pear is a fruit.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pear-codegen-0.2
+  (package
+    (name "rust-pear-codegen")
+    (version "0.2.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pear_codegen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xrwnlncg7l64gfy82vf6kq55ww7p6krq6bc3pqwymxpiq76f8if"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.10)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "")
+    (synopsis "A (codegen) pear is a fruit.")
+    (description
+     "This package provides a (codegen) pear is a fruit.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-pear-codegen-0.1
   (package
+    (inherit rust-pear-codegen-0.2)
     (name "rust-pear-codegen")
     (version "0.1.5")
     (source
@@ -50242,7 +50267,6 @@ (define-public rust-pear-codegen-0.1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "19lcpkfspizd4ywwvca6rxgc311m070k3ndvwa9vrbw1snjqna60"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -50250,12 +50274,7 @@ (define-public rust-pear-codegen-0.1
         ("rust-quote" ,rust-quote-0.6)
         ("rust-syn" ,rust-syn-0.15)
         ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5))))
-    (home-page "https://crates.io/crates/pear_codegen")
-    (synopsis "Codegen for pear")
-    (description
-     "This package provides a (codegen) pear is a fruit.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-yansi" ,rust-yansi-0.5))))))
 
 (define-public rust-peeking-take-while-0.1
   (package
-- 
2.41.0

[bug#68312] [PATCH 095/156] gnu: Add rust-platforms-3.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 220578631a5..c56313a2a8d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -52140,6 +52140,31 @@ (define-public rust-plain-0.2
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-platforms-3
+  (package
+    (name "rust-platforms")
+    (version "3.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "platforms" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0k7q6pigmnvgpfasvssb12m2pv3pc94zrhrfg9by3h3wmhyfqvb2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-serde" ,rust-serde-1))))
+    (home-page "https://rustsec.org")
+    (synopsis
+     "Rust platform registry with information about valid Rust platforms (target
+triple, target_arch, target_os) sourced from the Rust compiler.
+")
+    (description
+     "Rust platform registry with information about valid Rust platforms (target
+triple, target_arch, target_os) sourced from the Rust compiler.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-platform-info-2
   (package
     (name "rust-platform-info")
-- 
2.41.0

[bug#68312] [PATCH 096/156] gnu: Add rust-poly1305-0.8.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-poly1305-0.8): New variable.
(rust-poly1305-0.7): Inherit from rust-poly1305-0.8.

Change-Id: I853879812db8636e3a5ef8743ac5215f97156685
---
 gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c56313a2a8d..307edaac393 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -52737,8 +52737,34 @@ (define-public rust-pollster-macro-0.1
     (description "Proc-macro crate for pollster.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-poly1305-0.8
+  (package
+    (name "rust-poly1305")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "poly1305" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1grs77skh7d8vi61ji44i8gpzs3r9x7vay50i6cg8baxfa8bsnc1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-cpufeatures" ,rust-cpufeatures-0.2)
+                       ("rust-opaque-debug" ,rust-opaque-debug-0.3)
+                       ("rust-universal-hash" ,rust-universal-hash-0.5)
+                       ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://github.com/RustCrypto/universal-hashes")
+    (synopsis "Poly1305 universal hash")
+    (description
+     "Poly1305 is a universal hash function which, when combined with
+a cipher, can be used as a Message Authentication Code (MAC).")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-poly1305-0.7
   (package
+    (inherit rust-poly1305-0.8)
     (name "rust-poly1305")
     (version "0.7.2")
     (source
@@ -52752,7 +52778,6 @@ (define-public rust-poly1305-0.7
        (snippet
         '(begin (substitute* "Cargo.toml"
                   (("version = \">=1, <1\\.4\"") "version = \"^1\""))))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-cpufeatures" ,rust-cpufeatures-0.2)
@@ -52760,13 +52785,7 @@ (define-public rust-poly1305-0.7
         ("rust-universal-hash" ,rust-universal-hash-0.4)
         ("rust-zeroize" ,rust-zeroize-1))
        #:cargo-development-inputs
-       (("rust-hex-literal" ,rust-hex-literal-0.3))))
-    (home-page "https://github.com/RustCrypto/universal-hashes")
-    (synopsis "Poly1305 universal hash")
-    (description
-     "Poly1305 is a universal hash function which, when combined with
-a cipher, can be used as a Message Authentication Code (MAC).")
-    (license (list license:asl2.0 license:expat))))
+       (("rust-hex-literal" ,rust-hex-literal-0.3))))))
 
 (define-public rust-polyval-0.6
   (package
-- 
2.41.0

[bug#68312] [PATCH 097/156] gnu: Add rust-proc-macro-crate-2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-proc-macro-crate-2): New variable.
(rust-proc-macro-crate-1): Inherit from rust-proc-macro-crate-2.

Change-Id: I873ac54abccd2c0dfa2f346349fd59bf32a2f78b
---
 gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 307edaac393..f1edc3c9c14 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53800,8 +53800,32 @@ (define-public rust-priority-queue-1
 priority of an object.")
     (license license:expat)))
 
+(define-public rust-proc-macro-crate-2
+  (package
+    (name "rust-proc-macro-crate")
+    (version "2.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "proc-macro-crate" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06jbv5w6s04dbjbwq0iv7zil12ildf3w8dvvb4pqvhig4gm5zp4p"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-toml-datetime" ,rust-toml-datetime-0.6)
+                       ("rust-toml-edit" ,rust-toml-edit-0.20))))
+    (home-page "https://github.com/bkchr/proc-macro-crate")
+    (synopsis "Support for @code{$crate} in procedural macros")
+    (description
+     "This crate provides a way to get the name of a crate, even if it
+renamed in @file{Cargo.toml}.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-proc-macro-crate-1
   (package
+    (inherit rust-proc-macro-crate-2)
     (name "rust-proc-macro-crate")
     (version "1.3.0")
     (source
@@ -53811,7 +53835,6 @@ (define-public rust-proc-macro-crate-1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0d1zq41h7aymny4p87nmz20688zr9zrrn6nmczz7l77cwj4q6qb6"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-once-cell" ,rust-once-cell-1)
@@ -53819,13 +53842,7 @@ (define-public rust-proc-macro-crate-1
        #:cargo-development-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/bkchr/proc-macro-crate")
-    (synopsis "Support for @code{$crate} in procedural macros")
-    (description
-     "This crate provides a way to get the name of a crate, even if it
-renamed in @file{Cargo.toml}.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-proc-macro-crate-0.1
   (package
-- 
2.41.0

[bug#68312] [PATCH 098/156] gnu: rust-proc-macro2-1: Update to 1.0.76.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-proc-macro2-1): Update to 1.0.76.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f1edc3c9c14..7a2876c5e48 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54018,15 +54018,14 @@ (define-public rust-proc-macro-nested-0.1
 (define-public rust-proc-macro2-1
   (package
     (name "rust-proc-macro2")
-    (version "1.0.74")
+    (version "1.0.76")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "proc-macro2" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1nynw3s8in1pz5l0mfk4bgbvszlxyk85nc5vs2lcxkqjy818bs9d"))))
+        (base32 "136cp0fgl6rg5ljm3b1xpc0bn0lyvagzzmxvbxgk5hxml36mdz4m"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags '("--lib")
-- 
2.41.0

[bug#68312] [PATCH 099/156] gnu: Add rust-proc-macro-diagnostics-0.10.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-proc-macro-diagnostics-0.10): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7a2876c5e48..63b25e75321 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54088,6 +54088,30 @@ (define-public rust-proc-macro2-0.3
 macro use case.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-proc-macro2-diagnostics-0.10
+  (package
+    (name "rust-proc-macro2-diagnostics")
+    (version "0.10.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "proc-macro2-diagnostics" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1j48ipc80pykvhx6yhndfa774s58ax1h6sm6mlhf09ls76f6l1mg"))))
+    (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-2)
+                       ("rust-version-check" ,rust-version-check-0.9)
+                       ("rust-yansi" ,rust-yansi-1))))
+    (home-page "https://github.com/SergioBenitez/proc-macro2-diagnostics")
+    (synopsis "Diagnostics for proc-macro2.")
+    (description "Diagnostics for proc-macro2.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-proc-mounts-0.3
   (package
     (name "rust-proc-mounts")
-- 
2.41.0

[bug#68312] [PATCH 100/156] gnu: Add rust-prost-derive-0.11.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-prost-derive-0.11): New variable.
(rust-prost-derive-0.9): Inherit from rust-prost-derive-0.11.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 63b25e75321..334ccefde28 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54529,8 +54529,36 @@ (define-public rust-proptest-derive-0.1
         ("rust-criterion" ,rust-criterion-0.2)
         ("rust-proptest" ,rust-proptest-0.9))))))
 
+(define-public rust-prost-derive-0.11
+  (package
+    (name "rust-prost-derive")
+    (version "0.11.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "prost-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1d3mw2s2jba1f7wcjmjd6ha2a255p2rmynxhm1nysv9w1z8xilp5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-itertools" ,rust-itertools-0.10)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/tokio-rs/prost")
+    (synopsis "Protocol Buffers implementation for the Rust language")
+    (description
+     "This package provides a Protocol Buffers implementation for the Rust
+language.")
+    (license license:asl2.0)))
+
+
 (define-public rust-prost-derive-0.9
   (package
+    (inherit rust-prost-derive-0.11)
     (name "rust-prost-derive")
     (version "0.9.0")
     (source
@@ -54540,7 +54568,6 @@ (define-public rust-prost-derive-0.9
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1zi0qway5anz5ik3k1yrc2av81sjcqvqy9lnivv0nzp0ccr1mk7r"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -54548,7 +54575,7 @@ (define-public rust-prost-derive-0.9
         ("rust-itertools" ,rust-itertools-0.10)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
+        ("rust-syn" ,rust-syn-1))))))
     (home-page "https://github.com/tokio-rs/prost")
     (synopsis "Protocol Buffers implementation for the Rust language")
     (description
-- 
2.41.0

[bug#68312] [PATCH 101/156] gnu: Add rust-prost-0.11.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-prost-0.11): New variable.
(rust-prost-0.9): Inherit from rust-prost-0.11.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 334ccefde28..b4a660c9491 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54576,6 +54576,23 @@ (define-public rust-prost-derive-0.9
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
+
+(define-public rust-prost-0.11
+  (package
+    (name "rust-prost")
+    (version "0.11.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "prost" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kc1hva2h894hc0zf6r4r8fsxfpazf7xn5rj3jya9sbrsyhym0hb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-prost-derive" ,rust-prost-derive-0.11))))
     (home-page "https://github.com/tokio-rs/prost")
     (synopsis "Protocol Buffers implementation for the Rust language")
     (description
@@ -54585,6 +54602,7 @@ (define-public rust-prost-derive-0.9
 
 (define-public rust-prost-0.9
   (package
+    (inherit rust-prost-0.11)
     (name "rust-prost")
     (version "0.9.0")
     (source
@@ -54594,12 +54612,11 @@ (define-public rust-prost-0.9
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "00b0xfn80alw7h2pzr2z4dycyvsys4h5878sifaq9zdlbhkpjj24"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-bytes" ,rust-bytes-1)
-        ("rust-prost-derive" ,rust-prost-derive-0.9))))
+        ("rust-prost-derive" ,rust-prost-derive-0.9))))))
     (home-page "https://github.com/tokio-rs/prost")
     (synopsis "Protocol Buffers implementation for the Rust language")
     (description
-- 
2.41.0

[bug#68312] [PATCH 102/156] gnu: Add rust-prost-types-0.11.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-prost-types-0.11): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b4a660c9491..01ac92c000a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54617,11 +54617,26 @@ (define-public rust-prost-0.9
        #:cargo-inputs
        (("rust-bytes" ,rust-bytes-1)
         ("rust-prost-derive" ,rust-prost-derive-0.9))))))
+
+(define-public rust-prost-types-0.11
+  (package
+    (name "rust-prost-types")
+    (version "0.11.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "prost-types" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04ryk38sqkp2nf4dgdqdfbgn6zwwvjraw6hqq6d9a6088shj4di1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-prost" ,rust-prost-0.11))))
     (home-page "https://github.com/tokio-rs/prost")
-    (synopsis "Protocol Buffers implementation for the Rust language")
+    (synopsis "A Protocol Buffers implementation for the Rust Language.")
     (description
-     "This package provides a Protocol Buffers implementation for the Rust
-language.")
+     "This package provides a Protocol Buffers implementation for the Rust Language.")
     (license license:asl2.0)))
 
 ;; It's recommended that rust-protobuf, rust-protobuf-codegen
-- 
2.41.0

[bug#68312] [PATCH 103/156] gnu: Add rust-quanta-0.11.

[Wilko Meyer]

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

Change-Id: I2827f7180b93aa31e9d6a352417eebb140da40fb
---
 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 01ac92c000a..87018b35fc8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55890,6 +55890,34 @@ (define-public rust-qstring-0.7
     (description "This package provides query string parser.")
     (license license:expat)))
 
+(define-public rust-quanta-0.11
+  (package
+    (name "rust-quanta")
+    (version "0.11.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "quanta" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1axrw0nqc90bq671w05jd9460pmwg86c4r132mjsi4c2g8m6czm1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-mach2" ,rust-mach2-0.4)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-prost-types" ,rust-prost-types-0.11)
+                       ("rust-raw-cpuid" ,rust-raw-cpuid-10)
+                       ("rust-wasi" ,rust-wasi-0.11)
+                       ("rust-web-sys" ,rust-web-sys-0.3)
+                       ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/metrics-rs/quanta")
+    (synopsis "high-speed timing library")
+    (description "A high-speed timing library.")
+    (license license:expat)))
+
 (define-public rust-quantiles-0.7
   (package
     (name "rust-quantiles")
-- 
2.41.0

[bug#68312] [PATCH 104/156] gnu: Add rust-ratatui-0.24.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-ratatui-0.24): New variable.
(rust-ratatui-0.20): Inherit from rust-ratatui-0.24.

Change-Id: I7cafad4938cf68a404d37206e0abf639d2224fa5
---
 gnu/packages/crates-io.scm | 46 +++++++++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 87018b35fc8..99d42c02211 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57786,8 +57786,45 @@ (define-public rust-randomize-4
     (license
      (list license:zlib license:asl2.0 license:expat))))
 
+(define-public rust-ratatui-0.24
+  (package
+    (name "rust-ratatui")
+    (version "0.24.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ratatui" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "099433has5bhl6zbckpv2qskb66h7xz4rfgc6xn5cyjjzdy93g0f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-cassowary" ,rust-cassowary-0.3)
+                       ("rust-crossterm" ,rust-crossterm-0.27)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-indoc" ,rust-indoc-2)
+                       ("rust-itertools" ,rust-itertools-0.11)
+                       ("rust-lru" ,rust-lru-0.12)
+                       ("rust-paste" ,rust-paste-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-strum" ,rust-strum-0.25)
+                       ("rust-termion" ,rust-termion-2)
+                       ("rust-termwiz" ,rust-termwiz-0.20)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+                       ("rust-unicode-width" ,rust-unicode-width-0.1))))
+    (home-page "https://github.com/ratatui-org/ratatui")
+    (synopsis "Library for cooking up terminal user interfaces")
+    (description
+     "This package provides a library that's all about cooking up terminal user
+interfaces.")
+    (license license:expat)))
+
 (define-public rust-ratatui-0.20
   (package
+    (inherit rust-ratatui-0.24)
     (name "rust-ratatui")
     (version "0.20.1")
     (source
@@ -57797,7 +57834,6 @@ (define-public rust-ratatui-0.20
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0ab8w62dkp2c2l8s1xb904imqlv7aqkc07hm6bp01afbphrd1h6w"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
        '("--release" "--"
@@ -57815,13 +57851,7 @@ (define-public rust-ratatui-0.20
         ("rust-unicode-width" ,rust-unicode-width-0.1))
        #:cargo-development-inputs
        (("rust-argh" ,rust-argh-0.1)
-        ("rust-rand" ,rust-rand-0.8))))
-    (home-page "https://github.com/ratatui-org/ratatui")
-    (synopsis "Library for cooking up terminal user interfaces")
-    (description
-     "This package provides a library that's all about cooking up terminal user
-interfaces.")
-    (license license:expat)))
+        ("rust-rand" ,rust-rand-0.8))))))
 
 (define-public rust-raw-cpuid-10
   (package
-- 
2.41.0

[bug#68312] [PATCH 105/156] gnu: Add rust-rfc6979-0.3.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 99d42c02211..574cc7f528a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59425,6 +59425,33 @@ (define-public rust-rfc6979-0.4
 Digital Signature Algorithm} (ECDSA).")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-rfc6979-0.3
+  (package
+    (name "rust-rfc6979")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rfc6979" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1fzsp705b5lhwd2r9il9grc3lj6rm3b2r89vh0xv181gy5xg2hvp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-crypto-bigint" ,rust-crypto-bigint-0.4)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://github.com/RustCrypto/signatures/tree/master/rfc6979")
+    (synopsis
+     "Pure Rust implementation of RFC6979: Deterministic Usage of the
+Digital Signature Algorithm (DSA) and Elliptic Curve Digital Signature Algorithm (ECDSA)
+")
+    (description
+     "Pure Rust implementation of RFC6979: Deterministic Usage of the Digital
+Signature Algorithm (DSA) and Elliptic Curve Digital Signature Algorithm (ECDSA)")
+    (license (list license:asl2.0 license:expat))))
+
 (define computed-origin-method (@@ (guix packages) computed-origin-method))
 (define rust-ring-0.17-sources
   (let* ((version "0.17.7")
-- 
2.41.0

[bug#68312] [PATCH 106/156] gnu: Add rust-runtime-format-0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-runtime-format-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 574cc7f528a..fbd5b4b43d0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61761,6 +61761,26 @@ (define-public rust-runtime-tokio-0.3
     (description "This package provides a Tokio-based asynchronous runtime.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-runtime-format-0.1
+  (package
+    (name "rust-runtime-format")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "runtime-format" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "154c7jq7kbpc5acn2ysa2ilab2x0i5y7d34jwznni9xw71dqv589"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-tinyvec" ,rust-tinyvec-1))))
+    (home-page "https://github.com/conradludgate/strfmt")
+    (synopsis "rust library for formatting dynamic strings")
+    (description "A rust library for formatting dynamic strings.")
+    (license license:expat)))
+
 (define-public rust-rusqlite-0.29
   (package
     (name "rust-rusqlite")
-- 
2.41.0

[bug#68312] [PATCH 107/156] gnu: Add rust-rust-ini-0.18.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-rust-ini-0.18): New variable.
(rust-rust-ini-0.17): Inherit from rust-rust-ini-0.18.

Change-Id: Ifdb68b5ac87192c7f334577e70152e8ae71af663
---
 gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fbd5b4b43d0..fb618f2b2d9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62265,30 +62265,48 @@ (define-public rust-rust-hawktracer-sys-0.4
      "This package provides a sys crate for the rust_hawktracer library.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-rust-ini-0.17
+(define-public rust-rust-ini-0.18
   (package
     (name "rust-rust-ini")
-    (version "0.17.0")
+    (version "0.18.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rust-ini" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "08hfh6p2svznza3m07vavsc4c8x4g6d715sz58rzh73sm551qiv3"))))
+        (base32 "1px22l3m84v7f46pa3p4bsjykivw8ryq6af8kpkzdd16c11z5mgn"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-ordered-multimap" ,rust-ordered-multimap-0.3)
-        ("rust-unicase" ,rust-unicase-2))))
+       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-ordered-multimap" ,rust-ordered-multimap-0.4)
+                       ("rust-unicase" ,rust-unicase-2))))
     (home-page "https://github.com/zonyitoo/rust-ini")
     (synopsis "INI configuration file parsing library in Rust")
     (description
      "This package is an INI configuration file parsing library in Rust.")
     (license license:expat)))
 
+(define-public rust-rust-ini-0.17
+  (package
+    (inherit rust-rust-ini-0.18)
+    (name "rust-rust-ini")
+    (version "0.17.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rust-ini" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "08hfh6p2svznza3m07vavsc4c8x4g6d715sz58rzh73sm551qiv3"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-ordered-multimap" ,rust-ordered-multimap-0.3)
+        ("rust-unicase" ,rust-unicase-2))))))
+
 (define-public rust-rust-ini-0.13
   (package
     (inherit rust-rust-ini-0.17)
-- 
2.41.0

[bug#68312] [PATCH 108/156] gnu: rust-schemars-0.8: Update to 0.8.16.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-schemars-0.8): Update to 0.8.16.

Change-Id: I6b9c05f86a732eff1f20bc7a93aa4723ae1773fc
---
 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 fb618f2b2d9..7f18104966c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64084,14 +64084,14 @@ (define-public rust-scheduled-thread-pool-0.2
 (define-public rust-schemars-0.8
   (package
     (name "rust-schemars")
-    (version "0.8.8")
+    (version "0.8.16")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "schemars" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32 "1qvhq1yixygd8ihc0qxmnhw4x08fa44q88v088gvc6pa1k4a7df6"))))
+          (base32 "0aadpjkaq7yl11b02pg4mwanylck328zg0q7w56dv6j89568z8j5"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-- 
2.41.0

[bug#68312] [PATCH 109/156] gnu: rust-schemars-derive-0.8: Update to 0.8.16.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-schemars-derive-0.8): Update to 0.8.16.

Change-Id: I067a41b5c557323175e56831d0d98634fb4c03a7
---
 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 7f18104966c..2f1a90dd9af 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64122,14 +64122,14 @@ (define-public rust-schemars-0.8
 (define-public rust-schemars-derive-0.8
   (package
     (name "rust-schemars-derive")
-    (version "0.8.8")
+    (version "0.8.16")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "schemars_derive" version))
         (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "16xfvm16d8nsxdx82fdcyqfi12v61lffyf1wmi34qqg82g74vbj1"))))
+       (sha256
+        (base32 "0rq9sdcf5hyvsyj9v9nfy2jgjbjzaldjq4i6y2fcz72xlrpzsry7"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-- 
2.41.0

[bug#68312] [PATCH 110/156] gnu: Add rust-sec1-0.3.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2f1a90dd9af..85b8e27e4a0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64738,6 +64738,28 @@ (define-public rust-sec1-0.7
 well as the Elliptic-Curve-Point-to-Octet-String encoding.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-sec1-0.3
+  (package
+    (inherit rust-sec1-0.7)
+    (name "rust-sec1")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sec1" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0a09lk5w3nyggpyz54m10nnlg9v8qbh6kw3v1bgla31988c4rqiv"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-base16ct" ,rust-base16ct-0.1)
+                       ("rust-der" ,rust-der-0.6)
+                       ("rust-generic-array" ,rust-generic-array-0.14)
+                       ("rust-pkcs8" ,rust-pkcs8-0.9)
+                       ("rust-serdect" ,rust-serdect-0.1)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-zeroize" ,rust-zeroize-1))))))
+
 (define-public rust-seccomp-sys-0.1
   (package
     (name "rust-seccomp-sys")
-- 
2.41.0

[bug#68312] [PATCH 111/156] gnu: Add rust-rusty-parserk-0.3.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-rusty-parserk-0.3): New variable.

Change-Id: I44e1dcb31c8414d311d67154196f13de606e4e74
---
 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 85b8e27e4a0..6353e8ee06d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63217,6 +63217,48 @@ (define-public rust-rustversion-0.1
 rustc compiler version.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rusty-paserk-0.3
+  (package
+    (name "rust-rusty-paserk")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rusty_paserk" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1v70nbn7f5dwwngnhsqm407y61rdgrjz82nrlih2wycygzh73m2n"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-aes" ,rust-aes-0.8)
+                       ("rust-arbitrary" ,rust-arbitrary-1)
+                       ("rust-argon2" ,rust-argon2-0.5)
+                       ("rust-base64" ,rust-base64-0.13)
+                       ("rust-base64ct" ,rust-base64ct-1)
+                       ("rust-blake2" ,rust-blake2-0.10)
+                       ("rust-chacha20" ,rust-chacha20-0.9)
+                       ("rust-cipher" ,rust-cipher-0.4)
+                       ("rust-ctr" ,rust-ctr-0.9)
+                       ("rust-curve25519-dalek" ,rust-curve25519-dalek-4)
+                       ("rust-digest" ,rust-digest-0.10)
+                       ("rust-ed25519-dalek" ,rust-ed25519-dalek-2)
+                       ("rust-generic-array" ,rust-generic-array-0.14)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-p384" ,rust-p384-0.13)
+                       ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rusty-paseto" ,rust-rusty-paseto-0.6)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-subtle" ,rust-subtle-2))))
+    (home-page "https://github.com/conradludgate/rusty-paserk")
+    (synopsis
+     "Platform Agnostic Serializable Keys (PASERK) is an extension on PASETO for key management")
+    (description
+     "Platform Agnostic Serializable Keys (PASERK) is an extension on PASETO for key
+management")
+    (license license:expat)))
 (define-public rust-rusty-fork-0.3
   (package
     (name "rust-rusty-fork")
-- 
2.41.0

[bug#68312] [PATCH 112/156] gnu: Add rust-rusty-paseto-0.6.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-rusty-paseto-0.6): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6353e8ee06d..f1a407e943d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63259,6 +63259,47 @@ (define-public rust-rusty-paserk-0.3
      "Platform Agnostic Serializable Keys (PASERK) is an extension on PASETO for key
 management")
     (license license:expat)))
+
+(define-public rust-rusty-paseto-0.6
+  (package
+    (name "rust-rusty-paseto")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rusty_paseto" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "05myhzsw0pf2fs8a513a1pngpmxvfabwd7v2q0vcr8cvz7n6xpvc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-aes" ,rust-aes-0.7)
+                       ("rust-base64" ,rust-base64-0.13)
+                       ("rust-blake2" ,rust-blake2-0.9)
+                       ("rust-chacha20" ,rust-chacha20-0.8)
+                       ("rust-chacha20poly1305" ,rust-chacha20poly1305-0.9)
+                       ("rust-ed25519-dalek" ,rust-ed25519-dalek-2)
+                       ("rust-erased-serde" ,rust-erased-serde-0.3)
+                       ("rust-hex" ,rust-hex-0.4)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-iso8601" ,rust-iso8601-0.4)
+                       ("rust-p384" ,rust-p384-0.11)
+                       ("rust-ring" ,rust-ring-0.16)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://github.com/rrrodzilla/rusty_paseto")
+    (synopsis
+     "A type-driven, ergonomic alternative to JWT for secure stateless PASETO tokens.")
+    (description
+     "This package provides a type-driven, ergonomic alternative to JWT for secure
+stateless PASETO tokens.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rusty-fork-0.3
   (package
     (name "rust-rusty-fork")
-- 
2.41.0

[bug#68312] [PATCH 113/156] gnu: Add rust-serde-derive-internals-0.26.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-serde-derive-internals-0.26): New variable.
(rust-serde-derive-internals-0.25): Inherit from rust-serde-derive-internals-0.26.

Change-Id: Ib209987713385d1aa2e212479582203b9805b225
---
 gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f1a407e943d..a1778aa8e56 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65823,8 +65823,32 @@ (define-public rust-serde-derive-0.9
         ("rust-serde-codegen-internals" ,rust-serde-codegen-internals-0.14)
         ("rust-syn" ,rust-syn-0.11))))))
 
+(define-public rust-serde-derive-internals-0.26
+  (package
+    (name "rust-serde-derive-internals")
+    (version "0.26.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serde_derive_internals" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0g2zdr6s8i0r29yy7pdl6ahimq8w6ck70hvrciiry2ljwwlq5gw5"))))
+    (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://serde.rs")
+    (synopsis "AST representation used by Serde derive macros")
+    (description "This package provides AST representation used by Serde
+derive macros.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-serde-derive-internals-0.25
   (package
+    (inherit rust-serde-derive-internals-0.26)
     (name "rust-serde-derive-internals")
     (version "0.25.0")
     (source
@@ -65834,18 +65858,12 @@ (define-public rust-serde-derive-internals-0.25
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
           (base32 "1ihqfkpplqqiwmh87s8p9jsv27ibkz1z7gc0abqs2mrhlr6b7fhx"))))
-    (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://serde.rs")
-    (synopsis "AST representation used by Serde derive macros")
-    (description "This package provides AST representation used by Serde
-derive macros.")
-    (license (list license:expat license:asl2.0))))
+         ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-serde-ignored-0.1
   (package
-- 
2.41.0

[bug#68312] [PATCH 114/156] gnu: Update rust-serde-json-1 to 1.0.111.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-serde-json-1): Update to 1.0.111.

Change-Id: I8e3bcf8540e47289ea4ddc0be9349a1eae5e6b71
---
 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 a1778aa8e56..edace68dd59 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65893,14 +65893,14 @@ (define-public rust-serde-ignored-0.1
 (define-public rust-serde-json-1
   (package
     (name "rust-serde-json")
-    (version "1.0.110")
+    (version "1.0.111")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde_json" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0mrjhgqrzl0gc4lnqp4d2lcs5vrfbhv0r3k1pg49knms6199ggbg"))))
+        (base32 "1x441azvvdy6x8am4bvkxhswhzw5cr8ml0cqspnihvri8bx4cvhp"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; could not find `RandomState` in `hash`
-- 
2.41.0

[bug#68312] [PATCH 115/156] gnu: Add rust-serdect-0.1.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index edace68dd59..d61deba7117 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66601,6 +66601,33 @@ (define-public rust-serdect-0.2
 for data that potentially contains secrets (e.g. cryptographic keys).")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-serdect-0.1
+  (package
+    (name "rust-serdect")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serdect" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b6krqs77vzwzdjcrcywlmlwd3msfpgmkkbxx8q9njypyhdwx3q3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-base16ct" ,rust-base16ct-0.1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/serdect")
+    (synopsis
+     "Constant-time serde serializer/deserializer helpers for data that potentially
+contains secrets (e.g. cryptographic keys)
+")
+    (description
+     "Constant-time serde serializer/deserializer helpers for data that potentially
+contains secrets (e.g. cryptographic keys)")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-serial-test-2
   (package
     (name "rust-serial-test")
-- 
2.41.0

[bug#68312] [PATCH 116/156] gnu: rust-signature-1: Update to 1.6.4.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-signature-1): Update to 1.6.4.

Change-Id: I598b57544ae9ecc45c226c3bc37598845cdb9223
---
 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 d61deba7117..fabb8ab2ab6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67866,14 +67866,14 @@ (define-public rust-signature-1
   (package
     (inherit rust-signature-2)
     (name "rust-signature")
-    (version "1.5.0")
+    (version "1.6.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "signature" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1r4x94n6ibdd1f85cwmvi29jvyyf1l379n9yybb7jlg9lv0wcm7h"))))
+        (base32 "0z3xg405pg827g6hfdprnszsdqkkbrsfx7f1dl04nv9g7cxks8vl"))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-- 
2.41.0

[bug#68312] [PATCH 117/156] gnu: rust-signature-derive-1: Update to 1.0.0-pre.7.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-signature-derive-1): Update to 1.0.0-pre.7.

Change-Id: I254fd493e0b75d979a08773dbd7395241f4b4429
---
 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 fabb8ab2ab6..77fdee66b4c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67912,14 +67912,14 @@ (define-public rust-signature-derive-1
   (package
     (inherit rust-signature-derive-2)
     (name "rust-signature-derive")
-    (version "1.0.0-pre.4")
+    (version "1.0.0-pre.7")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "signature_derive" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0p1x0wv6grrgdn226m9rsqpcnpfwkpji7rjpalkbk1ynv0xpvf57"))))
+        (base32 "03wj342zvljknqwg3qbc9acrcsrzhdp1d2d6pfrh4p1b087k3rln"))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-- 
2.41.0

[bug#68312] [PATCH 118/156] gnu: Add rust-sketches-ddsketch-0.2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-sketches-ddsketch-0.2): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 77fdee66b4c..ad44443f7d1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68516,6 +68516,28 @@ (define-public rust-sized-chunks-0.6
 designed for @code{immutable.rs}.")
     (license license:mpl2.0)))
 
+(define-public rust-sketches-ddsketch-0.2
+  (package
+    (name "rust-sketches-ddsketch")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sketches-ddsketch" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1q873ja2yvvls9327a7yw1mcprw0ia2cjj72snfg5mrfi30hd938"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/mheffner/rust-sketches-ddsketch")
+    (synopsis "A direct port of the Golang DDSketch implementation.
+")
+    (description
+     "This package provides a direct port of the Golang DDSketch implementation.")
+    (license license:asl2.0)))
+
 (define-public rust-skeptic-0.13
   (package
     (name "rust-skeptic")
-- 
2.41.0

[bug#68312] [PATCH 119/156] gnu: Add rust-sqlformat-0.2.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ad44443f7d1..849b031669c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70419,6 +70419,29 @@ (define-public rust-sptr-0.3
     (description "This package provides sptr, The Strict Provenance Polyfill.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-sqlformat-0.2
+  (package
+    (name "rust-sqlformat")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sqlformat" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0v0p70wjdshj18zgjjac9xlx8hmpx33xhq7g8x9rg4s4gjyvg0ff"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-itertools" ,rust-itertools-0.12)
+                       ("rust-nom" ,rust-nom-7)
+                       ("rust-unicode-categories" ,rust-unicode-categories-0.1))))
+    (home-page "https://github.com/shssoichiro/sqlformat-rs")
+    (synopsis "Formats whitespace in a SQL string to make it easier to read")
+    (description
+     "Formats whitespace in a SQL string to make it easier to read")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-sqlite-0.30
   (package
     (name "rust-sqlite")
-- 
2.41.0

[bug#68312] [PATCH 120/156] gnu: Add rust-sqlx-core-0.7.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-sqlx-core-0.7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 849b031669c..877f5c08e6e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70442,6 +70442,78 @@ (define-public rust-sqlformat-0.2
      "Formats whitespace in a SQL string to make it easier to read")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-sqlx-core-0.7
+  (package
+    (name "rust-sqlx-core")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sqlx-core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gdz44yb9qwxv4xl4hv6w4vbqx0zzdlzsf9j9gcj1qir6wy0ljyq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-ahash" ,rust-ahash-0.8)
+                       ("rust-async-io" ,rust-async-io-1)
+                       ("rust-async-std" ,rust-async-std-1)
+                       ("rust-atoi" ,rust-atoi-2)
+                       ("rust-bigdecimal" ,rust-bigdecimal-0.3)
+                       ("rust-bit-vec" ,rust-bit-vec-0.6)
+                       ("rust-bstr" ,rust-bstr-1)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-crc" ,rust-crc-3)
+                       ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.3)
+                       ("rust-digest" ,rust-digest-0.10)
+                       ("rust-dotenvy" ,rust-dotenvy-0.15)
+                       ("rust-either" ,rust-either-1)
+                       ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+                       ("rust-event-listener" ,rust-event-listener-2)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-intrusive" ,rust-futures-intrusive-0.5)
+                       ("rust-futures-io" ,rust-futures-io-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-hashlink" ,rust-hashlink-0.8)
+                       ("rust-hex" ,rust-hex-0.4)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-ipnetwork" ,rust-ipnetwork-0.20)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-mac-address" ,rust-mac-address-1)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-native-tls" ,rust-native-tls-0.2)
+                       ("rust-num-bigint" ,rust-num-bigint-0.4)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-paste" ,rust-paste-1)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-rust-decimal" ,rust-rust-decimal-1)
+                       ("rust-rustls" ,rust-rustls-0.21)
+                       ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sha1" ,rust-sha1-0.10)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-sqlformat" ,rust-sqlformat-0.2)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-uuid" ,rust-uuid-1)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.25))))
+    (home-page "https://github.com/launchbadge/sqlx")
+    (synopsis
+     "Core of SQLx, the rust SQL toolkit. Not intended to be used directly.")
+    (description
+     "Core of SQLx, the rust SQL toolkit.  Not intended to be used directly.")
+    (license (list license:expat license:asl2.0))))
 (define-public rust-sqlite-0.30
   (package
     (name "rust-sqlite")
-- 
2.41.0

[bug#68312] [PATCH 121/156] gnu: Add rust-sqlx-0.7.

[Wilko Meyer]

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

Change-Id: I86ed3f2c21ab4f2cc0decc35b60d10155d1b2887
---
 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 877f5c08e6e..a10781f38d7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70514,6 +70514,34 @@ (define-public rust-sqlx-core-0.7
     (description
      "Core of SQLx, the rust SQL toolkit.  Not intended to be used directly.")
     (license (list license:expat license:asl2.0))))
+
+(define-public rust-sqlx-0.7
+  (package
+    (name "rust-sqlx")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sqlx" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kv3hyx7izmmsjqh3l47zrfhjlcblpg20cvnk7pr8dm7klkkr86v"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-sqlx-core" ,rust-sqlx-core-0.7)
+                       ("rust-sqlx-macros" ,rust-sqlx-macros-0.7)
+                       ("rust-sqlx-mysql" ,rust-sqlx-mysql-0.7)
+                       ("rust-sqlx-postgres" ,rust-sqlx-postgres-0.7)
+                       ("rust-sqlx-sqlite" ,rust-sqlx-sqlite-0.7))))
+    (home-page "https://github.com/launchbadge/sqlx")
+    (synopsis
+     "🧰 The Rust SQL Toolkit. An async, pure Rust SQL crate featuring compile-time checked queries without a DSL. Supports PostgreSQL, MySQL, and SQLite.")
+    (description
+     "🧰 The Rust SQL Toolkit.  An async, pure Rust SQL crate featuring compile-time
+checked queries without a DSL. Supports @code{PostgreSQL}, @code{MySQL}, and
+SQLite.")
+    (license (list license:expat license:asl2.0))))
 (define-public rust-sqlite-0.30
   (package
     (name "rust-sqlite")
-- 
2.41.0

[bug#68312] [PATCH 122/156] gnu: Add rust-sqlx-macros-core-0.7.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-sqlx-macros-core-0.7): New variable.

Change-Id: Iacb7473e43339db73e0c09c36d977600728c4210
---
 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 a10781f38d7..e323ca7515e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70542,6 +70542,48 @@ (define-public rust-sqlx-0.7
 checked queries without a DSL. Supports @code{PostgreSQL}, @code{MySQL}, and
 SQLite.")
     (license (list license:expat license:asl2.0))))
+
+(define-public rust-sqlx-macros-core-0.7
+  (package
+    (name "rust-sqlx-macros-core")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sqlx-macros-core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0h88wahkxa6nam536lhwr1y0yxlr6la8b1x0hs0n88v790clbgfh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-async-std" ,rust-async-std-1)
+                       ("rust-atomic-write-file" ,rust-atomic-write-file-0.1)
+                       ("rust-dotenvy" ,rust-dotenvy-0.15)
+                       ("rust-either" ,rust-either-1)
+                       ("rust-heck" ,rust-heck-0.4)
+                       ("rust-hex" ,rust-hex-0.4)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-sqlx-core" ,rust-sqlx-core-0.7)
+                       ("rust-sqlx-mysql" ,rust-sqlx-mysql-0.7)
+                       ("rust-sqlx-postgres" ,rust-sqlx-postgres-0.7)
+                       ("rust-sqlx-sqlite" ,rust-sqlx-sqlite-0.7)
+                       ("rust-syn" ,rust-syn-1)
+                       ("rust-tempfile" ,rust-tempfile-3)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-url" ,rust-url-2))))
+    (home-page "https://github.com/launchbadge/sqlx")
+    (synopsis
+     "Macro support core for SQLx, the Rust SQL toolkit. Not intended to be used directly.")
+    (description
+     "Macro support core for SQLx, the Rust SQL toolkit.  Not intended to be used
+directly.")
+    (license (list license:expat license:asl2.0))))
 (define-public rust-sqlite-0.30
   (package
     (name "rust-sqlite")
-- 
2.41.0

[bug#68312] [PATCH 123/156] gnu: Add rust-sqlx-macros-0.7.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-sqlx-macros-0.7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e323ca7515e..9f8c6067f58 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70584,6 +70584,32 @@ (define-public rust-sqlx-macros-core-0.7
      "Macro support core for SQLx, the Rust SQL toolkit.  Not intended to be used
 directly.")
     (license (list license:expat license:asl2.0))))
+
+(define-public rust-sqlx-macros-0.7
+  (package
+    (name "rust-sqlx-macros")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sqlx-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19gjwisiym07q7ibkp9nkvvbywjh0r5rc572msvzyzadvh01r5l9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-sqlx-core" ,rust-sqlx-core-0.7)
+                       ("rust-sqlx-macros-core" ,rust-sqlx-macros-core-0.7)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/launchbadge/sqlx")
+    (synopsis
+     "Macros for SQLx, the rust SQL toolkit. Not intended to be used directly.")
+    (description
+     "Macros for SQLx, the rust SQL toolkit.  Not intended to be used directly.")
+    (license (list license:expat license:asl2.0))))
 (define-public rust-sqlite-0.30
   (package
     (name "rust-sqlite")
-- 
2.41.0

[bug#68312] [PATCH 124/156] gnu: Add rust-sqlx-postgres-0.7.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-sqlx-postgres-0.7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9f8c6067f58..83fbeed6c0f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70610,6 +70610,68 @@ (define-public rust-sqlx-macros-0.7
     (description
      "Macros for SQLx, the rust SQL toolkit.  Not intended to be used directly.")
     (license (list license:expat license:asl2.0))))
+
+(define-public rust-sqlx-postgres-0.7
+  (package
+    (name "rust-sqlx-postgres")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sqlx-postgres" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "090wm9s6mm53ggn1xwr183cnn8yxly8rgcksdk4hrlfcnz1hmb6n"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-atoi" ,rust-atoi-2)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-bigdecimal" ,rust-bigdecimal-0.3)
+                       ("rust-bit-vec" ,rust-bit-vec-0.6)
+                       ("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-crc" ,rust-crc-3)
+                       ("rust-dotenvy" ,rust-dotenvy-0.15)
+                       ("rust-etcetera" ,rust-etcetera-0.8)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-io" ,rust-futures-io-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-hex" ,rust-hex-0.4)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-home" ,rust-home-0.5)
+                       ("rust-ipnetwork" ,rust-ipnetwork-0.20)
+                       ("rust-itoa" ,rust-itoa-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-mac-address" ,rust-mac-address-1)
+                       ("rust-md-5" ,rust-md-5-0.10)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-num-bigint" ,rust-num-bigint-0.4)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rust-decimal" ,rust-rust-decimal-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sha1" ,rust-sha1-0.10)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-sqlx-core" ,rust-sqlx-core-0.7)
+                       ("rust-stringprep" ,rust-stringprep-0.1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-uuid" ,rust-uuid-1)
+                       ("rust-whoami" ,rust-whoami-1))))
+    (home-page "https://github.com/launchbadge/sqlx")
+    (synopsis
+     "PostgreSQL driver implementation for SQLx. Not for direct use; see the `sqlx` crate for details.")
+    (description
+     "@code{PostgreSQL} driver implementation for SQLx.  Not for direct use; see the
+`sqlx` crate for details.")
+    (license (list license:expat license:asl2.0))))
 (define-public rust-sqlite-0.30
   (package
     (name "rust-sqlite")
-- 
2.41.0

[bug#68312] [PATCH 125/156] gnu: Add rust-sqlx-mysql-0.7.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-sqlx-mysql-0.7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 83fbeed6c0f..c98880665f3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70672,6 +70672,67 @@ (define-public rust-sqlx-postgres-0.7
      "@code{PostgreSQL} driver implementation for SQLx.  Not for direct use; see the
 `sqlx` crate for details.")
     (license (list license:expat license:asl2.0))))
+
+(define-public rust-sqlx-mysql-0.7
+  (package
+    (name "rust-sqlx-mysql")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sqlx-mysql" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "190ygz5a3pqcd9vvqjv2i4r1xh8vi53j4272yrld07zpblwrawg3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-atoi" ,rust-atoi-2)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-bigdecimal" ,rust-bigdecimal-0.3)
+                       ("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-crc" ,rust-crc-3)
+                       ("rust-digest" ,rust-digest-0.10)
+                       ("rust-dotenvy" ,rust-dotenvy-0.15)
+                       ("rust-either" ,rust-either-1)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-io" ,rust-futures-io-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-generic-array" ,rust-generic-array-0.14)
+                       ("rust-hex" ,rust-hex-0.4)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-itoa" ,rust-itoa-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-md-5" ,rust-md-5-0.10)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rsa" ,rust-rsa-0.9)
+                       ("rust-rust-decimal" ,rust-rust-decimal-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sha1" ,rust-sha1-0.10)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-sqlx-core" ,rust-sqlx-core-0.7)
+                       ("rust-stringprep" ,rust-stringprep-0.1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-uuid" ,rust-uuid-1)
+                       ("rust-whoami" ,rust-whoami-1))))
+    (home-page "https://github.com/launchbadge/sqlx")
+    (synopsis
+     "MySQL driver implementation for SQLx. Not for direct use; see the `sqlx` crate for details.")
+    (description
+     "@code{MySQL} driver implementation for SQLx.  Not for direct use; see the `sqlx`
+crate for details.")
+    (license (list license:expat license:asl2.0))))
 (define-public rust-sqlite-0.30
   (package
     (name "rust-sqlite")
-- 
2.41.0

[bug#68312] [PATCH 126/156] gnu: Add rust-sqlx-sqlite-0.7.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-sqlx-sqlite-0.7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c98880665f3..c5e02476d6b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70733,6 +70733,47 @@ (define-public rust-sqlx-mysql-0.7
      "@code{MySQL} driver implementation for SQLx.  Not for direct use; see the `sqlx`
 crate for details.")
     (license (list license:expat license:asl2.0))))
+
+(define-public rust-sqlx-sqlite-0.7
+  (package
+    (name "rust-sqlx-sqlite")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sqlx-sqlite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "143laha7wf8dmi0xwycwqmvxdcnb25dq7jnqrsgvmis8v6vpc291"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-atoi" ,rust-atoi-2)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-flume" ,rust-flume-0.11)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-executor" ,rust-futures-executor-0.3)
+                       ("rust-futures-intrusive" ,rust-futures-intrusive-0.5)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.27)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sqlx-core" ,rust-sqlx-core-0.7)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-urlencoding" ,rust-urlencoding-2)
+                       ("rust-uuid" ,rust-uuid-1))))
+    (home-page "https://github.com/launchbadge/sqlx")
+    (synopsis
+     "SQLite driver implementation for SQLx. Not for direct use; see the `sqlx` crate for details.")
+    (description
+     "SQLite driver implementation for SQLx.  Not for direct use; see the `sqlx` crate
+for details.")
+    (license (list license:expat license:asl2.0))))
 (define-public rust-sqlite-0.30
   (package
     (name "rust-sqlite")
-- 
2.41.0

[bug#68312] [PATCH 127/156] gnu: Add rust-sql-builder-3.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-sql-builder-3): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c5e02476d6b..0303119df86 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70774,6 +70774,28 @@ (define-public rust-sqlx-sqlite-0.7
      "SQLite driver implementation for SQLx.  Not for direct use; see the `sqlx` crate
 for details.")
     (license (list license:expat license:asl2.0))))
+
+(define-public rust-sql-builder-3
+  (package
+    (name "rust-sql-builder")
+    (version "3.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sql-builder" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1h5xp47zz9chv545lpmal51fq3z162z2f99mb4lhcbgcsaaqs05i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/perdumonocle/sql-builder.git")
+    (synopsis "Simple SQL code generator.")
+    (description "Simple SQL code generator.")
+    (license license:expat)))
+
 (define-public rust-sqlite-0.30
   (package
     (name "rust-sqlite")
-- 
2.41.0

[bug#68312] [PATCH 128/156] gnu: Add rust-stable-pattern-0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-stable-pattern-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0303119df86..b85f1bd4f12 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71009,6 +71009,26 @@ (define-public rust-st-map-0.1
     (description "This package provides a runtime for a stack-alocated map.")
     (license license:expat)))
 
+(define-public rust-stable-pattern-0.1
+  (package
+    (name "rust-stable-pattern")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "stable-pattern" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0i8hq82vm82mqj02qqcsd7caibrih7x5w3a1xpm8hpv30261cr25"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-memchr" ,rust-memchr-2))))
+    (home-page "https://github.com/SergioBenitez/stable-pattern")
+    (synopsis "Stable port of std::str::Pattern and friends.")
+    (description "Stable port of std::str::Pattern and friends.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-stable-deref-trait-1
   (package
     (name "rust-stable-deref-trait")
-- 
2.41.0

[bug#68312] [PATCH 129/156] gnu: Add rust-state-0.6.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-state-0.6): New variable.
(rust-state-0.5): Inherit from rust-state-0.6.

Change-Id: I60b70871e098e3e2a75592099c9bc86070a0f4bb
---
 gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b85f1bd4f12..1945399bd79 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71102,8 +71102,31 @@ (define-public rust-standback-0.2
     (description "New standard library, old compiler.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-state-0.6
+  (package
+    (name "rust-state")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "state" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1n3n2h324h1y5zhaajh6kplvzfvg1l6hsr8siggmf4yq8m24m31b"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-loom" ,rust-loom-0.5))))
+    (home-page "https://github.com/SergioBenitez/state")
+    (synopsis "Library for safe global and thread-local state management")
+    (description
+     "This package provides a library for safe global and thread-local state
+management.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-state-0.5
   (package
+    (inherit rust-state-0.6)
     (name "rust-state")
     (version "0.5.3")
     (source (origin
@@ -71113,18 +71136,11 @@ (define-public rust-state-0.5
               (sha256
                (base32
                 "0fzji31ijbkimbzdy4dln9mp5xp7lm1a0dnqxv4n10hywphnds6v"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-loom" ,rust-loom-0.5))
        #:cargo-development-inputs
-       (("rust-static-assertions" ,rust-static-assertions-1))))
-    (home-page "https://github.com/SergioBenitez/state")
-    (synopsis "Library for safe global and thread-local state management")
-    (description
-     "This package provides a library for safe global and thread-local state
-management.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-static-assertions" ,rust-static-assertions-1))))))
 
 (define-public rust-state-0.4
   (package
-- 
2.41.0

[bug#68312] [PATCH 130/156] gnu: rust-subtle-2: Update to 2.5.0.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1945399bd79..d897a33fcc1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -72782,7 +72782,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)
@@ -72790,8 +72790,7 @@ (define-public rust-subtle-2
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "00b6jzh9gzb0h9n25g06nqr90z3xzqppfhhb260s1hjhh4pg7pkb"))))
+        (base32 "1g2yjs7gffgmdvkkq0wrrh0pxds3q0dv6dhkw9cdpbib656xdkc1"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs (("rust-rand" ,rust-rand-0.7))))
-- 
2.41.0

[bug#68312] [PATCH 131/156] gnu: rust-syn-2: Update to 2.0.48.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-syn-2): Update to 2.0.48.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d897a33fcc1..6ca2686b467 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -73723,14 +73723,13 @@ (define-public rust-symphonia-utils-xiph-0.4
 (define-public rust-syn-2
   (package
     (name "rust-syn")
-    (version "2.0.46")
+    (version "2.0.48")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "syn" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32
-                "03mzxgijkz77z8ysjn1kr6099i8mwvdsw713rz7dsbzp1xlnnic9"))))
+                (base32 "0gqgfygmrxmp8q32lia9p294kdd501ybn6kn2h4gqza0irik2d8g"))))
     (build-system cargo-build-system)
     (arguments
      ;; Tests fail to compile
-- 
2.41.0

[bug#68312] [PATCH 132/156] gnu: Add rust-syn-derive-0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-syn-derive-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6ca2686b467..755a53b320d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -73971,6 +73971,29 @@ (define-public rust-synchronoise-1
 standard library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-syn-derive-0.1
+  (package
+    (name "rust-syn-derive")
+    (version "0.1.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "syn_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0yxydi22apcisjg0hff6dfm5x8hd6cqicav56sblx67z0af1ha8k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-proc-macro-error" ,rust-proc-macro-error-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Kyuuhachi/syn_derive")
+    (synopsis "Derive macros for `syn::Parse` and `quote::ToTokens`")
+    (description "Derive macros for `syn::Parse` and `quote::@code{ToTokens`}")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-synom-0.11
   (package
     (name "rust-synom")
-- 
2.41.0

[bug#68312] [PATCH 133/156] gnu: Add rust-sync-wrapper-0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-sync-wrapper-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 755a53b320d..beea3d63378 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -73994,6 +73994,29 @@ (define-public rust-syn-derive-0.1
     (description "Derive macros for `syn::Parse` and `quote::@code{ToTokens`}")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-sync-wrapper-0.1
+  (package
+    (name "rust-sync-wrapper")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sync_wrapper" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0q01lyj0gr9a93n10nxsn8lwbzq97jqd6b768x17c8f7v7gccir0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3))))
+    (home-page "https://docs.rs/sync_wrapper")
+    (synopsis
+     "A tool for enlisting the compiler’s help in proving the absence of concurrency")
+    (description
+     "This package provides a tool for enlisting the compiler’s help in proving the
+absence of concurrency")
+    (license license:asl2.0)))
+
 (define-public rust-synom-0.11
   (package
     (name "rust-synom")
-- 
2.41.0

[bug#68312] [PATCH 134/156] gnu: Add rust-termwiz-0.20.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index beea3d63378..6fe65224203 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -76118,6 +76118,62 @@ (define-public rust-termtree-0.4
     (description "Visualize tree-like data on the command-line.")
     (license license:expat)))
 
+(define-public rust-termwiz-0.20
+  (package
+    (name "rust-termwiz")
+    (version "0.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "termwiz" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yj80sli95wcw0im2iic9h7mx20hms3f9shxk7jarjqgl5waj2cm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-cassowary" ,rust-cassowary-0.3)
+                       ("rust-filedescriptor" ,rust-filedescriptor-0.8)
+                       ("rust-finl-unicode" ,rust-finl-unicode-1)
+                       ("rust-fixedbitset" ,rust-fixedbitset-0.4)
+                       ("rust-fnv" ,rust-fnv-1)
+                       ("rust-hex" ,rust-hex-0.4)
+                       ("rust-image" ,rust-image-0.24)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memmem" ,rust-memmem-0.1)
+                       ("rust-nix" ,rust-nix-0.24)
+                       ("rust-num-derive" ,rust-num-derive-0.3)
+                       ("rust-num-traits" ,rust-num-traits-0.2)
+                       ("rust-ordered-float" ,rust-ordered-float-3)
+                       ("rust-pest" ,rust-pest-2)
+                       ("rust-pest-derive" ,rust-pest-derive-2)
+                       ("rust-phf" ,rust-phf-0.10)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-semver" ,rust-semver-0.11)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sha2" ,rust-sha2-0.9)
+                       ("rust-signal-hook" ,rust-signal-hook-0.1)
+                       ("rust-siphasher" ,rust-siphasher-0.3)
+                       ("rust-terminfo" ,rust-terminfo-0.7)
+                       ("rust-termios" ,rust-termios-0.3)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-ucd-trie" ,rust-ucd-trie-0.1)
+                       ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+                       ("rust-vtparse" ,rust-vtparse-0.6)
+                       ("rust-wezterm-bidi" ,rust-wezterm-bidi-0.2)
+                       ("rust-wezterm-color-types" ,rust-wezterm-color-types-0.2)
+                       ("rust-wezterm-dynamic" ,rust-wezterm-dynamic-0.1)
+                       ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/wez/wezterm")
+    (synopsis "Terminal Wizardry for Unix and Windows")
+    (description "Terminal Wizardry for Unix and Windows")
+    (license license:expat)))
+
 (define-public rust-test-assembler-0.1
   (package
     (name "rust-test-assembler")
-- 
2.41.0

[bug#68312] [PATCH 135/156] gnu: Add rust-tiny-bip39-1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-tiny-bip39-1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6fe65224203..af2868fa4ea 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77446,6 +77446,39 @@ (define-public rust-tint-1
 manipulation in Rust.")
     (license license:expat)))
 
+(define-public rust-tiny-bip39-1
+  (package
+    (name "rust-tiny-bip39")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tiny-bip39" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0q98iv3wgbd41wyxxd5is8sddi53k9ary45rbi5fi8dmb39r9k32"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-pbkdf2" ,rust-pbkdf2-0.11)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rustc-hash" ,rust-rustc-hash-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)
+                       ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+                       ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://github.com/maciejhirsz/tiny-bip39/")
+    (synopsis
+     "A fork of the bip39 crate with fixes to v0.6. Rust implementation of BIP-0039")
+    (description
+     "This package provides a fork of the bip39 crate with fixes to v0.6.  Rust
+implementation of BIP-0039")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-tiny-http-0.12
   (package
     (name "rust-tiny-http")
-- 
2.41.0

[bug#68312] [PATCH 136/156] gnu: Add tokio-tunkstenite-0.20.

[Wilko Meyer]

* gnu/packages/crates-io.scm (tokio-tunkstenite-0.20): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index af2868fa4ea..d8cfa22fe91 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79400,6 +79400,38 @@ (define-public rust-tokio-trace-core-0.2
     (description "Core primitives for tokio-trace.")
     (license license:expat)))
 
+(define-public rust-tokio-tungstenite-0.20
+  (package
+    (name "rust-tokio-tungstenite")
+    (version "0.20.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-tungstenite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0v1v24l27hxi5hlchs7hfd5rgzi167x0ygbw220nvq0w5b5msb91"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #: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.21)
+                       ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)
+                       ("rust-tokio-rustls" ,rust-tokio-rustls-0.24)
+                       ("rust-tungstenite" ,rust-tungstenite-0.20)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.25))))
+    (home-page "https://github.com/snapview/tokio-tungstenite")
+    (synopsis
+     "Tokio binding for Tungstenite, the Lightweight stream-based WebSocket implementation")
+    (description
+     "Tokio binding for Tungstenite, the Lightweight stream-based @code{WebSocket}
+implementation")
+    (license license:expat)))
+
 (define-public rust-tokio-tungstenite-0.19
   (package
     (name "rust-tokio-tungstenite")
-- 
2.41.0

[bug#68312] [PATCH 137/156] gnu: Add rust-tower-http-0.4.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-tower-http-0.4): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d8cfa22fe91..4884a0e07be 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80542,6 +80542,47 @@ (define-public rust-tower-util-0.3
 @code{Service}.")
     (license license:expat)))
 
+(define-public rust-tower-http-0.4
+  (package
+    (name "rust-tower-http")
+    (version "0.4.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tower-http" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0h0i2flrw25zwxv72sifq4v5mwcb030spksy7r2a4xl2d4fvpib1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-async-compression" ,rust-async-compression-0.4)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-http-body" ,rust-http-body-0.4)
+                       ("rust-http-range-header" ,rust-http-range-header-0.3)
+                       ("rust-httpdate" ,rust-httpdate-1)
+                       ("rust-iri-string" ,rust-iri-string-0.7)
+                       ("rust-mime" ,rust-mime-0.3)
+                       ("rust-mime-guess" ,rust-mime-guess-2)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-util" ,rust-tokio-util-0.7)
+                       ("rust-tower" ,rust-tower-0.4)
+                       ("rust-tower-layer" ,rust-tower-layer-0.3)
+                       ("rust-tower-service" ,rust-tower-service-0.3)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-uuid" ,rust-uuid-1))))
+    (home-page "https://github.com/tower-rs/tower-http")
+    (synopsis "Tower middleware and utilities for HTTP clients and servers")
+    (description "Tower middleware and utilities for HTTP clients and servers")
+    (license license:expat)))
+
 (define-public rust-tracing-0.1
   (package
     (name "rust-tracing")
-- 
2.41.0

[bug#68312] [PATCH 138/156] gnu: Add rust-tracing-log-0.2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-tracing-log-0.2): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4884a0e07be..f9052ddd49c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80769,6 +80769,28 @@ (define-public rust-tracing-log-0.1
 @end itemize")
     (license license:expat)))
 
+
+(define-public rust-tracing-log-0.2
+  (package
+    (inherit rust-tracing-log-0.1)
+    (name "rust-tracing-log")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tracing-log" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hs77z026k730ij1a9dhahzrl0s073gfa2hm5p0fbl0b80gmz1gf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-ahash" ,rust-ahash-0.7)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-lru" ,rust-lru-0.7)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-tracing-core" ,rust-tracing-core-0.1))))))
+
 (define-public rust-tracing-serde-0.1
   (package
     (name "rust-tracing-serde")
-- 
2.41.0

[bug#68312] [PATCH 139/156] gnu: Add rust-tracing-tree-0.3.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-tracing-tree-0.3): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f9052ddd49c..c73e3042202 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80948,6 +80948,27 @@ (define-public rust-tracing-tree-0.2
 events.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-tracing-tree-0.3
+  (package
+    (inherit rust-tracing-tree-0.2)
+    (name "rust-tracing-tree")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tracing-tree" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xb6csq7hpjjr9x7qx1h6r3ra7p2mxvirh4vp71q8r1z5k6rw4v5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-nu-ansi-term" ,rust-nu-ansi-term-0.49)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tracing-core" ,rust-tracing-core-0.1)
+                       ("rust-tracing-log" ,rust-tracing-log-0.2)
+                       ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))))
+
 (define-public rust-trackable-1
   (package
     (name "rust-trackable")
-- 
2.41.0

[bug#68312] [PATCH 140/156] gnu: Add rust-tree-magic-db-3.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-tree-magic-db-3): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c73e3042202..62f8548d013 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -81073,6 +81073,28 @@ (define-public rust-trash-2
 recycle bin.")
     (license license:expat)))
 
+(define-public rust-tree-magic-db-3
+  (package
+    (name "rust-tree-magic-db")
+    (version "3.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tree_magic_db" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "00kzsn98cv0r7yzwi2dcm0fzpbxmc7pxijhb5dgb3cr7ai5c4gz7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "")
+    (synopsis
+     "Packages the FreeDesktop.org shared MIME database for optional use with tree_magic_mini")
+    (description
+     "Packages the @code{FreeDesktop.org} shared MIME database for optional use with
+tree_magic_mini")
+    (license license:gpl2+)))
+
 (define-public rust-tree-magic-0.2
   (package
     (name "rust-tree-magic")
-- 
2.41.0

[bug#68312] [PATCH 141/156] gnu: Add rust-tree-magic-mini-3.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-tree-magic-mini-3): New variable.

Change-Id: I05a85072376a90b53c7b97c8ceeba78e2ea7cee5
---
 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 62f8548d013..cee7f4877f8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -81095,6 +81095,34 @@ (define-public rust-tree-magic-db-3
 tree_magic_mini")
     (license license:gpl2+)))
 
+(define-public rust-tree-magic-mini-3
+  (package
+    (name "rust-tree-magic-mini")
+    (version "3.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tree_magic_mini" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vdazv3y1iggriwx5ksin72c2ds0xjdhx1yvmd5nxkya0w3gvbci"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-bytecount" ,rust-bytecount-0.6)
+                       ("rust-fnv" ,rust-fnv-1)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-nom" ,rust-nom-7)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-petgraph" ,rust-petgraph-0.6)
+                       ("rust-tree-magic-db" ,rust-tree-magic-db-3))))
+    (home-page "https://github.com/mbrubeck/tree_magic/")
+    (synopsis
+     "Determines the MIME type of a file by traversing a filetype tree.")
+    (description
+     "Determines the MIME type of a file by traversing a filetype tree.")
+    (license license:expat)))
+
 (define-public rust-tree-magic-0.2
   (package
     (name "rust-tree-magic")
-- 
2.41.0

[bug#68312] [PATCH 142/156] gnu: Add rust-tungstenite-0.20.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-tungstenite-0.20): New variable.
(rust-tungstenite-0.19): Inherit from rust-tungstenite-0.20.

Change-Id: I73c034a3d008c32d0156fce9d201338f1386182e
---
 gnu/packages/crates-io.scm | 52 ++++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cee7f4877f8..5ccd7ef0b66 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -81660,8 +81660,48 @@ (define-public rust-tuikit-0.2
        #:cargo-development-inputs
        (("rust-env-logger" ,rust-env-logger-0.6))))))
 
+(define-public rust-tungstenite-0.20
+  (package
+    (name "rust-tungstenite")
+    (version "0.20.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tungstenite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1fbgcv3h4h1bhhf5sqbwqsp7jnc44bi4m41sgmhzdsk2zl8aqgcy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #: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-roots" ,rust-webpki-roots-0.24))))
+    (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
+    (inherit rust-tungstenite-0.20)
     (name "rust-tungstenite")
     (version "0.19.0")
     (source
@@ -81671,7 +81711,6 @@ (define-public rust-tungstenite-0.19
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0rxzxg4y22rsvdvs4la7igy9117yidc2m6lsfm2hf0xvsska3yqm"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-byteorder" ,rust-byteorder-1)
@@ -81695,16 +81734,7 @@ (define-public rust-tungstenite-0.19
         ("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))))
+        ("rust-rand" ,rust-rand-0.8))))))
 
 (define-public rust-tungstenite-0.11
   (package
-- 
2.41.0

[bug#68312] [PATCH 143/156] gnu: Add rust-type-builder-macro-0.18.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-type-builder-macro-0.18): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5ccd7ef0b66..3d2553a74d1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -81883,6 +81883,28 @@ (define-public rust-typed-arena-1
     (build-system cargo-build-system)
     (arguments `(#:skip-build? #t))))
 
+(define-public rust-typed-builder-macro-0.18
+  (package
+    (name "rust-typed-builder-macro")
+    (version "0.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "typed-builder-macro" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14mlf9733bmdf6bqzmhrzc1hbxfazp0mxvs751wckdaifccy8blq"))))
+    (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-2))))
+    (home-page "https://github.com/idanarye/rust-typed-builder")
+    (synopsis "Compile-time type-checked builder derive")
+    (description "Compile-time type-checked builder derive")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-typed-builder-0.5
   (package
     (name "rust-typed-builder")
-- 
2.41.0

[bug#68312] [PATCH 144/156] gnu: Add rust-type-builder-0.18.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-type-builder-0.18): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3d2553a74d1..be34e79c7e3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -81905,6 +81905,26 @@ (define-public rust-typed-builder-macro-0.18
     (description "Compile-time type-checked builder derive")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-typed-builder-0.18
+  (package
+    (name "rust-typed-builder")
+    (version "0.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "typed-builder" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12pkf3h3hahfqm8g6k3kl2qicl346szqq24qa74vfqcq2jb08z74"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-typed-builder-macro" ,rust-typed-builder-macro-0.18))))
+    (home-page "https://github.com/idanarye/rust-typed-builder")
+    (synopsis "Compile-time type-checked builder derive")
+    (description "Compile-time type-checked builder derive")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-typed-builder-0.5
   (package
     (name "rust-typed-builder")
-- 
2.41.0

[bug#68312] [PATCH 145/156] gnu: rust-universal-hash-0.5: Update to 0.5.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-universal-hash-0.5): Update to 0.5.1.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index be34e79c7e3..5a42d23806e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82933,14 +82933,18 @@ (define-public rust-uniquote-3
 (define-public rust-universal-hash-0.5
   (package
     (name "rust-universal-hash")
-    (version "0.5.0")
+    (version "0.5.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "universal-hash" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1dfqh2jnf4pz2cr9v4adpyxinz658vadlbwsjgigf6cs7jvn0cbx"))))
+        (base32 "1sh79x677zkncasa95wz05b36134822w6qxmi1ck05fwi33f47gw"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+           (substitute* "Cargo.toml"
+             (("=2\\.4\\.1") "^2.4.1"))))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#68312] [PATCH 146/156] gnu: Add rust-urlencoding-2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-urlencoding-2): New variable.
(rust-urlencoding-1): Inherit from rust-urlencoding-2.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5a42d23806e..37d0d65ba5f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -83316,26 +83316,40 @@ (define-public rust-url-1
         ("rust-rustc-test" ,rust-rustc-test-0.3)
         ("rust-serde-json" ,rust-serde-json-1))))))
 
-(define-public rust-urlencoding-1
+(define-public rust-urlencoding-2
   (package
     (name "rust-urlencoding")
-    (version "1.1.1")
+    (version "2.1.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "urlencoding" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "14sm5c8idb5jzib8dwf85p5yhd65vxjh946p80p49d2j6fsjw8y9"))))
+        (base32 "1nj99jp37k47n0hvaz5fvz7z6jd0sb4ppvfy3nphr1zbnyixpy6s"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
+    (arguments
+     `(#:skip-build? #t))
     (home-page "https://lib.rs/urlencoding")
-    (synopsis "Rust library for doing URL percentage encoding")
+    (synopsis "A Rust library for doing URL percentage encoding.")
     (description
-     "This package provides a Rust library for doing URL percentage
-encoding.")
+     "This package provides a Rust library for doing URL percentage encoding.")
     (license license:expat)))
 
+(define-public rust-urlencoding-1
+  (package
+    (inherit rust-urlencoding-2)
+    (name "rust-urlencoding")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "urlencoding" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14sm5c8idb5jzib8dwf85p5yhd65vxjh946p80p49d2j6fsjw8y9"))))
+    (arguments `(#:skip-build? #t))))
+
 (define-public rust-users-0.11
   (package
     (name "rust-users")
-- 
2.41.0

[bug#68312] [PATCH 147/156] gnu: Add rust-vt100-0.15.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 37d0d65ba5f..a172a4ba103 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -84414,6 +84414,29 @@ (define-public rust-vswhom-sys-0.1
      "This package provides a pure FFI to Jon Blow's VS discovery script.")
     (license license:expat)))
 
+(define-public rust-vt100-0.15
+  (package
+    (name "rust-vt100")
+    (version "0.15.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "vt100" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1pklc8y984axmxr0cd363srr2d27wd5rj15xlcmkjznvy0xqdkc4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-itoa" ,rust-itoa-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-unicode-width" ,rust-unicode-width-0.1)
+                       ("rust-vte" ,rust-vte-0.11))))
+    (home-page "https://github.com/doy/vt100-rust")
+    (synopsis "Library for parsing terminal data")
+    (description "Library for parsing terminal data")
+    (license license:expat)))
+
 (define-public rust-vte-0.13
   (package
     (name "rust-vte")
-- 
2.41.0

[bug#68312] [PATCH 148/156] gnu: Add rust-vtparse-0.6.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a172a4ba103..e1e15021055 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -84564,6 +84564,26 @@ (define-public rust-vte-generate-state-changes-0.1
      "This package provides a proc macro for generating VTE state changes.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-vtparse-0.6
+  (package
+    (name "rust-vtparse")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "vtparse" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1l5yz9650zhkaffxn28cvfys7plcw2wd6drajyf41pshn37jm6vd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-utf8parse" ,rust-utf8parse-0.2))))
+    (home-page "https://github.com/wez/wezterm")
+    (synopsis "Low level escape sequence parser")
+    (description "Low level escape sequence parser")
+    (license license:expat)))
+
 (define-public rust-wait-timeout-0.2
   (package
     (name "rust-wait-timeout")
-- 
2.41.0

[bug#68312] [PATCH 149/156] gnu: Add rust-wl-clipboard-rs-0.7.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-wl-clipboard-rs-0.7): New variable.
(rust-wl-clipboard-rs-0.4): Inherit from rust-wl-clipboard-rs-0.7.

Change-Id: I13ea96f98b545afbd210336818564aa0d0ab4f0b
---
 gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e1e15021055..1e95012f5fd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -85219,8 +85219,39 @@ (define-public rust-watchexec-1
 modifications.")
     (license license:asl2.0)))
 
+(define-public rust-wl-clipboard-rs-0.7
+  (package
+    (name "rust-wl-clipboard-rs")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wl-clipboard-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1n8sg981h3d08hnnlrsgs81w2qz3n8a5ml0jcsgnapdpzcyk06lq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-nix" ,rust-nix-0.24)
+                       ("rust-os-pipe" ,rust-os-pipe-1)
+                       ("rust-tempfile" ,rust-tempfile-3)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tree-magic-mini" ,rust-tree-magic-mini-3)
+                       ("rust-wayland-client" ,rust-wayland-client-0.29)
+                       ("rust-wayland-protocols" ,rust-wayland-protocols-0.29))))
+    (home-page "https://github.com/YaLTeR/wl-clipboard-rs")
+    (synopsis "Access to the Wayland clipboard")
+    (description "This package provides access to the Wayland clipboard
+for terminal and other window-less applications.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-wl-clipboard-rs-0.4
   (package
+    (inherit rust-wl-clipboard-rs-0.7)
     (name "rust-wl-clipboard-rs")
     (version "0.4.1")
     (source
@@ -85231,7 +85262,6 @@ (define-public rust-wl-clipboard-rs-0.4
         (patches (search-patches "rust-wl-clipboard-rs-newer-wl.patch"))
         (sha256
           (base32 "1252cm67pkrr6ik5ys2cdyfr2zzw6ds7v351i1cmyi94yiv01l13"))))
-    (build-system cargo-build-system)
     (arguments
       `(#:skip-build? #t
         #:cargo-inputs
@@ -85250,12 +85280,7 @@ (define-public rust-wl-clipboard-rs-0.4
          ("rust-tree-magic" ,rust-tree-magic-0.2)
          ("rust-wayland-client" ,rust-wayland-client-0.28)
          ("rust-wayland-commons" ,rust-wayland-commons-0.28)
-         ("rust-wayland-protocols" ,rust-wayland-protocols-0.28))))
-    (home-page "https://github.com/YaLTeR/wl-clipboard-rs")
-    (synopsis "Access to the Wayland clipboard")
-    (description "This package provides access to the Wayland clipboard
-for terminal and other window-less applications.")
-    (license (list license:expat license:asl2.0))))
+         ("rust-wayland-protocols" ,rust-wayland-protocols-0.28))))))
 
 (define-public rust-web-sys-0.3
   (package
-- 
2.41.0

[bug#68312] [PATCH 150/156] gnu: Add rust-wezterm-color-types-0.2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-wezterm-color-types-0.2): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1e95012f5fd..6c770529d23 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -85484,6 +85484,30 @@ (define-public rust-wepoll-sys-stjepang-1
 using @code{bindgen}.")
     (license license:mpl2.0)))
 
+(define-public rust-wezterm-color-types-0.2
+  (package
+    (name "rust-wezterm-color-types")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wezterm-color-types" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xvphmrqgg69v9l879xj5lq010z13f5ixi854ykmny6j7m47lvjc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-csscolorparser" ,rust-csscolorparser-0.6)
+                       ("rust-deltae" ,rust-deltae-0.3)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-wezterm-dynamic" ,rust-wezterm-dynamic-0.1))))
+    (home-page "https://github.com/wez/wezterm")
+    (synopsis "Types for working with colors")
+    (description "Types for working with colors")
+    (license license:expat)))
+
 (define-public rust-which-5
   (package
     (name "rust-which")
-- 
2.41.0

[bug#68312] [PATCH 151/156] gnu: Add rust-wezterm-dynamic-derive-0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-wezterm-dynamic-derive-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6c770529d23..995bef2d9a6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -85508,6 +85508,30 @@ (define-public rust-wezterm-color-types-0.2
     (description "Types for working with colors")
     (license license:expat)))
 
+(define-public rust-wezterm-dynamic-derive-0.1
+  (package
+    (name "rust-wezterm-dynamic-derive")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wezterm-dynamic-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1w07qf8njyq19nxi9vpshwprk00blhzg9ybis2rhfba433rmx7qc"))))
+    (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/wez/wezterm")
+    (synopsis
+     "config serialization for wezterm via dynamic json-like data values")
+    (description
+     "config serialization for wezterm via dynamic json-like data values")
+    (license license:expat)))
+
 (define-public rust-which-5
   (package
     (name "rust-which")
-- 
2.41.0

[bug#68312] [PATCH 152/156] gnu: Add rust-wezterm-dynamic-0.1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-wezterm-dynamic-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 995bef2d9a6..848b3cf4763 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -85532,6 +85532,32 @@ (define-public rust-wezterm-dynamic-derive-0.1
      "config serialization for wezterm via dynamic json-like data values")
     (license license:expat)))
 
+(define-public rust-wezterm-dynamic-0.1
+  (package
+    (name "rust-wezterm-dynamic")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wezterm-dynamic" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1al8fmfr852m62mlcr0v2lg3a18icl2sv79zv7jnv9v0rk07hpm7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-log" ,rust-log-0.4)
+                       ("rust-ordered-float" ,rust-ordered-float-3)
+                       ("rust-strsim" ,rust-strsim-0.10)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-wezterm-dynamic-derive" ,rust-wezterm-dynamic-derive-0.1))))
+    (home-page "https://github.com/wez/wezterm")
+    (synopsis
+     "config serialization for wezterm via dynamic json-like data values")
+    (description
+     "config serialization for wezterm via dynamic json-like data values")
+    (license license:expat)))
+
 (define-public rust-which-5
   (package
     (name "rust-which")
-- 
2.41.0

[bug#68312] [PATCH 153/156] gnu: Add rust-wezterm-bidi-0.2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-wezterm-bidi-0.2): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 848b3cf4763..a5fe2608c75 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -85558,6 +85558,27 @@ (define-public rust-wezterm-dynamic-0.1
      "config serialization for wezterm via dynamic json-like data values")
     (license license:expat)))
 
+(define-public rust-wezterm-bidi-0.2
+  (package
+    (name "rust-wezterm-bidi")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wezterm-bidi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dkcwscvlwnv6lnagxfb08rcd21gfyrxbr7afcjaj3wvycn3hq0m"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-log" ,rust-log-0.4)
+                       ("rust-wezterm-dynamic" ,rust-wezterm-dynamic-0.1))))
+    (home-page "https://github.com/wez/wezterm")
+    (synopsis "The Unicode Bidi Algorithm (UBA)")
+    (description "The Unicode Bidi Algorithm (UBA)")
+    (license (list license:expat license:unicode))))
+
 (define-public rust-which-5
   (package
     (name "rust-which")
-- 
2.41.0

[bug#68312] [PATCH 154/156] gnu: Add rust-x509-parser-0.13.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-x509-parser-0.13): New variable.
(rust-x509-parser-0.12): Inherit from rust-x509-parser-0.13.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a5fe2608c75..1a95fd596d3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -86174,9 +86174,35 @@ (define-public rust-x509-parser-0.14
                        ("rust-thiserror" ,rust-thiserror-1)
                        ("rust-time" ,rust-time-0.3))))))
 
+(define-public rust-x509-parser-0.13
+  (package
+    (inherit rust-x509-parser-0.14)
+    (name "rust-x509-parser")
+    (version "0.13.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "x509-parser" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "077bi0xyaa8cmrqf3rrw1z6kkzscwd1nxdxgs7mgz2ambg7bmfcz"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-asn1-rs" ,rust-asn1-rs-0.3)
+                       ("rust-base64" ,rust-base64-0.13)
+                       ("rust-data-encoding" ,rust-data-encoding-2)
+                       ("rust-der-parser" ,rust-der-parser-7)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-nom" ,rust-nom-7)
+                       ("rust-oid-registry" ,rust-oid-registry-0.4)
+                       ("rust-ring" ,rust-ring-0.16)
+                       ("rust-rusticata-macros" ,rust-rusticata-macros-4)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-time" ,rust-time-0.3))))))
+
 (define-public rust-x509-parser-0.12
   (package
-    (inherit rust-x509-parser-0.15)
+    (inherit rust-x509-parser-0.13)
     (name "rust-x509-parser")
     (version "0.12.0")
     (source
-- 
2.41.0

[bug#68312] [PATCH 155/156] gnu: Add rust-yansi-1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-yansi-1): New variable.
(rust-yansi-0.5): Inherit from rust-yansi-1.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1a95fd596d3..525d1108edd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -86835,20 +86835,21 @@ (define-public rust-yaml-rust-0.3
        (("rust-clippy" ,rust-clippy-0.0)
         ("rust-linked-hash-map" ,rust-linked-hash-map-0.3))))))
 
-(define-public rust-yansi-0.5
+(define-public rust-yansi-1
   (package
     (name "rust-yansi")
-    (version "0.5.1")
+    (version "1.0.0-rc.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "yansi" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1v4qljgzh73knr7291cgwrf56zrvhmpn837n5n5pypzq1kciq109"))))
+        (base32 "0xr3n41j5v00scfkac2d6vhkxiq9nz3l5j6vw8f3g3bqixdjjrqk"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-development-inputs (("rust-serial-test" ,rust-serial-test-0.6))))
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-is-terminal" ,rust-is-terminal-0.4))))
     (home-page "https://github.com/SergioBenitez/yansi")
     (synopsis "Simple ANSI terminal color painting library")
     (description
@@ -86856,6 +86857,21 @@ (define-public rust-yansi-0.5
 library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-yansi-0.5
+  (package
+    (inherit rust-yansi-1)
+    (name "rust-yansi")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "yansi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1v4qljgzh73knr7291cgwrf56zrvhmpn837n5n5pypzq1kciq109"))))
+    (arguments
+     `(#:cargo-development-inputs (("rust-serial-test" ,rust-serial-test-0.6))))))
+
 (define-public rust-yansi-term-0.1
   (package
     (name "rust-yansi-term")
-- 
2.41.0

[bug#68312] [PATCH 156/156] gnu: Add atuin.

[Wilko Meyer]

* gnu/packages/rust-apps.scm (atuin): New variable.

Change-Id: Ie039bd61e18e60a905e1637b27345f8a8b062169
---
 gnu/packages/rust-apps.scm | 57 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 6a224762a81..23d1c81d0f6 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -212,6 +212,63 @@ (define-public alfis
 alternative zones.")
     (license license:agpl3+)))
 
+(define-public atuin
+  (package
+    (name "atuin")
+    (version "17.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "atuin" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "193708q6cwlz467v0r179np9rl6hkk9cz3k5a2qv6cav7asnhra7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-atuin-client" ,rust-atuin-client-17)
+                       ("rust-atuin-common" ,rust-atuin-common-17)
+                       ("rust-atuin-server" ,rust-atuin-server-17)
+                       ("rust-atuin-server-postgres" ,rust-atuin-server-postgres-17)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-clap" ,rust-clap-4)
+                       ("rust-clap-complete" ,rust-clap-complete-4)
+                       ("rust-cli-clipboard" ,rust-cli-clipboard-0.4)
+                       ("rust-colored" ,rust-colored-2)
+                       ("rust-crossterm" ,rust-crossterm-0.27)
+                       ("rust-directories" ,rust-directories-5)
+                       ("rust-env-logger" ,rust-env-logger-0.10)
+                       ("rust-eyre" ,rust-eyre-0.6)
+                       ("rust-fs-err" ,rust-fs-err-2)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3)
+                       ("rust-indicatif" ,rust-indicatif-0.17)
+                       ("rust-interim" ,rust-interim-0.1)
+                       ("rust-itertools" ,rust-itertools-0.12)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-ratatui" ,rust-ratatui-0.24)
+                       ("rust-rpassword" ,rust-rpassword-7)
+                       ("rust-runtime-format" ,rust-runtime-format-0.1)
+                       ("rust-semver" ,rust-semver-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tiny-bip39" ,rust-tiny-bip39-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+                       ("rust-unicode-width" ,rust-unicode-width-0.1)
+                       ("rust-whoami" ,rust-whoami-1))
+       #:cargo-development-inputs (("rust-tracing-tree" ,rust-tracing-tree-0.3))))
+    (home-page "https://atuin.sh")
+    (synopsis "atuin - magical shell history")
+    (description "Atuin replaces your existing shell history with a SQLite
+database, and records additional context for your commands. Additionally, it
+provides optional and fully encrypted synchronisation of your history between
+machines, via an Atuin server.")
+    (license license:expat)))
+
 (define-public bat
   (package
     (name "bat")
-- 
2.41.0

[bug#68312] [PATCH 000/156] Add atuin (WIP).

[Efraim Flashner]

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

On Mon, Jan 08, 2024 at 02:51:39AM +0100, Wilko Meyer wrote:
> Hi Guix,
> 
> I started packaging atuin[0], a tool written in Rust to keep ones shell
> history in sync across systems/make it more easily searchable, for Guix.
> It builds successfully on my system already from a manifest.scm, so I
> decided to create a patchset for Guix proper. I'm almost certain,
> there'll be a v2 of this patch series; as some package description do
> not fully comply with the preferred style yet, I want to add the proper
> cargo-development-inputs to dependencies where applicable, smooth rough
> edges,and want to see if I get the sync server implementation for atuin
> running as a shepherd service.
> 
> As this patch series got pretty big, I'm not sure what the best way is
> to get all changes/atuin into Guix proper. Is it even feasible like this
> from a reviewing perspective or should I see if I can split up this
> patch series in 3 (atuin cli tool, and the two server implementations,
> one for postgresql and one for sqlite) seperate ones?

I assume you need the CLI tool and one of the server implementations to
make it work? I'd go with the CLI tool and the sqlite implementation
since that's always easy to work with.

I've applied a bunch of the patches, but I want to ask you to try to
build more of the crates instead of skipping the builds and to insert
them alphabetically.  Its easiest for me if each patch can be applied
after the previous one(s) and then build, but I'm not averse to applying
groups of them and then checking them together, for example the
rust-rocket-* patches or something similar. Then its not too bad to go
and slot in a couple of fixup commits to make any changes.

-- 
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 --]