[bug#69257] [PATCH 000/228 rust-team] WIP: Add GNOME Fractal dependencies.

[bug#69257] [PATCH 000/228 rust-team] WIP: Add GNOME Fractal dependencies.

[Herman Rimm via Guix-patches via]

Hello,

This weekend I tried to add the GNOME Fractal package. It has a lot of
dependencies so it is not finished yet. When I rebased my branch on top
of the rust-team branch, some packages had already been upstreamed. So I
publish this here, so that there will be less duplicated work.

I have not tried building most of the packages and although I tried to
add dependencies before dependents, I cannot guarantee that is the case.

Consider upstreaming the alphabetical reordering patches first off all,
so that ordering errors don't accumulate.

Cheers,
Herman

Efraim Flashner (1):
  gnu: rust-sluice-0.5: Update to 0.5.5.

Herman Rimm (227):
  gnu: Place rust-rtnetlink-0.14 in alphabetical order.
  gnu: Add rust-anymap2-0.13.
  gnu: Add rust-aquamarine-0.5.
  gnu: Add rust-as-variant-1.
  gnu: Add rust-backoff-0.4.
  gnu: Add rust-cfg-vis-0.3.
  gnu: Add rust-gloo-timers-0.3.
  gnu: Add rust-compiletest-rs-0.9.
  gnu: Add rust-proptest-derive-0.4.
  gnu: Add rust-bitmaps-3.
  gnu: Add rust-imbl-sized-chunks-0.1.
  gnu: Add rust-imbl-2.
  gnu: Place rust-uom-0.34 in alphabetical order.
  gnu: Place rust-thousands-0.2 in alphabetical order.
  gnu: Place rust-twox-hash-1 in alphabetical order.
  gnu: Add rust-stream-assert-0.1.
  gnu: Add rust-branches-0.1.
  gnu: Place rust-rusticata-macros-4 in alphabetical order.
  gnu: Place rust-rpds-1 in alphabetical order.
  gnu: Place rust-rpassword-5 in alphabetical order.
  gnu: Place rust-rpassword-6 in alphabetical order.
  gnu: Place rust-rpassword-7 in alphabetical order.
  gnu: Place rust-rt-format-0.3 in alphabetical order.
  gnu: Place rust-rtoolbox-0.0.1 in alphabetical order.
  gnu: Place rust-roxmltree-0.14 in alphabetical order.
  gnu: Place rust-rodio-0.15 in alphabetical order.
  gnu: Add rust-rclite-0.2.
  gnu: Add rust-readlock-0.1.
  gnu: Add rust-readlock-tokio-0.1.
  gnu: Add rust-eyeball-0.8.
  gnu: Add rust-eyeball-im-0.4.
  gnu: Add rust-eyeball-im-util-0.5.
  gnu: Add rust-k256-0.13.
  gnu: Add rust-mas-iana-0.7.
  gnu: Add rust-mas-jose-0.7.
  gnu: Add rust-structmeta-derive-0.2.
  gnu: Add rust-structmeta-0.2.
  gnu: Add rust-parse-display-derive-0.8.
  gnu: Add rust-parse-display-0.8.
  gnu: Add rust-oauth2-types-0.7.
  gnu: rust-iri-string-0.7: Expand description.
  gnu: Place rust-lettre-email-0.9 in alphabetical order.
  gnu: Add rust-etherparse-0.13.
  gnu: Add rust-gat-std-proc-0.1.
  gnu: Add rust-gat-std-0.1.
  gnu: Add rust-etherparse-0.9.
  gnu: Add rust-tun-tap-0.1.
  gnu: Add rust-eui48-1.
  gnu: Add rust-pcap-1.
  gnu: Add rust-no-std-net-0.6.
  gnu: Add rust-pnet-base-0.34.
  gnu: Add rust-pnet-sys-0.34.
  gnu: Add rust-pnet-datalink-0.34.
  gnu: Add rust-http-body-1.
  gnu: Add rust-http-body-util-0.1.
  gnu: Add rust-h2-0.4.
  gnu: Add rust-hyper-1.
  gnu: Add rust-hyper-util-0.1.
  gnu: Add rust-http-range-header-0.4.
  gnu: Add rust-sync-wrapper-0.1.
  gnu: Add rust-tower-http-0.5.
  gnu: Add rust-opentelemetry-0.21.
  gnu: Add rust-castaway-0.1.
  gnu: Add rust-isahc-1.
  gnu: Add rust-opentelemetry-http-0.10.
  gnu: Add rust-str-stack-0.1.
  gnu: Add rust-dary-heap-0.3.
  gnu: Add rust-libflate-lz77-2.
  gnu: Add rust-libflate-2.
  gnu: Add rust-quick-xml-0.26.
  gnu: Add rust-inferno-0.11.
  gnu: Place rust-prost-build-0.12 in alphabetical order.
  gnu: Add rust-pulldown-cmark-to-cmark-10.
  gnu: Add rust-symbolic-common-12.
  gnu: Add rust-msvc-demangler-0.9.
  gnu: Add rust-symbolic-demangle-12.
  gnu: Add rust-pprof-0.13.
  gnu: Add rust-ordered-float-4.
  gnu: Add rust-opentelemetry-sdk-0.21.
  gnu: Add rust-opentelemetry-semantic-conventions-0.13.
  gnu: Place rust-paw-structopt-1 in alphabetical order.
  gnu: Place rust-paw-raw-1 in alphabetical order.
  gnu: Place rust-paw-attributes-1 in alphabetical order.
  gnu: Place rust-paw-1 in alphabetical order.
  gnu: Place rust-pathfinder-simd-0.5 in alphabetical order.
  gnu: Place rust-pathfinder-geometry-0.5 in alphabetical order.
  gnu: Add rust-prost-types-0.11.
  gnu: Add rust-axum-macros-0.3.
  gnu: Add rust-axum-extra-0.7.
  gnu: Add rust-tonic-0.9.
  gnu: rust-integer-encoding-3: Update to 3.0.4.
  gnu: Add rust-thrift-0.17.
  gnu: Add rust-opentelemetry-jaeger-0.20.
  gnu: Add rust-prost-build-0.11.
  gnu: Add rust-grpcio-compiler-0.12.
  gnu: Add rust-boringssl-src-0.5.
  gnu: Add rust-grpcio-sys-0.12.
  gnu: Add rust-grpcio-0.12.
  gnu: Add rust-tonic-build-0.9.
  gnu: rust-rustc-demangle-0.1: Update to 0.1.23.
  gnu: Add rust-opentelemetry-proto-0.4.
  gnu: Add rust-opentelemetry-otlp-0.14.
  gnu: Add rust-opentelemetry-stdout-0.2.
  gnu: Add rust-tracing-opentelemetry-0.22.
  gnu: Add rust-mas-tower-0.7.
  gnu: Add rust-mas-http-0.7.
  gnu: Add rust-chacha20poly1305-0.10.
  gnu: Add rust-mas-keystore-0.7.
  gnu: Place rust-const-format-proc-macros-0.2 in alphabetical order.
  gnu: Place rust-const-format-0.2 in alphabetical order.
  gnu: Place rust-const-fn-assert-0.1 in alphabetical order.
  gnu: Place rust-const-cstr-0.3 in alphabetical order.
  gnu: Place rust-compound-duration-1 in alphabetical order.
  gnu: Add rust-warp-0.3.
  gnu: Add rust-ordered-multimap-0.4.
  gnu: Add rust-rust-ini-0.18.
  gnu: Add rust-json5-0.4.
  gnu: Add rust-temp-env-0.2.
  gnu: Add rust-config-0.13.
  gnu: Add rust-deadpool-runtime-0.1.
  gnu: Add rust-deadpool-0.9.
  gnu: Add rust-assert-json-diff-2.
  gnu: Add rust-wiremock-0.5.
  gnu: Add rust-mas-oidc-client-0.7.
  gnu: Add rust-matrix-sdk-test-macros-0.7.
  gnu: Place rust-kuchiki-0.8 in alphabetical order.
  gnu: Add rust-konst-proc-macros-0.3.
  gnu: Place rust-konst-macro-rules-0.2 in alphabetical order.
  gnu: Add rust-typewit-proc-macros-1.
  gnu: Add rust-typewit-1.
  gnu: Add rust-const-panic-proc-macros-0.2.
  gnu: Add rust-const-panic-0.2.
  gnu: Add rust-konst-kernel-0.3.
  gnu: Add rust-konst-0.3.
  gnu: Place rust-koibumi-base32-0.0.2 in alphabetical order.
  gnu: Place rust-jwalk-0.8 in alphabetical order.
  gnu: Add rust-js-int-0.2.
  gnu: Add rust-ruma-identifiers-validation-0.9.
  gnu: Add rust-ruma-macros-0.12.
  gnu: Place rust-wl-clipboard-rs-0.4 in alphabetical order.
  gnu: Place rust-wl-clipboard-rs-0.7 in alphabetical order.
  gnu: Add rust-wildmatch-2.
  gnu: Add rust-assign-1.
  gnu: Add rust-ruma-common-0.12.
  gnu: Add rust-js-option-0.1.
  gnu: Add rust-ruma-html-0.1.
  gnu: Add rust-ruma-events-0.27.
  gnu: Add rust-ruma-appservice-api-0.9.
  gnu: Add rust-ruma-federation-api-0.8.
  gnu: Add rust-ruma-identity-service-api-0.8.
  gnu: Add rust-ruma-push-gateway-api-0.8.
  gnu: Add rust-yap-0.12.
  gnu: Add rust-ruma-server-util-0.2.
  gnu: Add rust-curve25519-dalek-derive-0.1.
  gnu: Move rust-fiat-crypto-0.1.
  gnu: Add rust-fiat-crypto-0.2.
  gnu: Add rust-platforms-3.
  gnu: Add rust-curve25519-dalek-4.
  gnu: Add rust-ring-compat-0.8.
  gnu: Add rust-strobe-rs-0.8.
  gnu: Add rust-strobe-rs-0.5.
  gnu: Add rust-merlin-3.
  gnu: Add rust-x25519-dalek-2.
  gnu: Add rust-ed25519-2.
  gnu: Add rust-ed25519-dalek-2.
  gnu: Add rust-macro-attr-0.2.
  gnu: Add rust-subslice-0.2.
  gnu: Add rust-ruma-signatures-0.14.
  gnu: Add rust-ruma-client-api-0.17.
  gnu: Add rust-ruma-client-0.12.
  gnu: Add rust-ruma-state-res-0.10.
  gnu: Add rust-ruma-0.9.
  gnu: Add rust-matrix-sdk-test-0.7.
  gnu: Add rust-matrix-sdk-common-0.7.
  gnu: Add rust-tls-codec-derive-0.4.
  gnu: Add rust-tls-codec-0.4.
  gnu: Add rust-x509-cert-0.2.
  gnu: Add rust-pkcs7-0.4.
  gnu: Add rust-matrix-pickle-derive-0.1.
  gnu: Add rust-matrix-pickle-0.1.
  gnu: Add rust-olm-sys-1.
  gnu: Add rust-olm-rs-2.
  gnu: Add rust-vodozemac-0.5.
  gnu: Add rust-qrcode-0.13.
  gnu: Add rust-matrix-sdk-qrcode-0.7.
  gnu: Add rust-web-time-1.
  gnu: Add rust-ulid-1.
  gnu: Add rust-bs58-0.5.
  gnu: Add rust-matrix-sdk-crypto-0.7.
  gnu: Add rust-matrix-sdk-store-encrpytion-0.7.
  gnu: Add rust-matrix-sdk-base-0.7.
  gnu: Add rust-macroific-attr-parse-1.
  gnu: Add rust-macroific-core-1.
  gnu: Add rust-macroific-macro-1.
  gnu: Add rust-macroific-1.
  gnu: Add rust-accessory-1.
  gnu: Add rust-delegate-display-2.
  gnu: Add rust-fancy-constructor-1.
  gnu: Add rust-indexed-db-futures-0.4.
  gnu: Place rust-serdeconv-0.4 in alphabetical order.
  gnu: Place rust-serde-wasm-bindgen-0.3 in alphabetical order.
  gnu: Add rust-serde-wasm-bindgen-0.6.
  gnu: Add rust-matrix-sdk-indexeddb-0.7.
  gnu: Add rust-deadpool-sync-0.1.
  gnu: Add rust-fallible-iterator-0.3.
  gnu: Add rust-sqlite3-parser-0.12.
  gnu: Add rust-rusqlite-macros-0.1.
  gnu: Add rust-rusqlite-0.30.
  gnu: Add rust-deadpool-0.10.
  gnu: Add rust-deadpool-sqlite-0.7.
  gnu: Add rust-matrix-sdk-sqlite-0.7.
  gnu: Add rust-matrix-sdk-0.7.
  gnu: Add rust-oneshot-uniffi-0.1.
  gnu: Add rust-async-compat-0.2.
  gnu: Add rust-uniffi-core-0.25.
  gnu: Add rust-uniffi-checksum-derive-0.25.
  gnu: Add rust-uniffi-meta-0.25.
  gnu: Add rust-uniffi-testing-0.25.
  gnu: Add rust-weedle2-4.
  gnu: Add rust-uniffi-udl-0.25.
  gnu: Add rust-uniffi-bindgen-0.25.
  gnu: Add rust-uniffi-build-0.25.
  gnu: Add rust-uniffi-0.25.
  gnu: Add rust-async-cell-0.2.
  gnu: Add rust-async-rx-0.1.
  gnu: Add rust-matrix-sdk-ui-0.7.
  WIP: gnu: Add fractal.

 gnu/packages/crates-crypto.scm |  634 +++-
 gnu/packages/crates-io.scm     | 6228 ++++++++++++++++++++++++++------
 gnu/packages/crates-web.scm    |  860 ++++-
 gnu/packages/rust-apps.scm     |   65 +
 4 files changed, 6571 insertions(+), 1216 deletions(-)


base-commit: c59a90ecb720a64b613f1b1ee7fbe76dc2e2f6a7
-- 
2.41.0

[bug#69257] [PATCH 001/228] gnu: Place rust-rtnetlink-0.14 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-rtnetlink-0.14): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 42bbe55579..4221dcae49 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16120,47 +16120,6 @@ (define-public rust-rt-format-0.3
 character.")
     (license license:asl2.0)))
 
-(define-public rust-rtnetlink-0.14
-  (package
-    (name "rust-rtnetlink")
-    (version "0.14.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rtnetlink" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "19dbbky7bcrwk4jhgam148s8ykxc7pfrblxjvmciipyq8i9lg15n"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-test-flags '("--release" "--"
-                            "--skip=link::test::create_get_delete_macvlan"
-                            "--skip=link::test::create_get_delete_wg"
-                            "--skip=traffic_control::add_filter::test::test_new_filter"
-                            "--skip=traffic_control::add_qdisc::test::test_new_qdisc")
-       #:cargo-inputs (("rust-async-global-executor" ,rust-async-global-executor-2)
-                       ("rust-futures" ,rust-futures-0.3)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-netlink-packet-core" ,rust-netlink-packet-core-0.7)
-                       ("rust-netlink-packet-route" ,rust-netlink-packet-route-0.19)
-                       ("rust-netlink-packet-utils" ,rust-netlink-packet-utils-0.5)
-                       ("rust-netlink-proto" ,rust-netlink-proto-0.11)
-                       ("rust-netlink-sys" ,rust-netlink-sys-0.8)
-                       ("rust-nix" ,rust-nix-0.27)
-                       ("rust-thiserror" ,rust-thiserror-1)
-                       ("rust-tokio" ,rust-tokio-1))
-       #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1)
-                                   ("rust-env-logger" ,rust-env-logger-0.10)
-                                   ("rust-ipnetwork" ,rust-ipnetwork-0.18)
-                                   ("rust-macaddr" ,rust-macaddr-1)
-                                   ("rust-tokio" ,rust-tokio-1))))
-    (home-page "https://github.com/rust-netlink/rtnetlink")
-    (synopsis "Manipulate linux networking resources via netlink")
-    (description "This crate provides methods to manipulate networking
-resources (links, addresses, arp tables, route tables) via the netlink route
-protocol.")
-    (license license:expat)))
-
 (define-public rust-rusticata-macros-4
   (package
     (name "rust-rusticata-macros")
@@ -55991,6 +55950,47 @@ (define-public rust-rstest-test-0.9
         ("rust-rstest" ,rust-rstest-0.15)
         ("rust-temp-testdir" ,rust-temp-testdir-0.2))))))
 
+(define-public rust-rtnetlink-0.14
+  (package
+    (name "rust-rtnetlink")
+    (version "0.14.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rtnetlink" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19dbbky7bcrwk4jhgam148s8ykxc7pfrblxjvmciipyq8i9lg15n"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            "--skip=link::test::create_get_delete_macvlan"
+                            "--skip=link::test::create_get_delete_wg"
+                            "--skip=traffic_control::add_filter::test::test_new_filter"
+                            "--skip=traffic_control::add_qdisc::test::test_new_qdisc")
+       #:cargo-inputs (("rust-async-global-executor" ,rust-async-global-executor-2)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-netlink-packet-core" ,rust-netlink-packet-core-0.7)
+                       ("rust-netlink-packet-route" ,rust-netlink-packet-route-0.19)
+                       ("rust-netlink-packet-utils" ,rust-netlink-packet-utils-0.5)
+                       ("rust-netlink-proto" ,rust-netlink-proto-0.11)
+                       ("rust-netlink-sys" ,rust-netlink-sys-0.8)
+                       ("rust-nix" ,rust-nix-0.27)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1)
+                                   ("rust-env-logger" ,rust-env-logger-0.10)
+                                   ("rust-ipnetwork" ,rust-ipnetwork-0.18)
+                                   ("rust-macaddr" ,rust-macaddr-1)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/rust-netlink/rtnetlink")
+    (synopsis "Manipulate linux networking resources via netlink")
+    (description "This crate provides methods to manipulate networking
+resources (links, addresses, arp tables, route tables) via the netlink route
+protocol.")
+    (license license:expat)))
+
 (define-public rust-rug-1
   (package
     (name "rust-rug")
-- 
2.41.0

[bug#69257] [PATCH 002/228] gnu: Add rust-anymap2-0.13.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-anymap2-0.13): Add variable.
---
 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 4221dcae49..29ccbd9477 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1849,6 +1849,26 @@ (define-public rust-anymap-0.12
 type.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-anymap2-0.13
+  (package
+    (name "rust-anymap2")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "anymap2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "031kw3bp0zh2pn9fcayaw0w0gydgpgfhm08pg4yz5cml9jwv60fk"))))
+    (build-system cargo-build-system)
+    (arguments `(#:skip-build? #t))
+    (home-page "https://github.com/azriel91/anymap2")
+    (synopsis "Safe and convenient store for one value of each type")
+    (description
+     "This package provides a safe and convenient store for one value of
+each type.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-app-dirs2-2
   (package
     (name "rust-app-dirs2")
-- 
2.41.0

[bug#69257] [PATCH 003/228] gnu: Add rust-aquamarine-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-aquamarine-0.5): Add variable.
---
 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 29ccbd9477..dbe16c0e22 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1985,6 +1985,34 @@ (define-public rust-approx-0.1
          "153awzwywmb61xg857b80l63b1x6hifx2pha7lxf6fck9qxwraq8"))))
     (arguments '())))
 
+(define-public rust-aquamarine-0.5
+  (package
+    (name "rust-aquamarine")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "aquamarine" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0kizryj8h9zgwrb0q5q5f1c6bg56gnbg19wan5g06icj6141bk11"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-include-dir" ,rust-include-dir-0.7)
+                       ("rust-itertools" ,rust-itertools-0.10)
+                       ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+                       ("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))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://github.com/mersinvald/aquamarine")
+    (synopsis "Mermaid.js integration for rustdoc")
+    (description "This package provides a mermaid.js integration for
+rustdoc.")
+    (license license:expat)))
+
 (define-public rust-arbitrary-1
   (package
     (name "rust-arbitrary")
-- 
2.41.0

[bug#69257] [PATCH 004/228] gnu: Add rust-as-variant-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-as-variant-1): Add variable.
---
 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 dbe16c0e22..0bcf3ad231 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3268,6 +3268,25 @@ (define-public rust-as-derive-utils-0.8
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-as-variant-1
+  (package
+    (name "rust-as-variant")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "as_variant" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13vryhfcslf50f8j1msnxg5689bzwz56z45dgzxqd7r40wis53zk"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/jplatte/as_variant")
+    (synopsis "Macro to convert enums with newtype variants to Option")
+    (description
+     "This package provides a simple macro to convert enums with newtype
+variants to `Option`s.")
+    (license license:mpl2.0)))
+
 (define-public rust-asio-sys-0.2
   (package
     (name "rust-asio-sys")
-- 
2.41.0

[bug#69257] [PATCH 005/228] gnu: Add rust-backoff-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-backoff-0.4): Add variable.
---
 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 0bcf3ad231..070f81a59e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5570,6 +5570,39 @@ (define-public rust-az-1
     (description "This crate provides casts and checked casts.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-backoff-0.4
+  (package
+    (name "rust-backoff")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "backoff" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1h80d9xn5wngxdgza2m8w4x1kyhk0x6k9ydvsj50j2pcn6fdnbdn"))
+       (modules '((guix build utils)))
+       ;; XXX: Doctest hangs for no apparent reason.
+       (snippet '(substitute* "src/lib.rs"
+                              (("```rust\n")
+                               "```rust,no_run\n")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-instant" ,rust-instant-0.1)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-reqwest" ,rust-reqwest-0.11))))
+    (native-inputs (list pkg-config))
+    (inputs (list openssl))
+    (home-page "https://github.com/ihrwein/backoff")
+    (synopsis "Retry operations with exponential backoff policy")
+    (description "Retry operations with exponential backoff policy.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-backon-0.4
   (package
     (name "rust-backon")
-- 
2.41.0

[bug#69257] [PATCH 006/228] gnu: Add rust-cfg-vis-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-cfg-vis-0.3): Add variable.
---
 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 070f81a59e..6fad31fe04 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10654,6 +10654,29 @@ (define-public rust-cfg-if-0.1
        (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))))
 
+(define-public rust-cfg-vis-0.3
+  (package
+    (name "rust-cfg-vis")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cfg-vis" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1745qzkxar9yd3wy4gzzsakv1cjcibhgnr3m2p5f43y1byzw78n3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/TOETOE55/cfg-vis")
+    (synopsis "Macro to support `#[cfg()]` on visibility")
+    (description
+     "This package provides a macro to support `#[cfg()]` on visibility.")
+    (license license:expat)))
+
 (define-public rust-chan-0.1
   (package
     (name "rust-chan")
-- 
2.41.0

[bug#69257] [PATCH 007/228] gnu: Add rust-gloo-timers-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-gloo-timers-0.3): Add variable.
(rust-gloo-timers-0.2): Inherit from rust-gloo-timers-0.3.
---
 gnu/packages/crates-io.scm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6fad31fe04..a6de29f8ba 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27222,17 +27222,17 @@ (define-public rust-globwalk-0.8
 open file descriptors.")
     (license license:expat)))
 
-(define-public rust-gloo-timers-0.2
+(define-public rust-gloo-timers-0.3
   (package
     (name "rust-gloo-timers")
-    (version "0.2.1")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gloo-timers" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "07w999jm1r1i8r574qbmsa3l4w3gxhyx04cbllg0m4pzm934l827"))))
+        (base32 "1519157n7xppkk6pdw5w52vy1llzn5iljkqd7q1h5609jv7l7cdv"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -27240,7 +27240,7 @@ (define-public rust-gloo-timers-0.2
         ("rust-futures-core" ,rust-futures-core-0.3)
         ("rust-js-sys" ,rust-js-sys-0.3)
         ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
-        ("rust-web-sys" ,rust-web-sys-0.3))
+        ("rust-web-sys" ,rust-web-sys-0.3)) ; for rust-gloo-timers-0.2
        #:cargo-development-inputs
        (("rust-futures-util" ,rust-futures-util-0.3)
         ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
@@ -27252,6 +27252,19 @@ (define-public rust-gloo-timers-0.2
 timers.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gloo-timers-0.2
+  (package
+    (inherit rust-gloo-timers-0.3)
+    (name "rust-gloo-timers")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gloo-timers" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07w999jm1r1i8r574qbmsa3l4w3gxhyx04cbllg0m4pzm934l827"))))))
+
 (define-public rust-gmp-mpfr-sys-1
   (package
     (name "rust-gmp-mpfr-sys")
-- 
2.41.0

[bug#69257] [PATCH 008/228] gnu: Add rust-compiletest-rs-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-compiletest-rs-0.9): Add variable.
---
 gnu/packages/crates-io.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a6de29f8ba..51ab31cdb3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12890,6 +12890,19 @@ (define-public rust-compiletest-rs-0.10
 Rust compiler.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-compiletest-rs-0.9
+  (package
+    (inherit rust-compiletest-rs-0.10)
+    (name "rust-compiletest-rs")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "compiletest_rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0wmk12mb8xskdv5mf3p33l2w4w76bcxjx3zlwn94zslaf6xrnj3h"))))))
+
 (define-public rust-compiletest-rs-0.3
   (package
     (inherit rust-compiletest-rs-0.10)
-- 
2.41.0

[bug#69257] [PATCH 009/228] gnu: Add rust-proptest-derive-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-proptest-derive-0.4): Add variable.
(rust-proptest-derive-0.3): Inherit from rust-proptest-derive-0.4.
---
 gnu/packages/crates-io.scm | 44 +++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 51ab31cdb3..dcd373e4cb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50149,8 +50149,43 @@ (define-public rust-proptest-0.3
        #:cargo-development-inputs
        (("rust-regex" ,rust-regex-0.2))))))
 
+(define-public rust-proptest-derive-0.4
+  (package
+    (name "rust-proptest-derive")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "proptest-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vhb7zmnbmn0qvv6x7ibs88pg0mn6d3131c9qzlq982w80vn7wcw"))
+       (modules '((guix build utils)))
+       ;; Need never_type nightly feature.
+       (snippet '(begin (delete-file "tests/uninhabited-pass.rs")
+                        (delete-file "tests/enum.rs")
+                        (delete-file "tests/skip.rs")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags ; Tests panic for unknown reason.
+       '("--release" "--" "--skip=compile_test")
+       #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-compiletest-rs" ,rust-compiletest-rs-0.9)
+        ("rust-criterion" ,rust-criterion-0.5)
+        ("rust-proptest" ,rust-proptest-1))))
+    (home-page
+     "https://proptest-rs.github.io/proptest/proptest-derive/index.html")
+    (synopsis "Custom-derive for the Arbitrary trait of proptest")
+    (description "This package provides a custom-derive for the Arbitrary
+trait of proptest.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-proptest-derive-0.3
   (package
+    (inherit rust-proptest-derive-0.4)
     (name "rust-proptest-derive")
     (version "0.3.0")
     (source
@@ -50160,7 +50195,6 @@ (define-public rust-proptest-derive-0.3
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1p4x6k1zxq9lrpk46npdnzj6894mjx5bpwkwrdk63ird72an5d4h"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f          ; Needs nightly features.
        #:cargo-inputs
@@ -50170,13 +50204,7 @@ (define-public rust-proptest-derive-0.3
        #:cargo-development-inputs
        (("rust-compiletest-rs" ,rust-compiletest-rs-0.3)
         ("rust-criterion" ,rust-criterion-0.2)
-        ("rust-proptest" ,rust-proptest-1))))
-    (home-page
-     "https://altsysrq.github.io/proptest-book/proptest-derive/index.html")
-    (synopsis "Custom-derive for the Arbitrary trait of proptest")
-    (description "This package provides a Custom-derive for the Arbitrary
-trait of proptest.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-proptest" ,rust-proptest-1))))))
 
 (define-public rust-proptest-derive-0.1
   (package
-- 
2.41.0

[bug#69257] [PATCH 010/228] gnu: Add rust-bitmaps-3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-bitmaps-3): Add variable.
(rust-bitmaps-2): Inherit from rust-bitmaps-3.
---
 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 dcd373e4cb..c2cb078887 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7116,10 +7116,10 @@ (define-public rust-bitflags-0.2
     (build-system cargo-build-system)
     (arguments `(#:skip-build? #t))))
 
-(define-public rust-bitmaps-2
+(define-public rust-bitmaps-3
   (package
     (name "rust-bitmaps")
-    (version "2.1.0")
+    (version "3.2.1")
     (source
      (origin
        (method url-fetch)
@@ -7128,13 +7128,11 @@ (define-public rust-bitmaps-2
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "18k4mcwxl96yvii5kcljkpb8pg5j4jj1zbsdn26nsx4r83846403"))))
+         "1mivd3wyyham6c8y21nq3ka29am6v8hqn7lzmwf91aks2fq89l51"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-typenum" ,rust-typenum-1))
-       #:cargo-development-inputs
-       (("rust-proptest" ,rust-proptest-0.9)
+     `(#:cargo-development-inputs
+       (("rust-proptest" ,rust-proptest-1)
         ("rust-proptest-derive" ,rust-proptest-derive-0.1))))
     (home-page "https://github.com/bodil/bitmaps")
     (synopsis "Fixed size compact boolean array in Rust")
@@ -7142,6 +7140,27 @@ (define-public rust-bitmaps-2
 declaring and working with fixed size bitmaps in Rust.")
     (license license:mpl2.0)))
 
+(define-public rust-bitmaps-2
+  (package
+    (inherit rust-bitmaps-3)
+    (name "rust-bitmaps")
+    (version "2.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bitmaps" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "18k4mcwxl96yvii5kcljkpb8pg5j4jj1zbsdn26nsx4r83846403"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-typenum" ,rust-typenum-1))
+       #:cargo-development-inputs
+       (("rust-proptest" ,rust-proptest-0.9)
+        ("rust-proptest-derive" ,rust-proptest-derive-0.1))))))
+
 (define-public rust-bitpacking-0.8
   (package
     (name "rust-bitpacking")
-- 
2.41.0

[bug#69257] [PATCH 011/228] gnu: Add rust-imbl-sized-chunks-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-imbl-sized-chunks-0.1): Add variable.
---
 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 c2cb078887..4384aac6da 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29873,6 +29873,28 @@ (define-public rust-imara-diff-0.1
     (description "This package provides a minimal terminfo libary.")
     (license license:asl2.0)))
 
+(define-public rust-imbl-sized-chunks-0.1
+  (package
+    (name "rust-imbl-sized-chunks")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "imbl-sized-chunks" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qzdw55na2w6fd44p7y9rh05nxa98gzpaigmwg57sy7db3xhch0l"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1)
+                       ("rust-array-ops" ,rust-array-ops-0.1)
+                       ("rust-bitmaps" ,rust-bitmaps-3)
+                       ("rust-refpool" ,rust-refpool-0.4))))
+    (home-page "https://github.com/jneem/imbl-sized-chunks")
+    (synopsis "Sized chunk datatypes")
+    (description "This package provides sized chunk datatypes.")
+    (license license:mpl2.0)))
+
 (define-public rust-impl-codec-0.5
   (package
     (name "rust-impl-codec")
-- 
2.41.0

[bug#69257] [PATCH 012/228] gnu: Add rust-imbl-2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-imbl-2): Add variable.
---
 gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4384aac6da..6a3eea907e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29873,6 +29873,40 @@ (define-public rust-imara-diff-0.1
     (description "This package provides a minimal terminfo libary.")
     (license license:asl2.0)))
 
+(define-public rust-imbl-2
+  (package
+    (name "rust-imbl")
+    (version "2.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "imbl" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "11bhchs0d1bbbmr8ari4y4d62vqxs7xg4fkhjlhgbv98h0n193cp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1)
+                       ("rust-bitmaps" ,rust-bitmaps-3)
+                       ("rust-imbl-sized-chunks" ,rust-imbl-sized-chunks-0.1)
+                       ("rust-proptest" ,rust-proptest-1)
+                       ("rust-quickcheck" ,rust-quickcheck-1)
+                       ("rust-rand-core" ,rust-rand-core-0.6)
+                       ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.6)
+                       ("rust-rayon" ,rust-rayon-1)
+                       ("rust-refpool" ,rust-refpool-0.4)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-version-check" ,rust-version-check-0.9))
+       #:cargo-development-inputs
+       (("rust-metrohash" ,rust-metrohash-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-proptest" ,rust-proptest-derive-0.4))))
+
+    (home-page "https://github.com/jneem/imbl")
+    (synopsis "Immutable collection datatypes")
+    (description "This crate provides immutable collection datatypes.")
+    (license license:mpl2.0)))
+
 (define-public rust-imbl-sized-chunks-0.1
   (package
     (name "rust-imbl-sized-chunks")
-- 
2.41.0

[bug#69257] [PATCH 013/228] gnu: Place rust-uom-0.34 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-uom-0.34): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6a3eea907e..32d98757ea 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14770,40 +14770,6 @@ (define-public rust-cpuprofiler-0.0
     (description "This package provides bindings to Google's cpu profiler.")
     (license license:bsd-2)))
 
-(define-public rust-uom-0.34
-  (package
-    (name "rust-uom")
-    (version "0.34.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "uom" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "190n79b5ywa9w0j13ld0q6dphz7vzsjkwrpp8pjnwrczsvfhxxg8"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-num-complex" ,rust-num-complex-0.4)
-                       ("rust-num-rational" ,rust-num-rational-0.4)
-                       ("rust-num-traits" ,rust-num-traits-0.2)
-                       ("rust-typenum" ,rust-typenum-1)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-num-bigint" ,rust-num-bigint-0.4))
-       #:cargo-development-inputs (("rust-approx" ,rust-approx-0.5)
-                                   ("rust-quickcheck" ,rust-quickcheck-0.8)
-                                   ("rust-serde-json" ,rust-serde-json-1)
-                                   ("rust-static-assertions" ,rust-static-assertions-1))))
-    (home-page "https://github.com/iliekturtles/uom")
-    (synopsis "Units of measurement")
-    (description
-     "@code{uom} (Units of measurement) is a crate that does automatic type-safe
-zero-cost dimensional analysis.  You can create your own systems or use the pre-built
-International System of Units (SI) which is based on the International System of
-Quantities (ISQ) and includes numerous quantities (length, mass, time, ...) with
-conversion factors for even more numerous measurement units (meter, kilometer, foot,
-mile, ...).")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-cradle-0.2
   (package
     (name "rust-cradle")
@@ -75834,6 +75800,40 @@ (define-public rust-untrusted-0.6
        (sha256
         (base32 "0byf88b7ca1kb5aap8f6npp6xncvg95dnma8ipmnmd4n9r5izkam"))))))
 
+(define-public rust-uom-0.34
+  (package
+    (name "rust-uom")
+    (version "0.34.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "uom" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "190n79b5ywa9w0j13ld0q6dphz7vzsjkwrpp8pjnwrczsvfhxxg8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-num-complex" ,rust-num-complex-0.4)
+                       ("rust-num-rational" ,rust-num-rational-0.4)
+                       ("rust-num-traits" ,rust-num-traits-0.2)
+                       ("rust-typenum" ,rust-typenum-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-num-bigint" ,rust-num-bigint-0.4))
+       #:cargo-development-inputs (("rust-approx" ,rust-approx-0.5)
+                                   ("rust-quickcheck" ,rust-quickcheck-0.8)
+                                   ("rust-serde-json" ,rust-serde-json-1)
+                                   ("rust-static-assertions" ,rust-static-assertions-1))))
+    (home-page "https://github.com/iliekturtles/uom")
+    (synopsis "Units of measurement")
+    (description
+     "@code{uom} (Units of measurement) is a crate that does automatic type-safe
+zero-cost dimensional analysis.  You can create your own systems or use the pre-built
+International System of Units (SI) which is based on the International System of
+Quantities (ISQ) and includes numerous quantities (length, mass, time, ...) with
+conversion factors for even more numerous measurement units (meter, kilometer, foot,
+mile, ...).")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-ureq-2
   (package
     (name "rust-ureq")
-- 
2.41.0

[bug#69257] [PATCH 014/228] gnu: Place rust-thousands-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-thousands-0.2): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 32d98757ea..09113a8fc1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37654,25 +37654,6 @@ (define-public rust-merlin-2
 non-interactive protocols can be implemented as if they were interactive.")
     (license license:expat)))
 
-(define-public rust-thousands-0.2
-  (package
-    (name "rust-thousands")
-    (version "0.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "thousands" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0848gnkn7ah51lrx15z9zmn701ipn6gc4xbk4kfdlfahkypkpxiv"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t))
-    (home-page "https://github.com/tov/thousands-rs")
-    (synopsis "Adds digit separators to numerals, configurably.")
-    (description "This package provides thousand separators for numerals.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-twox-hash-1
   (package
     (name "rust-twox-hash")
@@ -69982,6 +69963,25 @@ (define-public rust-thiserror-impl-1
 @code{thiserror} crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-thousands-0.2
+  (package
+    (name "rust-thousands")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "thousands" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0848gnkn7ah51lrx15z9zmn701ipn6gc4xbk4kfdlfahkypkpxiv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://github.com/tov/thousands-rs")
+    (synopsis "Adds digit separators to numerals, configurably.")
+    (description "This package provides thousand separators for numerals.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-thread-id-4
   (package
     (name "rust-thread-id")
-- 
2.41.0

[bug#69257] [PATCH 015/228] gnu: Place rust-twox-hash-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-twox-hash-1): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 09113a8fc1..15ca3e7645 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37654,35 +37654,6 @@ (define-public rust-merlin-2
 non-interactive protocols can be implemented as if they were interactive.")
     (license license:expat)))
 
-(define-public rust-twox-hash-1
-  (package
-    (name "rust-twox-hash")
-    (version "1.6.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "twox-hash" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0xgn72j36a270l5ls1jk88n7bmq2dhlfkbhdh5554hbagjsydzlp"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-0.1)
-        ("rust-digest" ,rust-digest-0.8)
-        ("rust-digest" ,rust-digest-0.9)
-        ("rust-digest" ,rust-digest-0.10)
-        ("rust-rand" ,rust-rand-0.8)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-static-assertions" ,rust-static-assertions-1))
-       #:cargo-development-inputs
-       (("rust-serde-json" ,rust-serde-json-1))))
-    (home-page "https://github.com/shepmaster/twox-hash")
-    (synopsis "Rust implementation of the XXHash and XXH3 algorithms")
-    (description "This package provides a Rust implementation of the XXHash
-and XXH3 algorithms.")
-    (license license:expat)))
-
 (define-public rust-metrics-macros-0.2
   (package
     (name "rust-metrics-macros")
@@ -74532,6 +74503,35 @@ (define-public rust-twoway-0.1
         (base32
 		"1lbf64snscr3vz71jbl6i2c8zr2ndsiqbk6316z39fj1a8mipcar"))))))
 
+(define-public rust-twox-hash-1
+  (package
+    (name "rust-twox-hash")
+    (version "1.6.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "twox-hash" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xgn72j36a270l5ls1jk88n7bmq2dhlfkbhdh5554hbagjsydzlp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-0.1)
+        ("rust-digest" ,rust-digest-0.8)
+        ("rust-digest" ,rust-digest-0.9)
+        ("rust-digest" ,rust-digest-0.10)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-static-assertions" ,rust-static-assertions-1))
+       #:cargo-development-inputs
+       (("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/shepmaster/twox-hash")
+    (synopsis "Rust implementation of the XXHash and XXH3 algorithms")
+    (description "This package provides a Rust implementation of the XXHash
+and XXH3 algorithms.")
+    (license license:expat)))
+
 (define-public rust-typeable-0.1
   (package
     (name "rust-typeable")
-- 
2.41.0

[bug#69257] [PATCH 016/228] gnu: Add rust-stream-assert-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-stream-assert-0.1): Add variable.

Change-Id: I72be17c1d6aa15fbb6b7251c4e85461f99b4c47b
---
 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 15ca3e7645..9e0d53ae5f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64937,6 +64937,26 @@ (define-public rust-str-buf-1
     (description "This package provides a static string buffer.")
     (license license:boost1.0)))
 
+(define-public rust-stream-assert-0.1
+  (package
+    (name "rust-stream-assert")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "stream_assert" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15jbd1wzd1pl7mc7wkhrcnj5km4bv51gng664w23y0f9ff56gavz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3))))
+    (home-page "https://codeberg.org/jplatte/stream_assert")
+    (synopsis "Macros to simplify testing of `Stream` based APIs")
+    (description "This package provides macros to simplify testing of
+`Stream` based APIs.")
+    (license license:mpl2.0)))
+
 (define-public rust-streaming-decompression-0.1
   (package
     (name "rust-streaming-decompression")
-- 
2.41.0

[bug#69257] [PATCH 017/228] gnu: Add rust-branches-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-branches-0.1): Add variable.

Change-Id: I5e058f07ceff79965473f27f3a22aa98cb0151a3
---
 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 9e0d53ae5f..70bba96064 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7866,6 +7866,26 @@ (define-public rust-boxxy-0.12
         ("rust-rustls" ,rust-rustls-0.16)
         ("rust-sha2" ,rust-sha2-0.9))))))
 
+(define-public rust-branches-0.1
+  (package
+    (name "rust-branches")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "branches" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0alxmzmms4s8vv1v94y2kdq49a4p7728fgkpxx36z2m092bznn3r"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/fereidani/branches")
+    (synopsis
+     "Branch hinting prediction and control functions for stable Rust including likely, unlikely, assume and abort to help algorithm optimization")
+    (description
+     "Branch hinting prediction and control functions for stable Rust including
+likely, unlikely, assume and abort to help algorithm optimization")
+    (license license:expat)))
+
 (define-public rust-bresenham-0.1
   (package
     (name "rust-bresenham")
-- 
2.41.0

[bug#69257] [PATCH 018/228] gnu: Place rust-rusticata-macros-4 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-rusticata-macros-4): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 70bba96064..963483ac9b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16261,28 +16261,6 @@ (define-public rust-rt-format-0.3
 character.")
     (license license:asl2.0)))
 
-(define-public rust-rusticata-macros-4
-  (package
-    (name "rust-rusticata-macros")
-    (version "4.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rusticata-macros" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "03dmfxhgwzpm1360iwcpcg3y18ddgya0i0hc599am212pdvj7ib5"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-nom" ,rust-nom-7))))
-    (home-page "https://github.com/rusticata/rusticata-macros")
-    (synopsis "Helper macros for Rusticata")
-    (description "Helper macros for Rusticata.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-cssparser-0.29
   (package
     (name "rust-cssparser")
@@ -57556,6 +57534,28 @@ (define-public rust-rustfix-0.4
         `(("rust-failure" ,rust-failure-0.1)
           ,@(alist-delete "rust-anyhow" cargo-inputs)))))))
 
+(define-public rust-rusticata-macros-4
+  (package
+    (name "rust-rusticata-macros")
+    (version "4.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rusticata-macros" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "03dmfxhgwzpm1360iwcpcg3y18ddgya0i0hc599am212pdvj7ib5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-nom" ,rust-nom-7))))
+    (home-page "https://github.com/rusticata/rusticata-macros")
+    (synopsis "Helper macros for Rusticata")
+    (description "Helper macros for Rusticata.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rustix-0.38
   (package
     (name "rust-rustix")
-- 
2.41.0

[bug#69257] [PATCH 019/228] gnu: Place rust-rpds-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-rpds-1): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 963483ac9b..36ba96cedb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55442,6 +55442,33 @@ (define-public rust-rowan-0.15
      "This package provides a library for generic lossless syntax trees.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rpds-1
+  (package
+    (name "rust-rpds")
+    (version "1.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rpds" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "194hjbsicmgqi3dyllqrz09mmhh597m2j9l49lr16cyfscambqd0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-archery" ,rust-archery-1)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-criterion" ,rust-criterion-0.5)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-static-assertions" ,rust-static-assertions-1))))
+    (home-page "https://github.com/orium/rpds")
+    (synopsis "Persistent data structures with structural sharing")
+    (description "This package provides support for fully persistent data
+structures with structural sharing.")
+    (license license:mpl2.0)))
+
 (define-public rust-rspec-1
   (package
     (name "rust-rspec")
@@ -56250,33 +56277,6 @@ (define-public rust-rpassword-5
        (("rust-libc" ,rust-libc-0.2)
         ("rust-winapi" ,rust-winapi-0.3))))))
 
-(define-public rust-rpds-1
-  (package
-    (name "rust-rpds")
-    (version "1.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rpds" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "194hjbsicmgqi3dyllqrz09mmhh597m2j9l49lr16cyfscambqd0"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-archery" ,rust-archery-1)
-                       ("rust-serde" ,rust-serde-1))
-       #:cargo-development-inputs
-       (("rust-bincode" ,rust-bincode-1)
-        ("rust-criterion" ,rust-criterion-0.5)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
-        ("rust-rand" ,rust-rand-0.8)
-        ("rust-static-assertions" ,rust-static-assertions-1))))
-    (home-page "https://github.com/orium/rpds")
-    (synopsis "Persistent data structures with structural sharing")
-    (description "This package provides support for fully persistent data
-structures with structural sharing.")
-    (license license:mpl2.0)))
-
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH 020/228] gnu: Place rust-rpassword-5 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-rpassword-5): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 36ba96cedb..bd4b2f7fe8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55442,6 +55442,23 @@ (define-public rust-rowan-0.15
      "This package provides a library for generic lossless syntax trees.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rpassword-5
+  (package
+    (inherit rust-rpassword-6)
+    (name "rust-rpassword")
+    (version "5.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rpassword" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yry1kmgjcb4qd5wak91203493x42ak3dz9hy1c0r9kyib7kdjgz"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-winapi" ,rust-winapi-0.3))))))
+
 (define-public rust-rpds-1
   (package
     (name "rust-rpds")
@@ -56260,23 +56277,6 @@ (define-public rust-rpassword-6
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-winapi" ,rust-winapi-0.3))))))
 
-(define-public rust-rpassword-5
-  (package
-    (inherit rust-rpassword-6)
-    (name "rust-rpassword")
-    (version "5.0.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rpassword" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1yry1kmgjcb4qd5wak91203493x42ak3dz9hy1c0r9kyib7kdjgz"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-winapi" ,rust-winapi-0.3))))))
-
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH 021/228] gnu: Place rust-rpassword-6 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-rpassword-6): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bd4b2f7fe8..3d9779651b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55442,6 +55442,25 @@ (define-public rust-rowan-0.15
      "This package provides a library for generic lossless syntax trees.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rpassword-6
+  (package
+    (inherit rust-rpassword-7)
+    (name "rust-rpassword")
+    (version "6.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rpassword" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0mnrpxvai78mn9wqkqx8wp1gd280jjhn29ixd1dm84l6i2hrkw1b"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-winapi" ,rust-winapi-0.3))))))
+
 (define-public rust-rpassword-5
   (package
     (inherit rust-rpassword-6)
@@ -56258,25 +56277,6 @@ (define-public rust-rpassword-7
 console applications.")
     (license license:asl2.0)))
 
-(define-public rust-rpassword-6
-  (package
-    (inherit rust-rpassword-7)
-    (name "rust-rpassword")
-    (version "6.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "rpassword" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0mnrpxvai78mn9wqkqx8wp1gd280jjhn29ixd1dm84l6i2hrkw1b"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-winapi" ,rust-winapi-0.3))))))
-
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH 022/228] gnu: Place rust-rpassword-7 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-rpassword-7): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3d9779651b..3bd7747095 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55442,6 +55442,29 @@ (define-public rust-rowan-0.15
      "This package provides a library for generic lossless syntax trees.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rpassword-7
+  (package
+    (name "rust-rpassword")
+    (version "7.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rpassword" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "08l3jbjwpsj6awm4lacm2bcj3cn9jhy4j6q21n68k49lmdiwyy36"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-rtoolbox" ,rust-rtoolbox-0.0.1)
+        ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/conradkleinespel/rpassword")
+    (synopsis "Read passwords in Rust console applications")
+    (description "This package provides a crate for reading passwords in
+console applications.")
+    (license license:asl2.0)))
+
 (define-public rust-rpassword-6
   (package
     (inherit rust-rpassword-7)
@@ -56254,29 +56277,6 @@ (define-public rust-rug-1
 floating-point, and complex numbers based on GMP, MPFR and MPC.")
     (license license:lgpl3+)))
 
-(define-public rust-rpassword-7
-  (package
-    (name "rust-rpassword")
-    (version "7.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "rpassword" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "08l3jbjwpsj6awm4lacm2bcj3cn9jhy4j6q21n68k49lmdiwyy36"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-rtoolbox" ,rust-rtoolbox-0.0.1)
-        ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/conradkleinespel/rpassword")
-    (synopsis "Read passwords in Rust console applications")
-    (description "This package provides a crate for reading passwords in
-console applications.")
-    (license license:asl2.0)))
-
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH 023/228] gnu: Place rust-rt-format-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-rt-format-0.3): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3bd7747095..dbc3a35ab9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16235,32 +16235,6 @@ (define-public rust-rtoolbox-0.0.1
 backwards compatibility guarantees.")
     (license license:asl2.0)))
 
-(define-public rust-rt-format-0.3
-  (package
-    (name "rust-rt-format")
-    (version "0.3.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rt-format" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1qjjwh9ny95xck1kp99gi6hfm9glrx54jx8npnj6yccxc7p7q225"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-regex" ,rust-regex-1))))
-    (home-page "https://github.com/vstojkovic/rt-format")
-    (synopsis "Runtime equivalent of the Rust format! macro")
-    (description "This package provides a runtime equivalent of the Rust
-format! macro. It allows formatting strings like the format! macro, with the
-formatting string and the arguments provided at runtime.  This crate supports
-all the formatting features of the format! macro, except for the fill
-character.")
-    (license license:asl2.0)))
-
 (define-public rust-cssparser-0.29
   (package
     (name "rust-cssparser")
@@ -56204,6 +56178,32 @@ (define-public rust-rstest-test-0.9
         ("rust-rstest" ,rust-rstest-0.15)
         ("rust-temp-testdir" ,rust-temp-testdir-0.2))))))
 
+(define-public rust-rt-format-0.3
+  (package
+    (name "rust-rt-format")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rt-format" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qjjwh9ny95xck1kp99gi6hfm9glrx54jx8npnj6yccxc7p7q225"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/vstojkovic/rt-format")
+    (synopsis "Runtime equivalent of the Rust format! macro")
+    (description "This package provides a runtime equivalent of the Rust
+format! macro. It allows formatting strings like the format! macro, with the
+formatting string and the arguments provided at runtime.  This crate supports
+all the formatting features of the format! macro, except for the fill
+character.")
+    (license license:asl2.0)))
+
 (define-public rust-rtnetlink-0.14
   (package
     (name "rust-rtnetlink")
-- 
2.41.0

[bug#69257] [PATCH 024/228] gnu: Place rust-rtoolbox-0.0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-rtoolbox-0.0.1): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dbc3a35ab9..a1abbc2b04 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16210,31 +16210,6 @@ (define-public rust-roxmltree-0.14
      "@code{roxmltree} represents an XML 1.0 document as a read-only tree.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-rtoolbox-0.0.1
-  (package
-    (name "rust-rtoolbox")
-    (version "0.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "rtoolbox" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0jjjngwn1fa39kschc8zb4hynp4b0jdind7z225cph7m2k2j4kh3"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "")
-    (synopsis "Utility functions for other crates")
-    (description
-     "This package provides utility functions for other crates with no
-backwards compatibility guarantees.")
-    (license license:asl2.0)))
-
 (define-public rust-cssparser-0.29
   (package
     (name "rust-cssparser")
@@ -56245,6 +56220,31 @@ (define-public rust-rtnetlink-0.14
 protocol.")
     (license license:expat)))
 
+(define-public rust-rtoolbox-0.0.1
+  (package
+    (name "rust-rtoolbox")
+    (version "0.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rtoolbox" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0jjjngwn1fa39kschc8zb4hynp4b0jdind7z225cph7m2k2j4kh3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "")
+    (synopsis "Utility functions for other crates")
+    (description
+     "This package provides utility functions for other crates with no
+backwards compatibility guarantees.")
+    (license license:asl2.0)))
+
 (define-public rust-rug-1
   (package
     (name "rust-rug")
-- 
2.41.0

[bug#69257] [PATCH 025/228] gnu: Place rust-roxmltree-0.14 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-roxmltree-0.14): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a1abbc2b04..71453a775e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16188,28 +16188,6 @@ (define-public rust-rodio-0.15
 many formats including AAC, FLAC, MP3, MP4 and WAV.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-roxmltree-0.14
-  (package
-    (name "rust-roxmltree")
-    (version "0.14.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "roxmltree" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "010mahzyarkzb7kaawgga1a9y46nsp209yh2i4g4pq98bg8afn5z"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-xmlparser" ,rust-xmlparser-0.13))))
-    (home-page "https://github.com/RazrFalcon/roxmltree")
-    (synopsis "Represent an XML as a read-only tree")
-    (description
-     "@code{roxmltree} represents an XML 1.0 document as a read-only tree.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-cssparser-0.29
   (package
     (name "rust-cssparser")
@@ -55391,6 +55369,28 @@ (define-public rust-rowan-0.15
      "This package provides a library for generic lossless syntax trees.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-roxmltree-0.14
+  (package
+    (name "rust-roxmltree")
+    (version "0.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "roxmltree" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "010mahzyarkzb7kaawgga1a9y46nsp209yh2i4g4pq98bg8afn5z"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-xmlparser" ,rust-xmlparser-0.13))))
+    (home-page "https://github.com/RazrFalcon/roxmltree")
+    (synopsis "Represent an XML as a read-only tree")
+    (description
+     "@code{roxmltree} represents an XML 1.0 document as a read-only tree.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rpassword-7
   (package
     (name "rust-rpassword")
-- 
2.41.0

[bug#69257] [PATCH 026/228] gnu: Place rust-rodio-0.15 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-rodio-0.15): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 71453a775e..348d46145e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16160,34 +16160,6 @@ (define-public rust-crunchy-0.2
 number ``crunching``.")
     (license license:expat)))
 
-(define-public rust-rodio-0.15
-  (package
-    (name "rust-rodio")
-    (version "0.15.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rodio" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "07kkrx0hxfcqgkpg0lrh9355bj1rl0k65nwsk3qwdri6yvlkj2gc"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-claxon" ,rust-claxon-0.4)
-                       ("rust-cpal" ,rust-cpal-0.13)
-                       ("rust-hound" ,rust-hound-3)
-                       ("rust-lewton" ,rust-lewton-0.10)
-                       ("rust-minimp3" ,rust-minimp3-0.5)
-                       ("rust-symphonia" ,rust-symphonia-0.4))
-       #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.9))))
-    (native-inputs (list pkg-config))
-    (inputs (list alsa-lib))
-    (home-page "https://github.com/RustAudio/rodio")
-    (synopsis "Pure Rust audio playback library")
-    (description "Audio playback library written in pure Rust that supports
-many formats including AAC, FLAC, MP3, MP4 and WAV.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-cssparser-0.29
   (package
     (name "rust-cssparser")
@@ -55135,6 +55107,34 @@ (define-public rust-roadmap-0.5
     (description "Model a project roadmap as a directed acyclic graph.")
     (license license:expat-0)))
 
+(define-public rust-rodio-0.15
+  (package
+    (name "rust-rodio")
+    (version "0.15.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rodio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07kkrx0hxfcqgkpg0lrh9355bj1rl0k65nwsk3qwdri6yvlkj2gc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-claxon" ,rust-claxon-0.4)
+                       ("rust-cpal" ,rust-cpal-0.13)
+                       ("rust-hound" ,rust-hound-3)
+                       ("rust-lewton" ,rust-lewton-0.10)
+                       ("rust-minimp3" ,rust-minimp3-0.5)
+                       ("rust-symphonia" ,rust-symphonia-0.4))
+       #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.9))))
+    (native-inputs (list pkg-config))
+    (inputs (list alsa-lib))
+    (home-page "https://github.com/RustAudio/rodio")
+    (synopsis "Pure Rust audio playback library")
+    (description "Audio playback library written in pure Rust that supports
+many formats including AAC, FLAC, MP3, MP4 and WAV.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-roff-0.2
   (package
     (name "rust-roff")
-- 
2.41.0

[bug#69257] [PATCH 027/228] gnu: Add rust-rclite-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rclite-0.2): Add variable.

Change-Id: I5e058f07ceff79965473f27f3a22aa98cb0151a3
---
 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 348d46145e..f77ebc4520 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53847,6 +53847,29 @@ (define-public rust-rayon-core-1
     (description "This package provides core APIs for Rayon.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-rclite-0.2
+  (package
+    (name "rust-rclite")
+    (version "0.2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rclite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1fa379adiwincgywigi341zd969d3459ljq71n5ymwwficp0r7zf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-branches" ,rust-branches-0.1))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4)
+                                   ("rust-rayon" ,rust-rayon-1))))
+    (home-page "https://github.com/fereidani/rclite")
+    (synopsis "Reference counting compatible with Arc and Rc APIs")
+    (description
+     "This package provides reference counting, which is compatible with
+Arc and Rc APIs.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rctree-0.5
   (package
     (name "rust-rctree")
-- 
2.41.0

[bug#69257] [PATCH 028/228] gnu: Add rust-readlock-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-readlock-0.1): Add variable.

Change-Id: I5e058f07ceff79965473f27f3a22aa98cb0151a3
---
 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 f77ebc4520..b2cd3a7c9d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53926,6 +53926,26 @@ (define-public rust-rdrand-0.4
 @code{rdrand} and @code{rdseed} instructions")
     (license license:isc)))
 
+(define-public rust-readlock-0.1
+  (package
+    (name "rust-readlock")
+    (version "0.1.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "readlock" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18l0la7zxavbw1ppfigq84f994lyw65rbpl4hlf5gakd37kj7cyp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-rclite" ,rust-rclite-0.2))))
+    (home-page "https://github.com/jplatte/readlock")
+    (synopsis "Weird alternative to Arc<RwLock<T>>")
+    (description
+     "This package provides a weird alternative to @code{Arc<RwLock<T>>}.")
+    (license license:mpl2.0)))
+
 (define-public rust-recycler-0.1
   (package
     (name "rust-recycler")
-- 
2.41.0

[bug#69257] [PATCH 029/228] gnu: Add rust-readlock-tokio-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-readlock-tokio-0.1): Add variable.

Change-Id: Ic55945c3d2b7c69c6940b6a5607e2e7241f96a88
---
 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 b2cd3a7c9d..5e2af7f03a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53946,6 +53946,29 @@ (define-public rust-readlock-0.1
      "This package provides a weird alternative to @code{Arc<RwLock<T>>}.")
     (license license:mpl2.0)))
 
+(define-public rust-readlock-tokio-0.1
+  (package
+    (name "rust-readlock-tokio")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "readlock-tokio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zc356rp6x0imb4rq2jyq238lv065h4gnyr7zsh3c6aj0s4kd8zv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-rclite" ,rust-rclite-0.2)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/jplatte/readlock")
+    (synopsis "Weird alternative to Arc<RwLock<T>> using tokio's RwLock")
+    (description
+     "This package provides a weird alternative to Arc<@code{RwLock<T>>},
+using tokio's @code{RwLock}")
+    (license license:mpl2.0)))
+
 (define-public rust-recycler-0.1
   (package
     (name "rust-recycler")
-- 
2.41.0

[bug#69257] [PATCH 030/228] gnu: Add rust-eyeball-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-eyeball-0.8): Add variable.
---
 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 5e2af7f03a..edb8059b29 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22524,6 +22524,33 @@ (define-public rust-expectrl-0.7
 like Don libes expect.")
     (license license:expat)))
 
+(define-public rust-eyeball-0.8
+  (package
+    (name "rust-eyeball")
+    (version "0.8.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "eyeball" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yw01cm6316xrq26nz3nhlvnsfahc96j692brrai04c2v69jhj22"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-criterion" ,rust-criterion-0.5)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-readlock" ,rust-readlock-0.1)
+                       ("rust-readlock-tokio" ,rust-readlock-tokio-0.1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-util" ,rust-tokio-util-0.7)
+                       ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-stream-assert" ,rust-stream-assert-0.1))))
+    (home-page "https://github.com/jplatte/eyeball")
+    (synopsis "Add observability to your Rust types")
+    (description "Add observability to your Rust types!")
+    (license license:mpl2.0)))
+
 (define-public rust-eyre-0.6
   (package
     (name "rust-eyre")
-- 
2.41.0

[bug#69257] [PATCH 031/228] gnu: Add rust-eyeball-im-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-eyeball-im-0.4): Add variable.
---
 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 edb8059b29..a3d09066f9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22551,6 +22551,31 @@ (define-public rust-eyeball-0.8
     (description "Add observability to your Rust types!")
     (license license:mpl2.0)))
 
+(define-public rust-eyeball-im-0.4
+  (package
+    (name "rust-eyeball-im")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "eyeball-im" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0pb2dmqji80hj1c7skk5pg0w64lsqaanmm8ngf3fa2v7v4lsn7q2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-imbl" ,rust-imbl-2)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-util" ,rust-tokio-util-0.7)
+                       ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-stream-assert" ,rust-stream-assert-0.1))))
+    (home-page "https://github.com/jplatte/eyeball")
+    (synopsis "Observable collections based on the `im` crate")
+    (description "Observable collections based on the `im` crate.")
+    (license license:mpl2.0)))
+
 (define-public rust-eyre-0.6
   (package
     (name "rust-eyre")
-- 
2.41.0

[bug#69257] [PATCH 032/228] gnu: Add rust-eyeball-im-util-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-eyeball-im-util-0.5): Add variable.
---
 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 a3d09066f9..656a7d53d4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22576,6 +22576,32 @@ (define-public rust-eyeball-im-0.4
     (description "Observable collections based on the `im` crate.")
     (license license:mpl2.0)))
 
+(define-public rust-eyeball-im-util-0.5
+  (package
+    (name "rust-eyeball-im-util")
+    (version "0.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "eyeball-im-util" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14qlad47ywi4xfzmi64jp8b7z78z1vzc2vajiv76vf39jkizfhy2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.7)
+                       ("rust-eyeball" ,rust-eyeball-0.8)
+                       ("rust-eyeball-im" ,rust-eyeball-im-0.4)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-imbl" ,rust-imbl-2)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2))
+       #:cargo-development-inputs
+       (("rust-stream-assert" ,rust-stream-assert-0.1))))
+    (home-page "https://github.com/jplatte/eyeball")
+    (synopsis "Helpful utilities for `eyeball-im`")
+    (description "Helpful utilities for `eyeball-im`.")
+    (license license:mpl2.0)))
+
 (define-public rust-eyre-0.6
   (package
     (name "rust-eyre")
-- 
2.41.0

[bug#69257] [PATCH 033/228] gnu: Add rust-k256-0.13.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-k256-0.13): Add variable.

Change-Id: I674837d219efcb665b3733104df7ddbaeecf56dd
---
 gnu/packages/crates-crypto.scm | 43 ++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index d4205f7d70..23500388f9 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2023 Steve George <steve@futurile.net>
 ;;; Copyright © 2023 VÖRÖSKŐI András <voroskoi@gmail.com>
 ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
+;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2520,6 +2521,48 @@ (define-public rust-hmac-sha1-0.1
 Hash-based Message Authentication Code algorithm} for SHA1.")
     (license license:bsd-3)))
 
+(define-public rust-k256-0.13
+  (package
+    (name "rust-k256")
+    (version "0.13.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "k256" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ysq18pjz040am5llgly90464x7qqq98yxfbcsladq96gsvgjvwm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-ecdsa" ,rust-ecdsa-0.16)
+                       ("rust-elliptic-curve" ,rust-elliptic-curve-0.13)
+                       ("rust-hex-literal" ,rust-hex-literal-0.4)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-serdect" ,rust-serdect-0.2)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-signature" ,rust-signature-2))
+       #:cargo-development-inputs (("rust-blobby" ,rust-blobby-0.3)
+                                   ("rust-criterion" ,rust-criterion-0.5)
+                                   ("rust-ecdsa" ,rust-ecdsa-0.16)
+                                   ("rust-hex-literal" ,rust-hex-literal-0.4)
+                                   ("rust-num-bigint" ,rust-num-bigint-0.4)
+                                   ("rust-num-traits" ,rust-num-traits-0.2)
+                                   ("rust-proptest" ,rust-proptest-1)
+                                   ("rust-rand-core" ,rust-rand-core-0.6)
+                                   ("rust-sha3" ,rust-sha3-0.10))))
+    (home-page
+     "https://github.com/RustCrypto/elliptic-curves/tree/master/k256")
+    (synopsis "Library supporting ECDSA, BIP340, ECDH and general-purpose
+seckp256k1 elliptic curve group operations")
+    (description
+     "This package provides a secp256k1 elliptic curve library written in
+pure Rust with support for ECDSA signing/verification/public-key recovery,
+Taproot Schnorr signatures (BIP340), Elliptic Curve Diffie-Hellman (ECDH),
+and general-purpose secp256k1 elliptic curve group operations which can be
+used to implement arbitrary protocols.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-kuznyechik-0.8
   (package
     (name "rust-kuznyechik")
-- 
2.41.0

[bug#69257] [PATCH 034/228] gnu: Add rust-mas-iana-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-mas-iana-0.7): Add variable.
---
 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 656a7d53d4..c445ce721d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36761,6 +36761,27 @@ (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-mas-iana-0.7
+  (package
+    (name "rust-mas-iana")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mas-iana" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18yz6lv54crny8nmx4dpy3j2j00v8s80zsczzcg4fh1jyw6q4j0w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-schemars" ,rust-schemars-0.8)
+                       ("rust-serde" ,rust-serde-1))))
+    (home-page "https://matrix-org.github.io/matrix-authentication-service/")
+    (synopsis "IANA registry data for JOSE and OAuth 2.0")
+    (description "This package provides IANA registry data for JOSE and
+OAuth 2.0.")
+    (license license:asl2.0)))
+
 (define-public rust-matchit-0.7
   (package
     (name "rust-matchit")
-- 
2.41.0

[bug#69257] [PATCH 035/228] gnu: Add rust-mas-jose-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-mas-jose-0.7): Add variable.

Change-Id: I0dcfde2c155ca3f6c4ad7572f322e1ab5db32662
---
 gnu/packages/crates-crypto.scm | 45 ++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 23500388f9..599fdd3a8c 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -2585,6 +2585,51 @@ (define-public rust-kuznyechik-0.8
     (description "Kuznyechik (GOST R 34.12-2015) block cipher")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-mas-jose-0.7
+  (package
+    (name "rust-mas-jose")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mas-jose" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0x1cikddf2z3994374ql0qs02l9mxrlb74cy4pbq3yrlzcfjb6mk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-base64ct" ,rust-base64ct-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-digest" ,rust-digest-0.10)
+                       ("rust-ecdsa" ,rust-ecdsa-0.16)
+                       ("rust-elliptic-curve" ,rust-elliptic-curve-0.13)
+                       ("rust-generic-array" ,rust-generic-array-0.14)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-k256" ,rust-k256-0.13)
+                       ("rust-mas-iana" ,rust-mas-iana-0.7)
+                       ("rust-p256" ,rust-p256-0.13)
+                       ("rust-p384" ,rust-p384-0.13)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rsa" ,rust-rsa-0.9)
+                       ("rust-schemars" ,rust-schemars-0.8)
+                       ("rust-sec1" ,rust-sec1-0.7)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-serde-with" ,rust-serde-with-3)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-signature" ,rust-signature-2)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-insta" ,rust-insta-1)
+        ("rust-rand-chacha" ,rust-rand-chacha-0.3))))
+    (home-page "https://matrix-org.github.io/matrix-authentication-service/")
+    (synopsis "JSON Object Signing and Encryption (JWT & co.) utilities")
+    (description "This package provides JSON Object Signing and Encryption
+(JWT & co.) utilities.")
+    (license license:asl2.0)))
+
 (define-public rust-md-5-0.10
   (package
     (name "rust-md-5")
-- 
2.41.0

[bug#69257] [PATCH 036/228] gnu: Add rust-structmeta-derive-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-structmeta-derive-0.2): Add variable.
(rust-structmeta-derive-0.1): Inherit rust-structmeta-derive-0.2.
---
 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 c445ce721d..0c7fb96b31 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65635,8 +65635,32 @@ (define-public rust-structmeta-0.1
 defining a struct.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-structmeta-derive-0.2
+  (package
+    (name "rust-structmeta-derive")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "structmeta-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "005ybz4ha874w81pg15n00p01m9hir1dpl8p0352s1wpfgzwl2x6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs (("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/frozenlib/structmeta")
+    (synopsis "Derive macro for structmeta crate")
+    (description
+      "This package provides a derive macro for the structmeta crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-structmeta-derive-0.1
   (package
+    (inherit rust-structmeta-derive-0.2)
     (name "rust-structmeta-derive")
     (version "0.1.6")
     (source (origin
@@ -65646,17 +65670,11 @@ (define-public rust-structmeta-derive-0.1
               (sha256
                (base32
                 "14vxik2m3dm7bwx016qfz062fwznkbq02fyq8vby545m0pj0nhi4"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/frozenlib/structmeta")
-    (synopsis "Derive macro for structmeta crate")
-    (description "This package lets you parse Rust's attribute arguments by
-defining a struct.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-structopt-0.3
   (package
-- 
2.41.0

[bug#69257] [PATCH 037/228] gnu: Add rust-structmeta-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-structmeta-0.2): Add variable.
(rust-structmeta-0.1): Inherit rust-structmeta-0.2.
---
 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 0c7fb96b31..5de186c092 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65611,8 +65611,33 @@ (define-public rust-strsim-0.5
         (base32
          "0z3zzvmilfldp4xw42qbkjf901dcnbk58igrzsvivydjzd24ry37"))))))
 
+(define-public rust-structmeta-0.2
+  (package
+    (name "rust-structmeta")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "structmeta" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0bcj4c2p2j091mn9ld2hbcx77flqjx65ihb9gbb5c12gal4rxbbq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-structmeta-derive" ,rust-structmeta-derive-0.2)
+                       ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs (("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/frozenlib/structmeta")
+    (synopsis "Parse Rust's attribute arguments by defining a struct.")
+    (description "This package lets you parse Rust's attribute arguments by
+defining a struct.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-structmeta-0.1
   (package
+    (inherit rust-structmeta-0.2)
     (name "rust-structmeta")
     (version "0.1.6")
     (source (origin
@@ -65622,18 +65647,12 @@ (define-public rust-structmeta-0.1
               (sha256
                (base32
                 "0alyl12b7fab8izrpliil73sxs1ivr5vm0pisallmxlb4zb44j0h"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-structmeta-derive" ,rust-structmeta-derive-0.1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/frozenlib/structmeta")
-    (synopsis "Parse Rust's attribute arguments by defining a struct.")
-    (description "This package lets you parse Rust's attribute arguments by
-defining a struct.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-structmeta-derive-0.2
   (package
-- 
2.41.0

[bug#69257] [PATCH 038/228] gnu: Add rust-parse-display-derive-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-parse-display-derive-0.8): Add
variable.
---
 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 5de186c092..fc2a6faf88 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45671,6 +45671,35 @@ (define-public rust-parquet2-0.6
 parallelism and safety in mind.")
     (license license:asl2.0)))
 
+(define-public rust-parse-display-derive-0.8
+  (package
+    (name "rust-parse-display-derive")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "parse-display-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hgkhjnk0xlaixql207p7vvg41vyq7y7gdqdijh8vxysr297hlb8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-regex-syntax" ,rust-regex-syntax-0.7)
+                       ("rust-structmeta" ,rust-structmeta-0.2)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/frozenlib/parse-display")
+    (synopsis
+     "Procedural macro to implement Display and FromStr using common
+settings")
+    (description
+     "This package provides a procedural macro to implement @code{Display}
+and @code{FromStr} using common settings.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-parse-zoneinfo-0.3
   (package
     (name "rust-parse-zoneinfo")
-- 
2.41.0

[bug#69257] [PATCH 039/228] gnu: Add rust-parse-display-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-parse-display-0.8): Add variable.
---
 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 fc2a6faf88..4cd84d2ea3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45671,6 +45671,31 @@ (define-public rust-parquet2-0.6
 parallelism and safety in mind.")
     (license license:asl2.0)))
 
+(define-public rust-parse-display-0.8
+  (package
+    (name "rust-parse-display")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "parse-display" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0p5w8jmb05lp3s9m5crwp1fkmgnc49xh5wlpzvdfhlrbf849sl66"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-parse-display-derive" ,rust-parse-display-derive-0.8)
+                       ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/frozenlib/parse-display")
+    (synopsis
+     "Procedural macro to implement Display and FromStr using common
+settings")
+    (description
+     "This package provides a procedural macro to implement @code{Display}
+and @code{FromStr} using common settings.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-parse-display-derive-0.8
   (package
     (name "rust-parse-display-derive")
-- 
2.41.0

[bug#69257] [PATCH 040/228] gnu: Add rust-oauth2-types-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-oauth2-types-0.7): Add variable.
---
 gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4cd84d2ea3..8aa7228da9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -43134,6 +43134,40 @@ (define-public rust-numtoa-0.1
      "This package can convert numbers into stack-allocated byte arrays.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-oauth2-types-0.7
+  (package
+    (name "rust-oauth2-types")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "oauth2-types" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "08pis87992xd6gj072k4kr4inlaaviq6as5h65pnjmk86siky37x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-data-encoding" ,rust-data-encoding-2)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-language-tags" ,rust-language-tags-0.3)
+                       ("rust-mas-iana" ,rust-mas-iana-0.7)
+                       ("rust-mas-jose" ,rust-mas-jose-0.7)
+                       ("rust-parse-display" ,rust-parse-display-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-serde-with" ,rust-serde-with-3)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1))))
+    (home-page "https://matrix-org.github.io/matrix-authentication-service/")
+    (synopsis "OAuth 2.0 types used by the Matrix Authentication Service")
+    (description "This package provides OAuth 2.0 types used by the Matrix
+Authentication Service.")
+    (license license:asl2.0)))
+
 (define-public rust-obfstr-0.3
   (package
     (name "rust-obfstr")
-- 
2.41.0

[bug#69257] [PATCH 041/228] gnu: rust-iri-string-0.7: Expand description.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-iri-string-0.7)[description]: Expand
and wrap description.
---
 gnu/packages/crates-io.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8aa7228da9..be9d48b57b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31226,8 +31226,10 @@ (define-public rust-iri-string-0.7
        #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1))))
     (home-page "https://github.com/lo48576/iri-string")
     (synopsis "IRI as string types")
-    (description "String types for @acronym{IRIs, Internationalized Resource
-Identifiers} and @acronym{URIs, Uniform Resource Identifiers}.")
+    (description
+      "This package provides string types for @acronym{IRIs,
+Internationalized Resource Identifiers} and @acronym{URIs, Uniform
+Resource Identifiers}.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-is-ci-1
-- 
2.41.0

[bug#69257] [PATCH 042/228] gnu: Place rust-lettre-email-0.9 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-lettre-email-0.9): Move variable.
---
 gnu/packages/crates-io.scm | 56 +++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index be9d48b57b..382190cea0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20711,34 +20711,6 @@ (define-public rust-email-0.0.20
      "This crate provides an implementation of RFC 5322 email messages.")
     (license license:expat)))
 
-(define-public rust-lettre-email-0.9
-  (package
-    (name "rust-lettre-email")
-    (version "0.9.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "lettre_email" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1mar4njchjd33q7s47r43njjj8farkb78f8ica77jj6gil7lh0px"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-base64" ,rust-base64-0.10)
-        ("rust-email" ,rust-email-0.0.20)
-        ("rust-lettre" ,rust-lettre-0.9)
-        ("rust-mime" ,rust-mime-0.3)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-uuid" ,rust-uuid-0.7))))
-    (home-page "https://github.com/lettre/lettre")
-    (synopsis "Mailer library for Rust")
-    (description "Lettre is a mailer library for Rust.  It provides multiple
-transport methods, unicode support, secure delivery with SMTP using encryption
-and authentication, easy email builders, and async support.")
-    (license license:expat)))
-
 (define-public rust-emojis-0.5
   (package
     (name "rust-emojis")
@@ -33202,6 +33174,34 @@ (define-public rust-lettre-0.9
 sending emails from Rust applications.")
     (license license:expat)))
 
+(define-public rust-lettre-email-0.9
+  (package
+    (name "rust-lettre-email")
+    (version "0.9.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "lettre_email" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mar4njchjd33q7s47r43njjj8farkb78f8ica77jj6gil7lh0px"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-base64" ,rust-base64-0.10)
+        ("rust-email" ,rust-email-0.0.20)
+        ("rust-lettre" ,rust-lettre-0.9)
+        ("rust-mime" ,rust-mime-0.3)
+        ("rust-time" ,rust-time-0.1)
+        ("rust-uuid" ,rust-uuid-0.7))))
+    (home-page "https://github.com/lettre/lettre")
+    (synopsis "Mailer library for Rust")
+    (description "Lettre is a mailer library for Rust.  It provides multiple
+transport methods, unicode support, secure delivery with SMTP using encryption
+and authentication, easy email builders, and async support.")
+    (license license:expat)))
+
 (define-public rust-levenshtein-1
   (package
     (name "rust-levenshtein")
-- 
2.41.0

[bug#69257] [PATCH 043/228] gnu: Add rust-etherparse-0.13.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-etherparse-0.13): Add variable.

Change-Id: Id8b94bc93cf33f960fedac655ad8f61d95a8a765
---
 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 382190cea0..da2a6bdbef 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22159,6 +22159,31 @@ (define-public rust-etcetera-0.8
 they follow.  Etcetera, on the other hand, gives you the choice.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-etherparse-0.13
+  (package
+    (name "rust-etherparse")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "etherparse" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "146rcbnhlpcbl6c6csfhvz0227wbiwhk13md6acq8211b7m94wl2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.7))
+       #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
+                                   ("rust-proptest" ,rust-proptest-1))))
+    (home-page "https://github.com/JulianSchmid/etherparse")
+    (synopsis
+     "Library for parsing & writing packet based protocols: EthernetII,
+IPv4, IPv6, UDP, TCP, etc.")
+    (description
+     "This package provides a library for parsing & writing a bunch of
+packet based protocols: @code{EthernetII}, IPv4, IPv6, UDP, TCP, etc..")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-evdev-0.12
   (package
     (name "rust-evdev")
-- 
2.41.0

[bug#69257] [PATCH 044/228] gnu: Add rust-gat-std-proc-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-gat-std-proc-0.1): Add variable.

Change-Id: I501dd3fa1e55ef8cefad546bdc5c5001c44775c7
---
 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 da2a6bdbef..fd4462fa99 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26012,6 +26012,27 @@ (define-public rust-galil-seiferas-0.1
 time, for nonorderable alphabets.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gat-std-proc-0.1
+  (package
+    (name "rust-gat-std-proc")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gat-std-proc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0br6d92fg4g7s81lsms6q3ayss1bl19fanqxc7v1csnic2vaw84c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/CraftSpider/gat-std")
+    (synopsis "Proc macros for gat-std")
+    (description "This package provides proc macros for @code{gat-std}.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gcc-0.3
   (package
     (name "rust-gcc")
-- 
2.41.0

[bug#69257] [PATCH 045/228] gnu: Add rust-gat-std-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-gat-std-0.1): Add variable.

Change-Id: I501dd3fa1e55ef8cefad546bdc5c5001c44775c7
---
 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 fd4462fa99..dc038eaf97 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26012,6 +26012,26 @@ (define-public rust-galil-seiferas-0.1
 time, for nonorderable alphabets.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gat-std-0.1
+  (package
+    (name "rust-gat-std")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gat-std" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14v4ldnzi8y8zkcj2qq7rj4af5ygk0s9iklflssxpcdgqzsfp3p0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gat-std-proc" ,rust-gat-std-proc-0.1))))
+    (home-page "https://github.com/CraftSpider/gat-std")
+    (synopsis "Variants of Rust std traits that use GATs")
+    (description "This package provides variants of Rust std traits that
+use GATs.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gat-std-proc-0.1
   (package
     (name "rust-gat-std-proc")
-- 
2.41.0

[bug#69257] [PATCH 046/228] gnu: Add rust-etherparse-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-etherparse-0.9): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dc038eaf97..88a872e494 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22184,6 +22184,23 @@ (define-public rust-etherparse-0.13
 packet based protocols: @code{EthernetII}, IPv4, IPv6, UDP, TCP, etc..")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-etherparse-0.9
+  (package
+    (inherit rust-etherparse-0.13)
+    (name "rust-etherparse")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "etherparse" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01s86nj0k663mgxpj3r7y5wr50l5c3aq0pm4rpzyb7hz50i0k8ig"))))
+    (arguments
+     `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1))
+       #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
+                                   ("rust-proptest" ,rust-proptest-0.9))))))
+
 (define-public rust-evdev-0.12
   (package
     (name "rust-evdev")
-- 
2.41.0

[bug#69257] [PATCH 047/228] gnu: Add rust-tun-tap-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-tun-tap-0.1): Add variable.

Change-Id: Icb437561cbb59c9f8cb7261297b610d7db3c08db
---
 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 88a872e494..509daaeacd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -74878,6 +74878,32 @@ (define-public rust-tuikit-0.2
        #:cargo-development-inputs
        (("rust-env-logger" ,rust-env-logger-0.6))))))
 
+(define-public rust-tun-tap-0.1
+  (package
+    (name "rust-tun-tap")
+    (version "0.1.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tun-tap" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0l5yp9xs5kyhzrkqfhnqjwj97ylzr5xd0g6jfp42miv7jd77liws"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-futures" ,rust-futures-0.1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-mio" ,rust-mio-0.6)
+                       ("rust-tokio-core" ,rust-tokio-core-0.1))
+       #:cargo-development-inputs (("rust-etherparse" ,rust-etherparse-0.9)
+                                   ("rust-serial-test" ,rust-serial-test-0.4)
+                                   ("rust-version-sync" ,rust-version-sync-0.9))))
+    (home-page "https://github.com/vorner/tuntap")
+    (synopsis "TUN/TAP interface wrapper")
+    (description "This package provides a TUN/TAP interface wrapper.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-twoway-0.2
   (package
     (name "rust-twoway")
-- 
2.41.0

[bug#69257] [PATCH 048/228] gnu: Add rust-eui48-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-eui48-1): Add variable.

Change-Id: I501dd3fa1e55ef8cefad546bdc5c5001c44775c7
---
 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 509daaeacd..604bc2f752 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22201,6 +22201,34 @@ (define-public rust-etherparse-0.9
        #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
                                    ("rust-proptest" ,rust-proptest-0.9))))))
 
+(define-public rust-eui48-1
+  (package
+    (name "rust-eui48")
+    (version "1.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "eui48" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "00cpf25kc3mxhqnahm0bw9xl19gr2pzc5g84dvkc4mwdbsn1hx48"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-regex" ,rust-regex-1)
+                       ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1))))
+    (home-page "https://github.com/abaumhauer/eui48")
+    (synopsis
+     "Library to generate and parse IEEE EUI-48 and EUI-64")
+    (description
+     "This package provides a library to generate and parse IEEE EUI-48
+and EUI-64, also known as MAC-48 media access control addresses.  The
+IEEE claims trademarks on the names EUI-48 and EUI-64, in which EUI is an
+abbreviation for Extended Unique Identifier.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-evdev-0.12
   (package
     (name "rust-evdev")
-- 
2.41.0

[bug#69257] [PATCH 049/228] gnu: Add rust-pcap-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pcap-1): Add variable.
(rust-pcap-0.7): Inherit rust-pcap-1.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 604bc2f752..24469da2e7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46310,8 +46310,42 @@ (define-public rust-pathdiff-0.2
 path.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-pcap-1
+  (package
+    (name "rust-pcap")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pcap" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hrpgjxy53rvi9xbizr9nm70qgsb9pzfwah9bnirq791kpgjyibp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-errno" ,rust-errno-0.2)
+                       ("rust-etherparse" ,rust-etherparse-0.13)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-gat-std" ,rust-gat-std-0.1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libloading" ,rust-libloading-0.6)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tun-tap" ,rust-tun-tap-0.1)
+                       ("rust-windows-sys" ,rust-windows-sys-0.36))
+       #:cargo-development-inputs (("rust-eui48" ,rust-eui48-1)
+                                   ("rust-tempdir" ,rust-tempdir-0.3))))
+    (home-page "https://github.com/rust-pcap/pcap")
+    (synopsis "Packet capture API around (w)pcap")
+    (description
+     "This package provides a packet capture API around pcap/wpcap.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-pcap-0.7
   (package
+    (inherit rust-pcap-1)
     (name "rust-pcap")
     (version "0.7.0")
     (source
@@ -46322,7 +46356,6 @@ (define-public rust-pcap-0.7
        (sha256
         (base32 "14blflnbj87z3ajlj1hszsl6k7rwa338y4aw2yjm2j0xdpjvj4pr"))))
     (native-inputs (list libpcap))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; can't find crate for `futures`
        #:cargo-inputs
@@ -46332,11 +46365,7 @@ (define-public rust-pcap-0.7
         ("rust-mio" ,rust-mio-0.6)
         ("rust-tokio-core" ,rust-tokio-core-0.1))
        #:cargo-development-inputs
-       (("rust-tempdir" ,rust-tempdir-0.3))))
-    (home-page "https://github.com/rust-pcap/pcap")
-    (synopsis "Packet capture API around pcap/wpcap")
-    (description "This package provides a packet capture API around pcap/wpcap.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-tempdir" ,rust-tempdir-0.3))))))
 
 (define-public rust-pcap-sys-0.1
   (package
-- 
2.41.0

[bug#69257] [PATCH 050/228] gnu: Add rust-no-std-net-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-no-std-net-0.6): Add variable.
(rust-no-std-net-0.5): Inherit rust-no-std-net-0.6.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 24469da2e7..212829d65e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41431,29 +41431,42 @@ (define-public rust-no-std-compat-0.4
 make porting your crate to no_std *easy*.")
     (license license:expat)))
 
-(define-public rust-no-std-net-0.5
+(define-public rust-no-std-net-0.6
   (package
     (name "rust-no-std-net")
-    (version "0.5.0")
+    (version "0.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "no-std-net" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0lkilh0wc7big3m5lsn9wqiz2xvj21kgmpbc15z92j93n51wxkhv"))))
+        (base32 "0ravflgyh0q2142gjdz9iav5yqci3ga7gbnk4mmfcnqkrq54lya3"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-serde" ,rust-serde-1))))
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-serde-test" ,rust-serde-test-1))))
     (home-page "https://github.com/dunmatt/no-std-net")
     (synopsis "Rust's std::net... without the @code{std}")
-    (description "This package provides Rust's std::net for environment
-without the @code{std}.")
+    (description "This package provides Rust's std::net in an environment
+without @code{std}.")
     (license license:expat)))
 
+(define-public rust-no-std-net-0.5
+  (package
+    (inherit rust-no-std-net-0.6)
+    (name "rust-no-std-net")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "no-std-net" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0lkilh0wc7big3m5lsn9wqiz2xvj21kgmpbc15z92j93n51wxkhv"))))))
+
 (define-public rust-nodrop-0.1
   (package
     (name "rust-nodrop")
-- 
2.41.0

[bug#69257] [PATCH 051/228] gnu: Add rust-pnet-base-0.34.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pnet-base-0.34): Add variable.
(rust-pnet-base-0.27): Inherit rust-pnet-base-0.34.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 212829d65e..4a602c5809 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48370,29 +48370,43 @@ (define-public rust-pmutil-0.5
     (description "This package provides utils for proc-macro.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-pnet-base-0.27
+(define-public rust-pnet-base-0.34
   (package
     (name "rust-pnet-base")
-    (version "0.27.2")
+    (version "0.34.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pnet_base" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1v8bcbv9jh581ill77qjzzw2ay76pl781982yclj3xky96m8hijf"))))
+        (base32 "0k2z3jh6vw99bwl0ckpsd142n4yiscza1bmj3b86i2xk7bxzck7y"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-serde" ,rust-serde-1))
+     `(#:cargo-inputs (("rust-no-std-net" ,rust-no-std-net-0.6)
+                       ("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
        (("rust-serde-test" ,rust-serde-test-1))))
     (home-page "https://github.com/libpnet/libpnet")
-    (synopsis "Fundamental base types and code used by pnet")
+    (synopsis "Fundamental base types and code used by pnet.")
     (description
      "This crate implements fundamental base types and code used by pnet.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pnet-base-0.27
+  (package
+    ;; Does not depend on rust-no-std-net-0.6.
+    (inherit rust-pnet-base-0.34)
+    (name "rust-pnet-base")
+    (version "0.27.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pnet_base" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1v8bcbv9jh581ill77qjzzw2ay76pl781982yclj3xky96m8hijf"))))))
+
 (define-public rust-pnet-datalink-0.27
   (package
     (name "rust-pnet-datalink")
-- 
2.41.0

[bug#69257] [PATCH 052/228] gnu: Add rust-pnet-sys-0.34.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pnet-sys-0.34): Add variable.
(rust-pnet-sys-0.27): Inherit rust-pnet-sys-0.34.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4a602c5809..1841027950 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48435,29 +48435,41 @@ (define-public rust-pnet-datalink-0.27
      "This crate implements cross-platform, datalink layer networking.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-pnet-sys-0.27
+(define-public rust-pnet-sys-0.34
   (package
     (name "rust-pnet-sys")
-    (version "0.27.2")
+    (version "0.34.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pnet_sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "05gz5xixzvs5iw7a3l0r7sic7s44x8xmv9pqvzzs6wpdwz2f92bm"))))
+        (base32 "004d28vbaxv3m55cd741mpjm34031c3p2dpp8kazcwxms7n0nz21"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; Tries to use sockets.
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-winapi" ,rust-winapi-0.3))))
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-winapi" ,rust-winapi-0.3))))
     (home-page "https://github.com/libpnet/libpnet")
     (synopsis "Access to network related system functions")
     (description
      "This crate providess access to network related system function and calls.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pnet-sys-0.27
+  (package
+    (inherit rust-pnet-sys-0.34)
+    (name "rust-pnet-sys")
+    (version "0.27.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pnet_sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "05gz5xixzvs5iw7a3l0r7sic7s44x8xmv9pqvzzs6wpdwz2f92bm"))))))
+
 (define-public rust-pocket-resources-0.3
   (package
     (name "rust-pocket-resources")
-- 
2.41.0

[bug#69257] [PATCH 053/228] gnu: Add rust-pnet-datalink-0.34.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pnet-datalink-0.34): Add variable.
(rust-pnet-datalink-0.27): Inherit rust-pnet-datalink-0.34.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1841027950..6a2070fc57 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48407,8 +48407,36 @@ (define-public rust-pnet-base-0.27
        (sha256
         (base32 "1v8bcbv9jh581ill77qjzzw2ay76pl781982yclj3xky96m8hijf"))))))
 
+(define-public rust-pnet-datalink-0.34
+  (package
+    (name "rust-pnet-datalink")
+    (version "0.34.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pnet_datalink" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zlq1z3y6flpqh0x2yqczxvzavwpr3mlazbzjv9vnzh6y2mm8n5d"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-ipnetwork" ,rust-ipnetwork-0.20)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-netmap-sys" ,rust-netmap-sys-0.1)
+                       ("rust-pcap" ,rust-pcap-1)
+                       ("rust-pnet-base" ,rust-pnet-base-0.34)
+                       ("rust-pnet-sys" ,rust-pnet-sys-0.34)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/libpnet/libpnet")
+    (synopsis "Cross-platform, datalink layer networking")
+    (description
+     "This crate implements cross-platform, datalink layer networking.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-pnet-datalink-0.27
   (package
+    (inherit rust-pnet-datalink-0.34)
     (name "rust-pnet-datalink")
     (version "0.27.2")
     (source
@@ -48418,7 +48446,6 @@ (define-public rust-pnet-datalink-0.27
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1iws7c2mf88ip43ccmr5p8r6kzb6lwsg3amgc4pvy8wx9nf1q02r"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-ipnetwork" ,rust-ipnetwork-0.17)
@@ -48428,12 +48455,7 @@ (define-public rust-pnet-datalink-0.27
         ("rust-pnet-base" ,rust-pnet-base-0.27)
         ("rust-pnet-sys" ,rust-pnet-sys-0.27)
         ("rust-serde" ,rust-serde-1)
-        ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/libpnet/libpnet")
-    (synopsis "Cross-platform, datalink layer networking")
-    (description
-     "This crate implements cross-platform, datalink layer networking.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-winapi" ,rust-winapi-0.3))))))
 
 (define-public rust-pnet-sys-0.34
   (package
-- 
2.41.0

[bug#69257] [PATCH 054/228] gnu: Add rust-http-body-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-http-body-1): Add variable.
(rust-http-body-0.4): Inherit rust-http-body-1.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 6650c26913..b0b431ff88 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -2278,8 +2278,32 @@ (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-body-1
+  (package
+    (name "rust-http-body")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "http-body" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hyn8n3iadrbwq8y0p1rl1275s4nm49bllw5wji29g4aa3dqbb0w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-http" ,rust-http-1))))
+    (home-page "https://github.com/hyperium/http-body")
+    (synopsis "Trait representing an asynchronous, streaming, HTTP request
+or response body")
+    (description
+     "This package provides a trait representing an asynchronous, streaming,
+HTTP request or response body.")
+    (license license:expat)))
+
 (define-public rust-http-body-0.4
   (package
+    (inherit rust-http-body-1)
     (name "rust-http-body")
     (version "0.4.6")
     (source
@@ -2289,18 +2313,11 @@ (define-public rust-http-body-0.4
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1lmyjfk6bqk6k9gkn1dxq770sb78pqbqshga241hr5p995bb5skw"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-bytes" ,rust-bytes-1)
-        ("rust-http" ,rust-http-0.2))))
-    (home-page "https://github.com/hyperium/http-body")
-    (synopsis "Asynchronous, streaming, HTTP request or response body")
-    (description
-     "This crate provides a trait representing an asynchronous, streaming,
-HTTP request or response body.")
-    (license license:expat)))
+        ("rust-http" ,rust-http-0.2))))))
 
 (define-public rust-http-body-0.3
   (package
-- 
2.41.0

[bug#69257] [PATCH 055/228] gnu: Add rust-http-body-util-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-http-body-util-0.1): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index b0b431ff88..6a68dfab0d 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -2356,6 +2356,32 @@ (define-public rust-http-body-0.1
         ("rust-http" ,rust-http-0.1)
         ("rust-tokio-buf" ,rust-tokio-buf-0.1))))))
 
+(define-public rust-http-body-util-0.1
+  (package
+    (name "rust-http-body-util")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "http-body-util" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0h78a6jj2vky0wmgmq5f1h541cmhmlij09gw63fxl59h77mpkjs1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-http" ,rust-http-1)
+                       ("rust-http-body" ,rust-http-body-1)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2))
+       #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/hyperium/http-body")
+    (synopsis "Combinators and adapters for HTTP request/response bodies")
+    (description
+     "This package provides combinators and adapters for HTTP request or
+response bodies.")
+    (license license:expat)))
+
 (define-public rust-http-client-6
   (package
     (name "rust-http-client")
-- 
2.41.0

[bug#69257] [PATCH 056/228] gnu: Add rust-h2-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-h2-0.4): Add variable.
(rust-h2-0.3): Inherit rust-h2-0.4.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 6a68dfab0d..fe2693b208 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -1883,8 +1883,49 @@ (define-public rust-gemini-fetch-0.2
     (description "This package provides a library to fetch gemini pages.")
     (license license:expat)))
 
+(define-public rust-h2-0.4
+  (package
+    (name "rust-h2")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "h2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hqr2l7kl9zqjcjdv69v9jx6v65mlbsavsyff8mr6lgqkbjk1l1i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-fnv" ,rust-fnv-1)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-sink" ,rust-futures-sink-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-http" ,rust-http-1)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-slab" ,rust-slab-0.4)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-util" ,rust-tokio-util-0.7)
+                       ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-hex" ,rust-hex-0.4)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.24)
+        ("rust-walkdir" ,rust-walkdir-2)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.25))))
+    (home-page "https://github.com/hyperium/h2")
+    (synopsis "HTTP/2 client and server")
+    (description "This package provides an HTTP/2 client and server.")
+    (license license:expat)))
+
 (define-public rust-h2-0.3
   (package
+    (inherit rust-h2-0.4)
     (name "rust-h2")
     (version "0.3.21")
     (source
@@ -1919,11 +1960,7 @@ (define-public rust-h2-0.3
         ("rust-tokio" ,rust-tokio-1)
         ("rust-tokio-rustls" ,rust-tokio-rustls-0.23)
         ("rust-walkdir" ,rust-walkdir-2)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.22))))
-    (home-page "https://github.com/hyperium/h2")
-    (synopsis "HTTP/2.0 client and server")
-    (description "This package provides an HTTP/2.0 client and server.")
-    (license license:expat)))
+        ("rust-webpki-roots" ,rust-webpki-roots-0.22))))))
 
 (define-public rust-h2-0.2
   (package
-- 
2.41.0

[bug#69257] [PATCH 057/228] gnu: Add rust-hyper-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-hyper-1): Add variable.
(rust-hyper-0.14): Inherit rust-hyper-1.

Change-Id: I4a803247155cae29dab9e9d4bcf915196d8ee31f
---
 gnu/packages/crates-web.scm | 50 +++++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index fe2693b208..a35f0b8c25 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -2559,8 +2559,52 @@ (define-public rust-httpdate-1
      "This crates parses and formats HTTP datetime strings.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-hyper-1
+  (package
+    (name "rust-hyper")
+    (version "1.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hyper" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xgv4bjm78w50wp2rcxc4dg69nw6blx6hyyqkqd7p4gwf4waanpv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-h2" ,rust-h2-0.4)
+                       ("rust-http" ,rust-http-1)
+                       ("rust-http-body" ,rust-http-body-1)
+                       ("rust-http-body-util" ,rust-http-body-util-0.1)
+                       ("rust-httparse" ,rust-httparse-1)
+                       ("rust-httpdate" ,rust-httpdate-1)
+                       ("rust-itoa" ,rust-itoa-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-want" ,rust-want-0.3))
+       #:cargo-development-inputs
+       (("rust-form-urlencoded" ,rust-form-urlencoded-1)
+        ("rust-http-body-util" ,rust-http-body-util-0.1)
+        ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.5)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-spmc" ,rust-spmc-0.3)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-test" ,rust-tokio-test-0.4)
+        ("rust-tokio-util" ,rust-tokio-util-0.7))))
+    (home-page "https://hyper.rs")
+    (synopsis "Fast and correct HTTP library")
+    (description "This package provides a fast and correct HTTP library.")
+    (license license:expat)))
+
 (define-public rust-hyper-0.14
   (package
+    (inherit rust-hyper-1)
     (name "rust-hyper")
     (version "0.14.27")
     (source
@@ -2603,11 +2647,7 @@ (define-public rust-hyper-0.14
         ("rust-tokio-test" ,rust-tokio-test-0.4)
         ("rust-tokio-util" ,rust-tokio-util-0.7)
         ("rust-tower" ,rust-tower-0.4)
-        ("rust-url" ,rust-url-2))))
-    (home-page "https://hyper.rs")
-    (synopsis "Fast and correct HTTP library")
-    (description "This package provides a fast and correct HTTP library.")
-    (license license:expat)))
+        ("rust-url" ,rust-url-2))))))
 
 (define-public rust-hyper-0.13
   (package
-- 
2.41.0

[bug#69257] [PATCH 058/228] gnu: Add rust-hyper-util-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-hyper-util-0.1): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index a35f0b8c25..dc80e10468 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3065,6 +3065,44 @@ (define-public rust-hyper-tls-0.4
        #:cargo-development-inputs
        (("rust-tokio" ,rust-tokio-0.2))))))
 
+(define-public rust-hyper-util-0.1
+  (package
+    (name "rust-hyper-util")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hyper-util" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1akngan7j0n2n0wd25c6952mvqbkj9gp1lcwzyxjc0d37l8yyf6a"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-http" ,rust-http-1)
+                       ("rust-http-body" ,rust-http-body-1)
+                       ("rust-hyper" ,rust-hyper-1)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-socket2" ,rust-socket2-0.5)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tower" ,rust-tower-0.4)
+                       ("rust-tower-service" ,rust-tower-service-0.3)
+                       ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-bytes" ,rust-bytes-1)
+        ("rust-http-body-util" ,rust-http-body-util-0.1)
+        ("rust-hyper" ,rust-hyper-1)
+        ("rust-pnet-datalink" ,rust-pnet-datalink-0.34)
+        ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.5)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-test" ,rust-tokio-test-0.4))))
+    (home-page "https://hyper.rs")
+    (synopsis "@code{hyper} utilities")
+    (description "This package provides utilities for the @code{hyper} crate.")
+    (license license:expat)))
+
 (define-public rust-iron-0.6
   (package
     (name "rust-iron")
-- 
2.41.0

[bug#69257] [PATCH 059/228] gnu: Add rust-http-range-header-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/rust-apps.scm (rust-http-range-header-0.4): Add variable.
(rust-http-range-header-0.3): Inherit rust-http-range-header-0.4.
---
 gnu/packages/crates-web.scm | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index dc80e10468..0e4f2c5536 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -2458,17 +2458,17 @@ (define-public rust-http-client-6
     (description "This package provides types and traits for HTTP clients.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-http-range-header-0.3
+(define-public rust-http-range-header-0.4
   (package
     (name "rust-http-range-header")
-    (version "0.3.1")
+    (version "0.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "http-range-header" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "13vm511vq3bhschkw2xi9nhxzkw53m55gn9vxg7qigfxc29spl5d"))))
+        (base32 "1zhigmvyrk50jzll6nmn7n1rxkfzh8xn0838dvdvnj52rlqyzr1w"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
@@ -2477,10 +2477,24 @@ (define-public rust-http-range-header-0.3
         ("rust-quickcheck-macros" ,rust-quickcheck-macros-1)
         ("rust-regex" ,rust-regex-1))))
     (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.")
+    (synopsis "Zero-dependency range header parser")
+    (description "This package provides a range header parser without any
+dependencies.")
     (license license:expat)))
 
+(define-public rust-http-range-header-0.3
+  (package
+    (inherit rust-http-range-header-0.4)
+    (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"))))))
+
 (define-public rust-http-types-2
   (package
     (name "rust-http-types")
-- 
2.41.0

[bug#69257] [PATCH 060/228] gnu: Add rust-sync-wrapper-0.1.

[Herman Rimm via Guix-patches via]

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

Change-Id: I1d37a32a26b4afebd99802e425e4a1b60184b5cf
---
 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 6a2070fc57..2743293e42 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67643,6 +67643,31 @@ (define-public rust-syn-test-suite-0.0.0
     (description "Test suite of the syn crate.")
     (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
+     `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3))
+       #:cargo-development-inputs
+       (("rust-futures" ,rust-futures-0.3)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2))))
+    (home-page "https://docs.rs/sync_wrapper")
+    (synopsis
+     "Enlist 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-synchronoise-1
   (package
     (name "rust-synchronoise")
-- 
2.41.0

[bug#69257] [PATCH 061/228] gnu: Add rust-tower-http-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-tower-http-0.5): Add variable.
(rust-tower-http-0.4): Inherit from rust-tower-http-0.5.

Change-Id: I03d03c7ce34b0fbd38c0bdef08b691a9ee4c8e81
---
 gnu/packages/crates-web.scm | 73 +++++++++++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 0e4f2c5536..3c7ba43903 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4012,8 +4012,73 @@ (define-public rust-tower-0.4
 robust clients and servers.")
     (license license:expat)))
 
+(define-public rust-tower-http-0.5
+  (package
+    (name "rust-tower-http")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tower-http" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0bmgfh1hr92blw7kv2636ykd0gf3h0aqdd89kvjk6b2fg8kr788d"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   ;; Remove disabled doctests with unresolved imports.
+                   (substitute* "src/lib.rs" (("//!.*") ""))
+                   (substitute* "src/classify/status_in_range_is_error.rs"
+                                (("///.*") ""))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#: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-1)
+                       ("rust-http-body" ,rust-http-body-1)
+                       ("rust-http-body-util" ,rust-http-body-util-0.1)
+                       ("rust-http-range-header" ,rust-http-range-header-0.4)
+                       ("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))
+       #:cargo-development-inputs
+       (("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-brotli" ,rust-brotli-3)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-hyper-util" ,rust-hyper-util-0.1)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-sync-wrapper" ,rust-sync-wrapper-0.1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tower" ,rust-tower-0.4)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-uuid" ,rust-uuid-1)
+        ("rust-zstd" ,rust-zstd-0.12))))
+    (home-page "https://github.com/tower-rs/tower-http")
+    (synopsis "Tower middleware and utilities for HTTP clients and servers")
+    (description
+      "This package provides Tower middleware and utilities for HTTP
+clients and servers.")
+    (license license:expat)))
+
 (define-public rust-tower-http-0.4
   (package
+    (inherit rust-tower-http-0.5)
     (name "rust-tower-http")
     (version "0.4.4")
     (source
@@ -4023,7 +4088,6 @@ (define-public rust-tower-http-0.4
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0h0i2flrw25zwxv72sifq4v5mwcb030spksy7r2a4xl2d4fvpib1"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags (list "--release"
                                 ;; Not the doc tests.
@@ -4062,12 +4126,7 @@ (define-public rust-tower-http-0.4
         ("rust-tower" ,rust-tower-0.4)
         ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
         ("rust-uuid" ,rust-uuid-1)
-        ("rust-zstd" ,rust-zstd-0.12))))
-    (home-page "https://github.com/tower-rs/tower-http")
-    (synopsis "Tower middleware and utilities for HTTP clients and servers")
-    (description "This package provides the tower middleware and utilities for
-HTTP clients and servers.")
-    (license license:expat)))
+        ("rust-zstd" ,rust-zstd-0.12))))))
 
 (define-public rust-tower-layer-0.3
   (package
-- 
2.41.0

[bug#69257] [PATCH 062/228] gnu: Add rust-opentelemetry-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-opentelemetry-0.21): Add variable.

Change-Id: I0a95270da9a585a74718dd7e6f8e4691ab022389
---
 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 2743293e42..741ba8a5a0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44110,6 +44110,34 @@ (define-public rust-openssl-sys-extras-0.7
      "Extra FFI bindings to OpenSSL that require a C shim.")
     (license license:expat)))
 
+(define-public rust-opentelemetry-0.21
+  (package
+    (name "rust-opentelemetry")
+    (version "0.21.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12jfmyx8k9q2sjlx4wp76ddzaf94i7lnkliv1c9mj164bnd36chy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-sink" ,rust-futures-sink-0.3)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-js-sys" ,rust-js-sys-0.3)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-urlencoding" ,rust-urlencoding-2))))
+    (home-page "https://github.com/open-telemetry/opentelemetry-rust")
+    (synopsis "Metrics collection and distributed tracing framework")
+    (description
+     "This package provides a metrics collection and distributed tracing
+framework.")
+    (license license:asl2.0)))
+
 (define-public rust-opml-1
   (package
     (name "rust-opml")
-- 
2.41.0

[bug#69257] [PATCH 063/228] gnu: Add rust-castaway-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-castaway-0.1): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 741ba8a5a0..2b84618752 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10454,6 +10454,20 @@ (define-public rust-castaway-0.2
 types that works on stable Rust.")
     (license license:expat)))
 
+(define-public rust-castaway-0.1
+  (package
+    ;; Does not depend on rustversion and paste.
+    (inherit rust-castaway-0.2)
+    (name "rust-castaway")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "castaway" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xhspwy477qy5yg9c3jp713asxckjpx0vfrmz5l7r5zg7naqysd2"))))))
+
 (define-public rust-cblas-sys-0.1
   (package
     (name "rust-cblas-sys")
-- 
2.41.0

[bug#69257] [PATCH 064/228] gnu: rust-sluice-0.5: Update to 0.5.5.

[Herman Rimm via Guix-patches via]

From: Efraim Flashner <efraim@flashner.co.il>

* gnu/packages/crates-io.scm (rust-sluice-0.5): Update to 0.5.5.
[cargo-inputs]: Add rust-async-channel-1.  Remove
rust-futures-channel-0.3.
[cargo-development-inputs]: Replace rust-quickcheck-0.9 with 1,
rust-quickcheck-macros with 1.  Remove rust-cfg-if-1.
[synopsis]: Add newline.
[description]: Wrap after 'for'.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2b84618752..f61fd50827 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63596,31 +63596,31 @@ (define-public rust-slugify-0.1
 (define-public rust-sluice-0.5
   (package
     (name "rust-sluice")
-    (version "0.5.3")
+    (version "0.5.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "sluice" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1w9brs9dqyvr2w7cs5nxkp2wggw2xh76bc4qq0p4yxwfvhgfs94f"))))
+        (base32 "1d9ywr5039ibgaby8sc72f8fs5lpp8j5y6p3npya4jplxz000x3d"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-futures-channel" ,rust-futures-channel-0.3)
+       (("rust-async-channel" ,rust-async-channel-1)
         ("rust-futures-core" ,rust-futures-core-0.3)
         ("rust-futures-io" ,rust-futures-io-0.3))
        #:cargo-development-inputs
-       (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-criterion" ,rust-criterion-0.3)
+       (("rust-criterion" ,rust-criterion-0.3)
         ("rust-futures" ,rust-futures-0.3)
-        ("rust-quickcheck" ,rust-quickcheck-0.9)
-        ("rust-quickcheck-macros" ,rust-quickcheck-macros-0.9))))
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-quickcheck-macros" ,rust-quickcheck-macros-1))))
     (home-page "https://github.com/sagebind/sluice")
-    (synopsis "Ring buffer for byte buffers, FIFO queues, and SPSC channels")
+    (synopsis
+      "Ring buffer for byte buffers, FIFO queues, and SPSC channels")
     (description
-     "This package provides asynchronous byte buffers and pipes for concurrent
-I/O programming.")
+     "This package provides asynchronous byte buffers and pipes for
+concurrent I/O programming.")
     (license license:expat)))
 
 (define-public rust-smallbitvec-2
-- 
2.41.0

[bug#69257] [PATCH 065/228] gnu: Add rust-isahc-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-isahc-1): Add variable.
(rust-isahc-0.9): Inherit rust-isahc-1.

Change-Id: I17aa488a0db5d8e3fefadeafe4f30e4d04d415fd
---
 gnu/packages/crates-web.scm | 84 +++++++++++++++++++++++++++++--------
 1 file changed, 66 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 3c7ba43903..9c0e729457 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3151,8 +3151,70 @@ (define-public rust-iron-0.6
 and locking in the core framework.")
     (license license:expat)))
 
+(define-public rust-isahc-1
+  (package
+    (name "rust-isahc")
+    (version "1.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "isahc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1scfgyv3dpjbkqa9im25cd12cs6rbd8ygcaw67f3dx41sys08kik"))
+       (modules '((guix build utils)))
+       (snippet '(substitute* "Cargo.toml" ; TODO: Disable static-ssl.
+                              (("\"static-curl\", ") "")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-channel" ,rust-async-channel-1)
+                       ("rust-castaway" ,rust-castaway-0.1)
+                       ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)
+                       ("rust-curl" ,rust-curl-0.4)
+                       ("rust-curl-sys" ,rust-curl-sys-0.4)
+                       ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+                       ("rust-event-listener" ,rust-event-listener-2)
+                       ("rust-futures-lite" ,rust-futures-lite-1)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-httpdate" ,rust-httpdate-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-mime" ,rust-mime-0.3)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-parking-lot" ,rust-parking-lot-0.9)
+                       ("rust-polling" ,rust-polling-2)
+                       ("rust-publicsuffix" ,rust-publicsuffix-2)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-slab" ,rust-slab-0.4)
+                       ("rust-sluice" ,rust-sluice-0.5)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-tracing-futures" ,rust-tracing-futures-0.2)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-waker-fn" ,rust-waker-fn-1))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.9)
+                                   ("rust-flate2" ,rust-flate2-1)
+                                   ("rust-indicatif" ,rust-indicatif-0.15)
+                                   ("rust-rayon" ,rust-rayon-1)
+                                   ("rust-serde-json" ,rust-serde-json-1)
+                                   ("rust-static-assertions" ,rust-static-assertions-1)
+                                   ("rust-structopt" ,rust-structopt-0.3)
+                                   ("rust-tempfile" ,rust-tempfile-3)
+                                   ("rust-test-case" ,rust-test-case-2)
+                                   ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2))))
+    (native-inputs (list pkg-config))
+    (inputs (list curl openssl zlib))
+    (home-page "https://github.com/sagebind/isahc")
+    (synopsis "Practical and fun HTTP client")
+    (description
+     "Isahc is an acronym that stands for Incredible Streaming Asynchronous
+HTTP Client.  It is an asynchronous HTTP client for the Rust language.  It
+uses libcurl as an HTTP engine inside, and provides an easy-to-use API on top
+that integrates with Rust idioms.")
+    (license license:expat)))
+
 (define-public rust-isahc-0.9
   (package
+    (inherit rust-isahc-1)
     (name "rust-isahc")
     (version "0.9.14")
     (source
@@ -3162,11 +3224,9 @@ (define-public rust-isahc-0.9
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "12iqz5fj0509pr813pds2fgdk649a0b6ipvy3pqjwb1ywh68m572"))
-    (snippet
-     #~(begin (use-modules (guix build utils))
-              (substitute* "Cargo.toml"
-                (("\"static-curl\", ") ""))))))
-    (build-system cargo-build-system)
+       (modules '((guix build utils)))
+       (snippet '(substitute* "Cargo.toml"
+                              (("\"static-curl\", ") "")))))
     (arguments
      `(#:tests? #f      ; use of undeclared crate or module `testserver`
        #:cargo-inputs
@@ -3197,19 +3257,7 @@ (define-public rust-isahc-0.9
         ("rust-indicatif" ,rust-indicatif-0.15)
         ("rust-structopt" ,rust-structopt-0.3)
         ("rust-test-case" ,rust-test-case-1)
-        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list curl openssl zlib))
-    (home-page "https://github.com/sagebind/isahc")
-    (synopsis "Practical HTTP client")
-    (description
-     "Isahc is an acronym that stands for Incredible Streaming Asynchronous
-HTTP Client.  It is an asynchronous HTTP client for the Rust language.  It
-uses libcurl as an HTTP engine inside, and provides an easy-to-use API on top
-that integrates with Rust idioms.")
-    (license license:expat)))
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2))))))
 
 (define-public rust-multipart-0.18
   (package
-- 
2.41.0

[bug#69257] [PATCH 066/228] gnu: Add rust-opentelemetry-http-0.10.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-opentelemetry-http-0.10): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 9c0e729457..ef78621eb8 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3372,6 +3372,35 @@ (define-public rust-nickel-0.11
 @code{express} framework for JavaScript.")
     (license license:expat)))
 
+(define-public rust-opentelemetry-http-0.10
+  (package
+    (name "rust-opentelemetry-http")
+    (version "0.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry-http" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17irqlgsqr1f0in5rhvgl224x2gdcycy8w3ybydlyrdyx2f1hlbz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-hyper" ,rust-hyper-0.14)
+                       ("rust-isahc" ,rust-isahc-1)
+                       ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+                       ("rust-reqwest" ,rust-reqwest-0.11)
+                       ("rust-surf" ,rust-surf-2)
+                       ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/open-telemetry/opentelemetry-rust")
+    (synopsis "Helpers for exchange of traces and metrics over HTTP")
+    (description
+     "This package provides helper implementations for exchange of traces
+and metrics over HTTP.")
+    (license license:asl2.0)))
+
 (define-public rust-reqwest-0.11
   (package
     (name "rust-reqwest")
-- 
2.41.0

[bug#69257] [PATCH 067/228] gnu: Add rust-str-stack-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-str-stack-0.1): Add variable.

Change-Id: I288ab5b984139a6bd2c9f3bc53a291a70239d908
---
 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 f61fd50827..85c1558102 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65455,6 +65455,29 @@ (define-public rust-str-buf-1
     (description "This package provides a static string buffer.")
     (license license:boost1.0)))
 
+(define-public rust-str-stack-0.1
+  (package
+    (name "rust-str-stack")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "str_stack" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1sxl8xd8kiaffsryqpfwcb02lnd3djfin7gf38ag5980908vd4ch"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/Stebalien/str_stack")
+    (synopsis
+     "String allocator for allocating many write-once strings")
+    (description
+     "This package provides a string allocator for allocating many write-
+once strings.  This library is primarily useful for parsing where you need
+to repeatedly build many strings, use them, and then throw them away.
+Instead of allocating many independent strings, this library will put them
+all in the same buffer.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-stream-assert-0.1
   (package
     (name "rust-stream-assert")
-- 
2.41.0

[bug#69257] [PATCH 068/228] gnu: Add rust-dary-heap-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-dary-heap-0.3): Add variable.

Change-Id: Ibd6d2feea6321dd021ee940cf740b45eac9442fc
---
 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 85c1558102..888bab7240 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -17540,6 +17540,30 @@ (define-public rust-darling-macro-0.9
         ("rust-quote" ,rust-quote-0.6)
         ("rust-syn" ,rust-syn-0.15))))))
 
+(define-public rust-dary-heap-0.3
+  (package
+    (name "rust-dary-heap")
+    (version "0.3.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "dary_heap" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1jm04p72s7xij3cr71h59dw07s63nah5b10sh8akcr2129zx2qkp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)
+        ("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://github.com/hanmertens/dary_heap")
+    (synopsis "D-ary heap")
+    (description "This package provides a d-ary heap.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-dashmap-5
   (package
     (name "rust-dashmap")
-- 
2.41.0

[bug#69257] [PATCH 069/228] gnu: Add rust-libflate-lz77-2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-libflate-lz77-2): Add variable.
(rust-libflate-lz77-1): Inherit rust-libflate-lz77-2.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 888bab7240..f0cc910da1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33868,17 +33868,17 @@ (define-public rust-libflate-0.1
        #:cargo-development-inputs
        (("rust-clap" ,rust-clap-2))))))
 
-(define-public rust-libflate-lz77-1
+(define-public rust-libflate-lz77-2
   (package
     (name "rust-libflate-lz77")
-    (version "1.2.0")
+    (version "2.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libflate_lz77" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1gxc75fb2sk0xgrh3qxvxcx1l93yhmyxn9241r251wl5zj5klbd5"))))
+        (base32 "096map4a8xvf3819kgdxbg08nf97nggg9lvrdgn7c5a5ikxm4pxy"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -33886,12 +33886,26 @@ (define-public rust-libflate-lz77-1
         ("rust-hashbrown" ,rust-hashbrown-0.13)
         ("rust-rle-decode-fast" ,rust-rle-decode-fast-1))
        #:cargo-development-inputs
+       ;; Needed by rust-libflate-lz77-1.
        (("rust-libflate" ,rust-libflate-1))))
     (home-page "https://github.com/sile/libflate")
     (synopsis "LZ77 encoder for libflate crate")
     (description "This package provides a LZ77 encoder for libflate crate.")
     (license license:expat)))
 
+(define-public rust-libflate-lz77-1
+  (package
+    (inherit rust-libflate-lz77-2)
+    (name "rust-libflate-lz77")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libflate_lz77" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gxc75fb2sk0xgrh3qxvxcx1l93yhmyxn9241r251wl5zj5klbd5"))))))
+
 (define-public rust-libfuzzer-sys-0.4
   (package
     (name "rust-libfuzzer-sys")
-- 
2.41.0

[bug#69257] [PATCH 070/228] gnu: Add rust-libflate-2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-libflate-2): Add variable.
(rust-libflate-1): Inherit rust-libflate-2.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f0cc910da1..b004ccb08a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33820,8 +33820,34 @@ (define-public rust-libdeflater-0.11
        (("rust-criterion" ,rust-criterion-0.3)
         ("rust-flate2" ,rust-flate2-1))))))
 
+(define-public rust-libflate-2
+  (package
+    (name "rust-libflate")
+    (version "2.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libflate" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gxjqgbzzn6sdalrd2cfn7zb14c75if3dx3nzz3sz58pmra5czcz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-adler32" ,rust-adler32-1)
+                       ("rust-core2" ,rust-core2-0.4)
+                       ("rust-crc32fast" ,rust-crc32fast-1)
+                       ("rust-dary-heap" ,rust-dary-heap-0.3)
+                       ("rust-libflate-lz77" ,rust-libflate-lz77-2))
+       #:cargo-development-inputs (("rust-clap" ,rust-clap-2))))
+    (home-page "https://github.com/sile/libflate")
+    (synopsis "DEFLATE algorithm and related formats (ZLIB, GZIP)")
+    (description "This package provides a Rust implementation of DEFLATE
+algorithm and related formats (ZLIB, GZIP).")
+    (license license:expat)))
+
 (define-public rust-libflate-1
   (package
+    (inherit rust-libflate-2)
     (name "rust-libflate")
     (version "1.1.1")
     (source
@@ -33831,19 +33857,13 @@ (define-public rust-libflate-1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "07hlzg1zly4dw9s39fv2ik6nfcjpjgx82b5kkf3bafdvdvvlldhn"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-adler32" ,rust-adler32-1)
         ("rust-crc32fast" ,rust-crc32fast-1)
         ("rust-libflate-lz77" ,rust-libflate-lz77-1))
        #:cargo-development-inputs
-       (("rust-clap" ,rust-clap-2))))
-    (home-page "https://github.com/sile/libflate")
-    (synopsis "DEFLATE algorithm and related formats (ZLIB, GZIP)")
-    (description "This package provides a Rust implementation of DEFLATE
-algorithm and related formats (ZLIB, GZIP).")
-    (license license:expat)))
+       (("rust-clap" ,rust-clap-2))))))
 
 (define-public rust-libflate-0.1
   (package
-- 
2.41.0

[bug#69257] [PATCH 071/228] gnu: Add rust-quick-xml-0.26.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-quick-xml-0.26): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b004ccb08a..bb3c28ac21 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -52392,6 +52392,20 @@ (define-public rust-quick-xml-0.27
         ("rust-tokio" ,rust-tokio-1)
         ("rust-tokio-test" ,rust-tokio-test-0.4))))))
 
+(define-public rust-quick-xml-0.26
+  (package
+    (inherit rust-quick-xml-0.27)
+    (name "rust-quick-xml")
+    (version "0.26.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "quick-xml" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1kckgj8qscpi23y62zrfmni73k6h78nvhs3z9myiwq9q7g3b2l3z"))))))
+
 (define-public rust-quick-xml-0.22
   (package
     (inherit rust-quick-xml-0.27)
-- 
2.41.0

[bug#69257] [PATCH 072/228] gnu: Add rust-inferno-0.11.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-inferno-0.11): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bb3c28ac21..a6eb8c3c86 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30542,6 +30542,51 @@ (define-public rust-infer-0.2
 signature.")
     (license license:expat)))
 
+(define-public rust-inferno-0.11
+  (package
+    (name "rust-inferno")
+    (version "0.11.19")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "inferno" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ndqcz0p6n4gqrqlq53j42v516nnnii0ljshx634cjnlkj1hy7rj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-ahash" ,rust-ahash-0.8)
+                       ("rust-clap" ,rust-clap-4)
+                       ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
+                       ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+                       ("rust-dashmap" ,rust-dashmap-5)
+                       ("rust-env-logger" ,rust-env-logger-0.10)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-is-terminal" ,rust-is-terminal-0.4)
+                       ("rust-itoa" ,rust-itoa-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-num-format" ,rust-num-format-0.4)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-quick-xml" ,rust-quick-xml-0.26)
+                       ("rust-rgb" ,rust-rgb-0.8)
+                       ("rust-str-stack" ,rust-str-stack-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-cmd" ,rust-assert-cmd-2)
+        ("rust-criterion" ,rust-criterion-0.4)
+        ("rust-libflate" ,rust-libflate-2)
+        ("rust-maplit" ,rust-maplit-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-testing-logger" ,rust-testing-logger-0.1))))
+    (home-page "https://github.com/jonhoo/inferno.git")
+    (synopsis "Rust port of the FlameGraph performance profiling tools")
+    (description
+     "@code{inferno} is a Rust port of the @code{FlameGraph} performance
+profiling tool suite.")
+    (license license:cddl1.0)))
+
 (define-public rust-inflate-0.4
   (package
     (name "rust-inflate")
-- 
2.41.0

[bug#69257] [PATCH 073/228] gnu: Place rust-prost-build-0.12 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-prost-build-0.12): Move variable.
---
 gnu/packages/crates-io.scm | 80 +++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a6eb8c3c86..b46be68b7c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50721,6 +50721,46 @@ (define-public rust-prost-0.9
        (("rust-bytes" ,rust-bytes-1)
         ("rust-prost-derive" ,rust-prost-derive-0.9))))))
 
+(define-public rust-prost-build-0.12
+  (package
+    (name "rust-prost-build")
+    (version "0.12.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "prost-build" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lp2l1l65l163yggk9nw5mjb2fqwzz12693af5phn1v0abih4pn5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            "--skip=tests::test_generate_message_attributes")
+       #:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-heck" ,rust-heck-0.4)
+                       ("rust-itertools" ,rust-itertools-0.10)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-multimap" ,rust-multimap-0.8)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-petgraph" ,rust-petgraph-0.6)
+                       ("rust-prettyplease" ,rust-prettyplease-0.2)
+                       ("rust-prost" ,rust-prost-0.12)
+                       ("rust-prost-types" ,rust-prost-types-0.12)
+                       ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9)
+                       ("rust-pulldown-cmark-to-cmark" ,rust-pulldown-cmark-to-cmark-10)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-tempfile" ,rust-tempfile-3)
+                       ("rust-which" ,rust-which-4))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10))))
+    (native-inputs (list protobuf))
+    (home-page "https://github.com/tokio-rs/prost")
+    (synopsis "Protocol Buffers implementation for the Rust Language")
+    (description
+     "@code{prost-build} makes it easy to generate Rust code from @code{.proto}
+files as part of a Cargo build.")
+    (license license:asl2.0)))
+
 (define-public rust-prost-derive-0.12
   (package
     (name "rust-prost-derive")
@@ -50788,46 +50828,6 @@ (define-public rust-prost-derive-0.9
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-prost-build-0.12
-  (package
-    (name "rust-prost-build")
-    (version "0.12.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "prost-build" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1lp2l1l65l163yggk9nw5mjb2fqwzz12693af5phn1v0abih4pn5"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-test-flags '("--release" "--"
-                            "--skip=tests::test_generate_message_attributes")
-       #:cargo-inputs (("rust-bytes" ,rust-bytes-1)
-                       ("rust-heck" ,rust-heck-0.4)
-                       ("rust-itertools" ,rust-itertools-0.10)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-multimap" ,rust-multimap-0.8)
-                       ("rust-once-cell" ,rust-once-cell-1)
-                       ("rust-petgraph" ,rust-petgraph-0.6)
-                       ("rust-prettyplease" ,rust-prettyplease-0.2)
-                       ("rust-prost" ,rust-prost-0.12)
-                       ("rust-prost-types" ,rust-prost-types-0.12)
-                       ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9)
-                       ("rust-pulldown-cmark-to-cmark" ,rust-pulldown-cmark-to-cmark-10)
-                       ("rust-regex" ,rust-regex-1)
-                       ("rust-syn" ,rust-syn-2)
-                       ("rust-tempfile" ,rust-tempfile-3)
-                       ("rust-which" ,rust-which-4))
-       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10))))
-    (native-inputs (list protobuf))
-    (home-page "https://github.com/tokio-rs/prost")
-    (synopsis "Protocol Buffers implementation for the Rust Language")
-    (description
-     "@code{prost-build} makes it easy to generate Rust code from @code{.proto}
-files as part of a Cargo build.")
-    (license license:asl2.0)))
-
 (define-public rust-prost-types-0.12
   (package
     (name "rust-prost-types")
-- 
2.41.0

[bug#69257] [PATCH 074/228] gnu: Add rust-pulldown-cmark-to-cmark-10.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pulldown-cmark-to-cmark-10): Add
variable.
(rust-pulldown-cmark-to-cmark-7): Inherit
rust-pulldown-cmark-to-cmark-10.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b46be68b7c..9b98774bd1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51348,8 +51348,34 @@ (define-public rust-pulldown-cmark-0.1
        (("rust-bitflags" ,rust-bitflags-0.9)
         ("rust-getopts" ,rust-getopts-0.2))))))
 
+(define-public rust-pulldown-cmark-to-cmark-10
+  (package
+    (name "rust-pulldown-cmark-to-cmark")
+    (version "10.0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pulldown-cmark-to-cmark" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gc366cmd5jxal9m95l17rvqsm4dn62lywc8v5gwq8vcjvhyd501"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9))
+       #:cargo-development-inputs
+       (("rust-indoc" ,rust-indoc-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-0.7))))
+    (home-page "https://github.com/Byron/pulldown-cmark-to-cmark")
+    (synopsis
+     "Convert pulldown-cmark Events back into source strings")
+    (description
+     "This package provides a convert pulldown-cmark Events back to the
+string they were parsed from.")
+    (license license:asl2.0)))
+
 (define-public rust-pulldown-cmark-to-cmark-7
   (package
+    (inherit rust-pulldown-cmark-to-cmark-10)
     (name "rust-pulldown-cmark-to-cmark")
     (version "7.1.1")
     (source
@@ -51369,15 +51395,7 @@ (define-public rust-pulldown-cmark-to-cmark-7
        #:cargo-development-inputs
        (("rust-indoc" ,rust-indoc-1)
         ("rust-pretty-assertions"
-         ,rust-pretty-assertions-0.7))))
-    (home-page
-     "https://github.com/Byron/pulldown-cmark-to-cmark")
-    (synopsis
-     "Convert pulldown-cmark Events back to the string they were parsed from")
-    (description
-     "This package provides a convert pulldown-cmark Events back to the string
-they were parsed from")
-    (license license:asl2.0)))
+         ,rust-pretty-assertions-0.7))))))
 
 (define-public rust-pulse-0.5
   (package
-- 
2.41.0

[bug#69257] [PATCH 075/228] gnu: Add rust-symbolic-common-12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-symbolic-common-12): Add variable.

Change-Id: Ib2fc383d74170a8ca9dd26423246da8ff0ed51df
---
 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 9b98774bd1..d43c947d9a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67276,6 +67276,34 @@ (define-public rust-swayipc-types-1
 sway's IPC interface.")
     (license license:expat)))
 
+(define-public rust-symbolic-common-12
+  (package
+    (name "rust-symbolic-common")
+    (version "12.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "symbolic-common" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zhda5h4qykrb38x9yb6s846hpq59mzhglkclb9v4fxvqvxzzk0w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-debugid" ,rust-debugid-0.8)
+                       ("rust-memmap2" ,rust-memmap2-0.9)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)
+                       ("rust-uuid" ,rust-uuid-1))
+       #:cargo-development-inputs (("rust-similar-asserts" ,rust-similar-asserts-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/getsentry/symbolic")
+    (synopsis "Common types and utilities for the symbolic library")
+    (description
+     "Common types and utilities for symbolic: a library to symbolicate
+and process stack traces from native applications, minidumps or minified
+@code{JavaScript}.")
+    (license license:expat)))
+
 (define-public rust-symlink-0.1
   (package
     (name "rust-symlink")
-- 
2.41.0

[bug#69257] [PATCH 076/228] gnu: Add rust-msvc-demangler-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-msvc-demangler-0.9): Add variable.
(rust-muldiv-1): Place variable in alphabetical order.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d43c947d9a..cbc8d4d2fc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38976,6 +38976,49 @@ (define-public rust-mptcp-pm-0.1
     (description "Linux kernel MPTCP path manager netlink Library.")
     (license license:expat)))
 
+(define-public rust-msvc-demangler-0.9
+  (package
+    (name "rust-msvc-demangler")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "msvc-demangler" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1j7kkmbd9yvhk7dmvd29pqcg9mcjdw5p1ia1kihh16zss1nprdmz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1))))
+    (home-page "https://github.com/mstange/msvc-demangler-rust")
+    (synopsis
+     "Rust library that demangles C++ symbols mangled by MSVC")
+    (description
+     "This package provides a rust library that demangles (undecorates)
+C++ symbols mangled by MSVC.")
+    (license (list license:expat license:ncsa))))
+
+(define-public rust-muldiv-1
+  (package
+    (name "rust-muldiv")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "muldiv" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1c6ljsp41n8ijsx7zicwfm135drgyhcms12668ivvsbm1r98frwm"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:cargo-inputs `(("rust-quickcheck" ,rust-quickcheck-1))))
+    (home-page "https://github.com/sdroege/rust-muldiv")
+    (synopsis "Trait for numeric types to combine multiplication and division")
+    (description
+     "This package provides a trait for numeric types to perform combined
+multiplication and division with overflow protection.")
+    (license license:expat)))
+
 (define-public rust-multer-2
   (package
     (name "rust-multer")
@@ -39015,27 +39058,6 @@ (define-public rust-multer-2
 async Rust environment e.g. any async server.")
     (license license:expat)))
 
-(define-public rust-muldiv-1
-  (package
-    (name "rust-muldiv")
-    (version "1.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "muldiv" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1c6ljsp41n8ijsx7zicwfm135drgyhcms12668ivvsbm1r98frwm"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:cargo-inputs `(("rust-quickcheck" ,rust-quickcheck-1))))
-    (home-page "https://github.com/sdroege/rust-muldiv")
-    (synopsis "Trait for numeric types to combine multiplication and division")
-    (description
-     "This package provides a trait for numeric types to perform combined
-multiplication and division with overflow protection.")
-    (license license:expat)))
-
 (define-public rust-multimap-0.8
   (package
     (name "rust-multimap")
-- 
2.41.0

[bug#69257] [PATCH 077/228] gnu: Add rust-symbolic-demangle-12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-symbolic-demangle-12): Add variable.

Change-Id: If5afdfe71b46ed08f8893c5f5834d216c09af831
---
 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 cbc8d4d2fc..2aca3f3ae8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67326,6 +67326,33 @@ (define-public rust-symbolic-common-12
 @code{JavaScript}.")
     (license license:expat)))
 
+(define-public rust-symbolic-demangle-12
+  (package
+    (name "rust-symbolic-demangle")
+    (version "12.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "symbolic-demangle" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0s0s4af53p9h1xwgz5842wa4qdl7ikq43sy4frzac820v899iabn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-cpp-demangle" ,rust-cpp-demangle-0.4)
+                       ("rust-msvc-demangler" ,rust-msvc-demangler-0.9)
+                       ("rust-rustc-demangle" ,rust-rustc-demangle-0.1)
+                       ("rust-symbolic-common" ,rust-symbolic-common-12))
+       #:cargo-development-inputs
+       (("rust-similar-asserts" ,rust-similar-asserts-1))))
+    (home-page "https://github.com/getsentry/symbolic")
+    (synopsis "Library to demangle symbols from various compilers")
+    (description
+     "This package provides a library to demangle symbols from various
+languages and compilers.")
+    (license license:expat)))
+
 (define-public rust-symlink-0.1
   (package
     (name "rust-symlink")
-- 
2.41.0

[bug#69257] [PATCH 078/228] gnu: Add rust-pprof-0.13.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-pprof-0.13): Add variable.

Change-Id: Idb0519f0b070b0082f44f549e14ff5a31196a1c3
---
 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 2aca3f3ae8..9813cc3f4b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49224,6 +49224,48 @@ (define-public rust-powerfmt-macros-0.1
 and should not be relied upon directly.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pprof-0.13
+  (package
+    (name "rust-pprof")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pprof" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1jqi6yakwwhln5b1vr3aprgl2kdlvsmidqh24is7wk6k3g2rfp7g"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-backtrace" ,rust-backtrace-0.3)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-criterion" ,rust-criterion-0.5)
+        ("rust-findshlibs" ,rust-findshlibs-0.10)
+        ("rust-inferno" ,rust-inferno-0.11)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-nix" ,rust-nix-0.26)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-parking-lot" ,rust-parking-lot-0.12)
+        ("rust-prost" ,rust-prost-0.12)
+        ("rust-prost-build" ,rust-prost-build-0.12)
+        ("rust-prost-derive" ,rust-prost-derive-0.12)
+        ("rust-protobuf" ,rust-protobuf-2)
+        ("rust-protobuf-codegen-pure" ,rust-protobuf-codegen-pure-2)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-smallvec" ,rust-smallvec-1)
+        ("rust-symbolic-demangle" ,rust-symbolic-demangle-12)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5)
+                                   ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/tikv/pprof-rs")
+    (synopsis "Internal perf tools for rust programs")
+    (description "This package provides internal perf tools for Rust
+programs.")
+    (license license:asl2.0)))
+
 (define-public rust-pq-sys-0.4
   (package
     (name "rust-pq-sys")
-- 
2.41.0

[bug#69257] [PATCH 079/228] gnu: Add rust-ordered-float-4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-ordered-float-4): Add variable.
(rust-ordered-float-3): Inherit rust-ordered-float-4.

Change-Id: I0df7deda3c1b17424f15a42acc1679a1c33f672a
---
 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 9813cc3f4b..002846456f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44461,20 +44461,21 @@ (define-public rust-ord-subset-3
 PartialOrd types, like floats.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-ordered-float-3
+(define-public rust-ordered-float-4
   (package
     (name "rust-ordered-float")
-    (version "3.4.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "ordered-float" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1gr31ksgbqariv6hz3s5bc15a5vh4k65dyn8m7j59lhnji0b2knq"))))
+    (version "4.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ordered-float" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0kjqcvvbcsibbx3hnj7ag06bd9gv2zfi5ja6rgyh2kbxbh3zfvd7"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1)
+                       ("rust-borsh" ,rust-borsh-1)
                        ("rust-bytemuck" ,rust-bytemuck-1)
                        ("rust-num-traits" ,rust-num-traits-0.2)
                        ("rust-proptest" ,rust-proptest-1)
@@ -44482,13 +44483,28 @@ (define-public rust-ordered-float-3
                        ("rust-rkyv" ,rust-rkyv-0.7)
                        ("rust-schemars" ,rust-schemars-0.8)
                        ("rust-serde" ,rust-serde-1)
-                       ("rust-speedy" ,rust-speedy-0.8))))
+                       ("rust-speedy" ,rust-speedy-0.8))
+       #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1))))
     (home-page "https://github.com/reem/rust-ordered-float")
     (synopsis "Wrappers for total ordering on floats")
     (description
      "This package provides wrappers for total ordering on floats in Rust.")
     (license license:expat)))
 
+(define-public rust-ordered-float-3
+  (package
+    ;; Does not depend on rust-borsh-1 and rust-serde-test-1.
+    (inherit rust-ordered-float-4)
+    (name "rust-ordered-float")
+    (version "3.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ordered-float" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1gr31ksgbqariv6hz3s5bc15a5vh4k65dyn8m7j59lhnji0b2knq"))))))
+
 (define-public rust-ordered-float-2
   (package
     (inherit rust-ordered-float-3)
-- 
2.41.0

[bug#69257] [PATCH 080/228] gnu: Add rust-opentelemetry-sdk-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-opentelemetry-sdk-0.21): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 002846456f..1ec9b8c95e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44277,6 +44277,50 @@ (define-public rust-opentelemetry-0.21
 framework.")
     (license license:asl2.0)))
 
+(define-public rust-opentelemetry-sdk-0.21
+  (package
+    (name "rust-opentelemetry-sdk")
+    (version "0.21.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry_sdk" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1r7gw2j2n800rd0vdnga32yhlfmc3c4y0sadcr97licam74aw5ig"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
+        ("rust-futures-channel" ,rust-futures-channel-0.3)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-glob" ,rust-glob-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-http" ,rust-opentelemetry-http-0.10)
+        ("rust-ordered-float" ,rust-ordered-float-4)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+        ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5)
+                                   ("rust-indexmap" ,rust-indexmap-2)
+                                   ("rust-pprof" ,rust-pprof-0.13))))
+    (home-page "https://github.com/open-telemetry/opentelemetry-rust")
+    (synopsis "SDK for the OpenTelemetry framework")
+    (description
+     "This package provides the SDK for the @code{OpenTelemetry} metrics
+collection and distributed tracing framework.")
+    (license license:asl2.0)))
+
 (define-public rust-opml-1
   (package
     (name "rust-opml")
-- 
2.41.0

[bug#69257] [PATCH 081/228] gnu: Add rust-opentelemetry-semantic-conventions-0.13.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm
(rust-opentelemetry-semantic-conventions-0.13): Add variable.

Change-Id: I836880e1cd72b5ba1f5919144daf30f9a56e4b1b
---
 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 1ec9b8c95e..064a30053e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44321,6 +44321,28 @@ (define-public rust-opentelemetry-sdk-0.21
 collection and distributed tracing framework.")
     (license license:asl2.0)))
 
+(define-public rust-opentelemetry-semantic-conventions-0.13
+  (package
+    (name "rust-opentelemetry-semantic-conventions")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry-semantic-conventions" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "115wbgk840dklyhpg3lwp4x1m643qd7f0vkz8hmfz0pry4g4yxzm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-opentelemetry" ,rust-opentelemetry-0.21))))
+    (home-page (string-append
+                 "https://github.com/open-telemetry/opentelemetry-"
+                 "rust/tree/main/opentelemetry-semantic-conventions"))
+    (synopsis "Semantic conventions for OpenTelemetry")
+    (description "This package provides semantic conventions for
+@code{OpenTelemetry}.")
+    (license license:asl2.0)))
+
 (define-public rust-opml-1
   (package
     (name "rust-opml")
-- 
2.41.0

[bug#69257] [PATCH 082/228] gnu: Place rust-paw-structopt-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-paw-structopt-1): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 064a30053e..56a5d4f6b7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46572,6 +46572,30 @@ (define-public rust-pathdiff-0.2
 path.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-paw-structopt-1
+  (package
+    (name "rust-paw-structopt")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "paw-structopt" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1iwg83xqjpfgpy8wrq173cy7zgkyxfryd230sh34f5qsjdx7zap4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; use of undeclared crate or module `paw`
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-0.4)
+        ("rust-quote" ,rust-quote-0.6)
+        ("rust-structopt" ,rust-structopt-0.2)
+        ("rust-syn" ,rust-syn-0.15))))
+    (home-page "https://github.com/rust-cli/paw")
+    (synopsis "Structopt support for the Paw crate")
+    (description "This package provides Structopt support for the Paw crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-pcap-1
   (package
     (name "rust-pcap")
@@ -63486,30 +63510,6 @@ (define-public rust-paw-raw-1
 implementations.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-paw-structopt-1
-  (package
-    (name "rust-paw-structopt")
-    (version "1.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "paw-structopt" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1iwg83xqjpfgpy8wrq173cy7zgkyxfryd230sh34f5qsjdx7zap4"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f      ; use of undeclared crate or module `paw`
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-0.4)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-structopt" ,rust-structopt-0.2)
-        ("rust-syn" ,rust-syn-0.15))))
-    (home-page "https://github.com/rust-cli/paw")
-    (synopsis "Structopt support for the Paw crate")
-    (description "This package provides Structopt support for the Paw crate.")
-    (license (list license:expat license:asl2.0))))
-
 ;; TODO: Unbundle sleef.
 (define-public rust-sleef-sys-0.1
   (package
-- 
2.41.0

[bug#69257] [PATCH 083/228] gnu: Place rust-paw-raw-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-paw-raw-1): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 56a5d4f6b7..580ecb100a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46572,6 +46572,24 @@ (define-public rust-pathdiff-0.2
 path.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-paw-raw-1
+  (package
+    (name "rust-paw-raw")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "paw-raw" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1wk76ipp34gjh42vivmgdkb2rgr26gwhn34gk7z5l378ixk5j2vz"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/rust-cli/paw")
+    (synopsis "Traits to implement custom Paw implementations")
+    (description "This package provides traits to implement custom Paw
+implementations.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-paw-structopt-1
   (package
     (name "rust-paw-structopt")
@@ -63492,24 +63510,6 @@ (define-public rust-paw-attributes-1
 crate.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-paw-raw-1
-  (package
-    (name "rust-paw-raw")
-    (version "1.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "paw-raw" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1wk76ipp34gjh42vivmgdkb2rgr26gwhn34gk7z5l378ixk5j2vz"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/rust-cli/paw")
-    (synopsis "Traits to implement custom Paw implementations")
-    (description "This package provides traits to implement custom Paw
-implementations.")
-    (license (list license:expat license:asl2.0))))
-
 ;; TODO: Unbundle sleef.
 (define-public rust-sleef-sys-0.1
   (package
-- 
2.41.0

[bug#69257] [PATCH 084/228] gnu: Place rust-paw-attributes-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-paw-attributes-1): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 580ecb100a..ad31493234 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46572,6 +46572,29 @@ (define-public rust-pathdiff-0.2
 path.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-paw-attributes-1
+  (package
+    (name "rust-paw-attributes")
+    (version "1.0.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "paw-attributes" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "0fda1v7y5pfmg8d2v7m0pyvif6c44qjz914jjn718pdyclrmhd8g"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-proc-macro2" ,rust-proc-macro2-1)
+         ("rust-quote" ,rust-quote-1)
+         ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/rust-cli/paw")
+    (synopsis "Proc Macro attributes for the Paw crate")
+    (description "This package provides Proc Macro attributes for the Paw
+crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-paw-raw-1
   (package
     (name "rust-paw-raw")
@@ -63487,29 +63510,6 @@ (define-public rust-paw-1
     (description "This package provides a CLI argument parser.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-paw-attributes-1
-  (package
-    (name "rust-paw-attributes")
-    (version "1.0.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "paw-attributes" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "0fda1v7y5pfmg8d2v7m0pyvif6c44qjz914jjn718pdyclrmhd8g"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2-1)
-         ("rust-quote" ,rust-quote-1)
-         ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/rust-cli/paw")
-    (synopsis "Proc Macro attributes for the Paw crate")
-    (description "This package provides Proc Macro attributes for the Paw
-crate.")
-    (license (list license:expat license:asl2.0))))
-
 ;; TODO: Unbundle sleef.
 (define-public rust-sleef-sys-0.1
   (package
-- 
2.41.0

[bug#69257] [PATCH 085/228] gnu: Place rust-paw-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-paw-1): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ad31493234..197151e55a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46572,6 +46572,32 @@ (define-public rust-pathdiff-0.2
 path.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-paw-1
+  (package
+    (name "rust-paw")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "paw" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1sc481y42rb08hmww525m4539ppl8k0w14kwxp13vg2dasdzrh09"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; `async_await` has been stable since `1.39.0`
+       #:cargo-inputs
+       (("rust-paw-attributes" ,rust-paw-attributes-1)
+        ("rust-paw-raw" ,rust-paw-raw-1))
+       #:cargo-development-inputs
+       (("rust-paw-structopt" ,rust-paw-structopt-1)
+        ("rust-runtime" ,rust-runtime-0.3)
+        ("rust-structopt" ,rust-structopt-0.2))))
+    (home-page "https://github.com/rust-cli/paw")
+    (synopsis "CLI argument parser")
+    (description "This package provides a CLI argument parser.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-paw-attributes-1
   (package
     (name "rust-paw-attributes")
@@ -63484,32 +63510,6 @@ (define-public rust-pathfinder-simd-0.5
     (description "This package provides a simple SIMD Rust library.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-paw-1
-  (package
-    (name "rust-paw")
-    (version "1.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "paw" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1sc481y42rb08hmww525m4539ppl8k0w14kwxp13vg2dasdzrh09"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f  ; `async_await` has been stable since `1.39.0`
-       #:cargo-inputs
-       (("rust-paw-attributes" ,rust-paw-attributes-1)
-        ("rust-paw-raw" ,rust-paw-raw-1))
-       #:cargo-development-inputs
-       (("rust-paw-structopt" ,rust-paw-structopt-1)
-        ("rust-runtime" ,rust-runtime-0.3)
-        ("rust-structopt" ,rust-structopt-0.2))))
-    (home-page "https://github.com/rust-cli/paw")
-    (synopsis "CLI argument parser")
-    (description "This package provides a CLI argument parser.")
-    (license (list license:expat license:asl2.0))))
-
 ;; TODO: Unbundle sleef.
 (define-public rust-sleef-sys-0.1
   (package
-- 
2.41.0

[bug#69257] [PATCH 086/228] gnu: Place rust-pathfinder-simd-0.5 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pathfindder-simd-0.5): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 197151e55a..e6508c8dd5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46572,6 +46572,27 @@ (define-public rust-pathdiff-0.2
 path.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-pathfinder-simd-0.5
+  (package
+    (name "rust-pathfinder-simd")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pathfinder_simd" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zx6yjch2zwlnbrsq3ljnkwzs9jdf4cbh5wwjkjradahqnn4dzir"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-rustc-version" ,rust-rustc-version-0.3))))
+    (home-page "https://github.com/servo/pathfinder")
+    (synopsis "Simple SIMD Rust library")
+    (description "This package provides a simple SIMD Rust library.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-paw-1
   (package
     (name "rust-paw")
@@ -63489,27 +63510,6 @@ (define-public rust-pathfinder-geometry-0.5
 algebra.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-pathfinder-simd-0.5
-  (package
-    (name "rust-pathfinder-simd")
-    (version "0.5.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pathfinder_simd" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1zx6yjch2zwlnbrsq3ljnkwzs9jdf4cbh5wwjkjradahqnn4dzir"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-rustc-version" ,rust-rustc-version-0.3))))
-    (home-page "https://github.com/servo/pathfinder")
-    (synopsis "Simple SIMD Rust library")
-    (description "This package provides a simple SIMD Rust library.")
-    (license (list license:expat license:asl2.0))))
-
 ;; TODO: Unbundle sleef.
 (define-public rust-sleef-sys-0.1
   (package
-- 
2.41.0

[bug#69257] [PATCH 087/228] gnu: Place rust-pathfinder-geometry-0.5 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pathfindder-geometry-0.5): Move
variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e6508c8dd5..c414933a00 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46572,6 +46572,29 @@ (define-public rust-pathdiff-0.2
 path.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-pathfinder-geometry-0.5
+  (package
+    (name "rust-pathfinder-geometry")
+    (version "0.5.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "pathfinder_geometry" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "1lssir0s1cmrpzzrk49jm31nkssh2j715gryww6700x79rxpwyqb"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-log" ,rust-log-0.4)
+         ("rust-pathfinder-simd" ,rust-pathfinder-simd-0.5))))
+    (home-page "https://github.com/servo/pathfinder")
+    (synopsis "Basic SIMD-accelerated geometry/linear algebra")
+    (description "This package provides basic SIMD-accelerated geometry/linear
+algebra.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-pathfinder-simd-0.5
   (package
     (name "rust-pathfinder-simd")
@@ -63487,29 +63510,6 @@ (define-public rust-slab-0.4
 data type.")
     (license license:expat)))
 
-(define-public rust-pathfinder-geometry-0.5
-  (package
-    (name "rust-pathfinder-geometry")
-    (version "0.5.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "pathfinder_geometry" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "1lssir0s1cmrpzzrk49jm31nkssh2j715gryww6700x79rxpwyqb"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-log" ,rust-log-0.4)
-         ("rust-pathfinder-simd" ,rust-pathfinder-simd-0.5))))
-    (home-page "https://github.com/servo/pathfinder")
-    (synopsis "Basic SIMD-accelerated geometry/linear algebra")
-    (description "This package provides basic SIMD-accelerated geometry/linear
-algebra.")
-    (license (list license:expat license:asl2.0))))
-
 ;; TODO: Unbundle sleef.
 (define-public rust-sleef-sys-0.1
   (package
-- 
2.41.0

[bug#69257] [PATCH 088/228] gnu: Add rust-prost-types-0.11.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c414933a00..aff8d7db2c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51131,6 +51131,22 @@ (define-public rust-prost-types-0.12
 Protobuf reference for more information about well known types.")
     (license license:asl2.0)))
 
+(define-public rust-prost-types-0.11
+  (package
+    (inherit rust-prost-types-0.12)
+    (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"))))
+    (arguments
+     `(#:cargo-inputs (("rust-prost" ,rust-prost-0.11))
+       #:cargo-development-inputs (("rust-proptest" ,rust-proptest-1))))))
+
 ;; It's recommended that rust-protobuf, rust-protobuf-codegen
 ;; and rust-probuf-codegen-pure be the same version
 (define-public rust-protobuf-2
-- 
2.41.0

[bug#69257] [PATCH 089/228] gnu: Add rust-axum-macros-0.3.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index ef78621eb8..ba4480e1c0 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -1820,6 +1820,36 @@ (define-public rust-axum-macros-0.3
     (description "Macros for @code{axum}.")
     (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
+     `(#: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))
+       #:cargo-development-inputs (("rust-axum" ,rust-axum-0.6)
+                                   ("rust-axum-extra" ,rust-axum-extra-0.7)
+                                   ("rust-rustversion" ,rust-rustversion-1)
+                                   ("rust-serde" ,rust-serde-1)
+                                   ("rust-serde-json" ,rust-serde-json-1)
+                                   ("rust-syn" ,rust-syn-2)
+                                   ("rust-tokio" ,rust-tokio-1)
+                                   ("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://github.com/tokio-rs/axum")
+    (synopsis "Macros for axum")
+    (description "This package provides macros for axum.")
+    (license license:expat)))
+
 (define-public rust-chunked-transfer-1
   (package
     (name "rust-chunked-transfer")
-- 
2.41.0

[bug#69257] [PATCH 090/228] gnu: Add rust-axum-extra-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-axum-extra-0.7): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index ba4480e1c0..a581012109 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -1820,6 +1820,57 @@ (define-public rust-axum-macros-0.3
     (description "Macros for @code{axum}.")
     (license license:expat)))
 
+(define-public rust-axum-extra-0.7
+  (package
+    (name "rust-axum-extra")
+    (version "0.7.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "axum-extra" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gr8mdpi5xfq964zhaygap0qjvzwspvj8fdg41rp6b1qx4xl6gm9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-axum" ,rust-axum-0.6)
+                       ("rust-axum-core" ,rust-axum-core-0.3)
+                       ("rust-axum-macros" ,rust-axum-macros-0.3)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-cookie" ,rust-cookie-0.17)
+                       ("rust-form-urlencoded" ,rust-form-urlencoded-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-multer" ,rust-multer-2)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-prost" ,rust-prost-0.11)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-html-form" ,rust-serde-html-form-0.2)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-stream" ,rust-tokio-stream-0.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))
+       #:cargo-development-inputs (("rust-axum" ,rust-axum-0.6)
+                                   ("rust-axum-macros" ,rust-axum-macros-0.3)
+                                   ("rust-http-body" ,rust-http-body-0.4)
+                                   ("rust-hyper" ,rust-hyper-0.14)
+                                   ("rust-reqwest" ,rust-reqwest-0.11)
+                                   ("rust-serde" ,rust-serde-1)
+                                   ("rust-serde-json" ,rust-serde-json-1)
+                                   ("rust-tokio" ,rust-tokio-1)
+                                   ("rust-tower" ,rust-tower-0.4)
+                                   ("rust-tower-http" ,rust-tower-http-0.4))))
+    (home-page "https://github.com/tokio-rs/axum")
+    (synopsis "Extra utilities for axum")
+    (description "This package provides extra utilities for axum.")
+    (license license:expat)))
+
 (define-public rust-axum-macros-0.3
   (package
     (name "rust-axum-macros")
-- 
2.41.0

[bug#69257] [PATCH 091/228] gnu: Add rust-tonic-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-tonic-0.9): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index a581012109..746d450955 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4049,6 +4049,55 @@ (define-public rust-tonic-0.10
 on high performance, interoperability, and flexibility.")
     (license license:expat)))
 
+(define-public rust-tonic-0.9
+  (package
+    (inherit rust-tonic-0.10)
+    (name "rust-tonic")
+    (version "0.9.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tonic" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nlx35lvah5hdcp6lg1d6dlprq0zz8ijj6f727szfcv479m6d0ih"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-stream" ,rust-async-stream-0.3)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-axum" ,rust-axum-0.6)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-h2" ,rust-h2-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-http-body" ,rust-http-body-0.4)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-hyper-timeout" ,rust-hyper-timeout-0.4)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-pin-project" ,rust-pin-project-1)
+        ("rust-prost" ,rust-prost-0.11)
+        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
+        ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.24)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+        ("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-webpki-roots" ,rust-webpki-roots-0.23))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher-0.1)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-quickcheck-macros" ,rust-quickcheck-macros-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tower" ,rust-tower-0.4))))))
+
 (define-public rust-tonic-0.6
   (package
     (inherit rust-tonic-0.10)
-- 
2.41.0

[bug#69257] [PATCH 092/228] gnu: rust-integer-encoding-3: Update to 3.0.4.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-integer-encoding-3): Update to 3.0.4.

Change-Id: I7ea443428127e2d8422680d1e95dded902992432
---
 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 aff8d7db2c..6d2cbff9f0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31071,14 +31071,14 @@ (define-public rust-instant-0.1
 (define-public rust-integer-encoding-3
   (package
     (name "rust-integer-encoding")
-    (version "3.0.2")
+    (version "3.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "integer-encoding" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1f0mk7d694g2sz4my5zh7i5w4kijx5y16x6dip7fv0pazx013hch"))))
+        (base32 "00ng7jmv6pqwqc8w1297f768bn0spwwicdr7hb40baax00r3gc4b"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.41.0

[bug#69257] [PATCH 093/228] gnu: Add rust-thrift-0.17.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-thrift-0.17): Add variable.
(rust-thrift-0.13): Inherit rust-thrift-0.17.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6d2cbff9f0..ca081eabe3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71124,8 +71124,34 @@ (define-public rust-threadpool-1
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-thrift-0.17
+  (package
+    (name "rust-thrift")
+    (version "0.17.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "thrift" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02cydaqqlp25ri19y3ixi77a7nd85fwvbfn4fp0qpakzzj2vqm3y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-integer-encoding" ,rust-integer-encoding-3)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-ordered-float" ,rust-ordered-float-2)
+                       ("rust-threadpool" ,rust-threadpool-1))))
+    (home-page "https://thrift.apache.org")
+    (synopsis "Rust bindings for the Apache Thrift RPC system")
+    (description
+     "This package provides Rust bindings for the Apache Thrift RPC
+system.")
+    (license license:asl2.0)))
+
 (define-public rust-thrift-0.13
   (package
+    (inherit rust-thrift-0.17)
     (name "rust-thrift")
     (version "0.13.0")
     (source
@@ -71135,7 +71161,6 @@ (define-public rust-thrift-0.13
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0nvbrflb5fw6hmayqppkp97dh63vs2znww92dlkcfz4laia9cv8c"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -71143,12 +71168,7 @@ (define-public rust-thrift-0.13
         ("rust-integer-encoding" ,rust-integer-encoding-1)
         ("rust-log" ,rust-log-0.4)
         ("rust-ordered-float" ,rust-ordered-float-1)
-        ("rust-threadpool" ,rust-threadpool-1))))
-    (home-page "https://thrift.apache.org")
-    (synopsis "Rust bindings for the Apache Thrift RPC system")
-    (description
-     "This crate provides Rust bindings for the Apache Thrift RPC system.")
-    (license license:asl2.0)))
+        ("rust-threadpool" ,rust-threadpool-1))))))
 
 (define-public rust-tikv-jemalloc-sys-0.4
   (package
-- 
2.41.0

[bug#69257] [PATCH 094/228] gnu: Add rust-opentelemetry-jaeger-0.20.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-opentelemetry-jaeger-0.20): Add variable.

Change-Id: I4c793b9b993a15d0d31ad2cb485bf79ce32789d1
---
 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 ca081eabe3..c415e0bb09 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44277,6 +44277,62 @@ (define-public rust-opentelemetry-0.21
 framework.")
     (license license:asl2.0)))
 
+(define-public rust-opentelemetry-jaeger-0.20
+  (package
+    (name "rust-opentelemetry-jaeger")
+    (version "0.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry-jaeger" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18gq28byn3x1lfqmji2x29dhk4vkr3yk4sfnpc6hxr48smpwc5z6"))))
+    (build-system cargo-build-system)
+    (arguments
+      ;; error[E0433]: failed to resolve:
+      ;; could not find `testing` in `opentelemetry`
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-headers" ,rust-headers-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-hyper-tls" ,rust-hyper-tls-0.5)
+        ("rust-isahc" ,rust-isahc-1)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-http" ,rust-opentelemetry-http-0.10)
+        ("rust-opentelemetry-semantic-conventions"
+         ,rust-opentelemetry-semantic-conventions-0.13)
+        ("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-prost" ,rust-prost-0.11)
+        ("rust-prost-types" ,rust-prost-types-0.11)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-surf" ,rust-surf-2)
+        ("rust-thrift" ,rust-thrift-0.17)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tonic" ,rust-tonic-0.9)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
+        ("rust-web-sys" ,rust-web-sys-0.3))
+       #:cargo-development-inputs
+       (("rust-bytes" ,rust-bytes-1)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-tokio" ,rust-tokio-1))))
+    (home-page (string-append "https://github.com/open-telemetry/opentele"
+                              "metry-rust/tree/main/opentelemetry-jaeger"))
+    (synopsis "Jaeger exporter for OpenTelemetry")
+    (description "This package provides a Jaeger exporter for
+@code{OpenTelemetry}.")
+    (license license:asl2.0)))
+
 (define-public rust-opentelemetry-sdk-0.21
   (package
     (name "rust-opentelemetry-sdk")
-- 
2.41.0

[bug#69257] [PATCH 095/228] gnu: Add rust-prost-build-0.11.

[Herman Rimm via Guix-patches via]

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

Change-Id: I797b4ce58b870497f268a3555c9c404710b54d86
---
 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 c415e0bb09..738038eee4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51098,6 +51098,39 @@ (define-public rust-prost-build-0.12
 files as part of a Cargo build.")
     (license license:asl2.0)))
 
+(define-public rust-prost-build-0.11
+  (package
+    (inherit rust-prost-build-0.12)
+    (name "rust-prost-build")
+    (version "0.11.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "prost-build" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0w5jx97q96ydhkg67wx3lb11kfy8195c56g0476glzws5iak758i"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bytes" ,rust-bytes-1)
+        ("rust-heck" ,rust-heck-0.4)
+        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-multimap" ,rust-multimap-0.8)
+        ("rust-petgraph" ,rust-petgraph-0.6)
+        ("rust-prettyplease" ,rust-prettyplease-0.1)
+        ("rust-prost" ,rust-prost-0.11)
+        ("rust-prost-types" ,rust-prost-types-0.11)
+        ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9)
+        ("rust-pulldown-cmark-to-cmark" ,rust-pulldown-cmark-to-cmark-10)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-syn" ,rust-syn-1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-which" ,rust-which-4))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.8))))))
+
 (define-public rust-prost-derive-0.12
   (package
     (name "rust-prost-derive")
-- 
2.41.0

[bug#69257] [PATCH 096/228] gnu: Add rust-grpcio-compiler-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-grpcio-compiler-0.12): Add variable.

Change-Id: Id485ae69a2ff3d93442f4bd51d269e9fda18f5b4
---
 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 738038eee4..bbda094054 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27804,6 +27804,31 @@ (define-public rust-groupable-0.2
      "This package aggregates groups of values from key-value iterators.")
     (license license:expat)))
 
+(define-public rust-grpcio-compiler-0.12
+  (package
+    (name "rust-grpcio-compiler")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "grpcio-compiler" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1rck9047121w1fd6lgg344frn0dv32mh5y7hc0ca15rm8w9hcgfs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5)
+                       ("rust-prost" ,rust-prost-0.11)
+                       ("rust-prost-build" ,rust-prost-build-0.11)
+                       ("rust-prost-types" ,rust-prost-types-0.11)
+                       ("rust-protobuf" ,rust-protobuf-2)
+                       ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/tikv/grpc-rs")
+    (synopsis "gRPC compiler for grpcio")
+    (description
+      "This package provides a @code{gRPC} compiler for grpcio.")
+    (license license:asl2.0)))
+
 (define-public rust-gumdrop-0.8
   (package
     (name "rust-gumdrop")
-- 
2.41.0

[bug#69257] [PATCH 097/228] gnu: Add rust-boringssl-src-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-boringssl-src0.5): Add variable.

Change-Id: I409f5bfd1b16a6018a705cb8815e6810c5a5ead6
---
 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 bbda094054..15ff8a2b76 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7612,6 +7612,25 @@ (define-public rust-blocking-0.4
         ("rust-parking" ,rust-parking-1)
         ("rust-waker-fn" ,rust-waker-fn-1))))))
 
+(define-public rust-boringssl-src-0.5
+  (package
+    (name "rust-boringssl-src")
+    (version "0.5.2+6195bf8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "boringssl-src" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mf6mr59qhgf1zrx9wfs0rmqd6f9ya5x0g81la1flxp2qp66bdbs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cmake" ,rust-cmake-0.1))))
+    (home-page "https://github.com/BusyJay/boringssl-src-rs")
+    (synopsis "A crate for building BoringSSL")
+    (description "This package provides a crate for building BoringSSL.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-borsh-1
   (package
     (name "rust-borsh")
-- 
2.41.0

[bug#69257] [PATCH 098/228] gnu: Add rust-grpcio-sys-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-grpcio-sys-0.12): Add variable.

Change-Id: I63484c21aca89aa348eb160fcae41676a87c5564
---
 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 15ff8a2b76..d8e4f6f949 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27848,6 +27848,34 @@ (define-public rust-grpcio-compiler-0.12
       "This package provides a @code{gRPC} compiler for grpcio.")
     (license license:asl2.0)))
 
+(define-public rust-grpcio-sys-0.12
+  (package
+    (name "rust-grpcio-sys")
+    (version "0.12.1+1.46.5-patched")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "grpcio-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qpcvarqzwd2lz43z02wxx6rkd3zhk7dm3a2y01l5x5n0cc5sqng"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.59)
+                       ("rust-boringssl-src" ,rust-boringssl-src-0.5)
+                       ("rust-cc" ,rust-cc-1)
+                       ("rust-cmake" ,rust-cmake-0.1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libz-sys" ,rust-libz-sys-1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3)
+                       ("rust-walkdir" ,rust-walkdir-2))))
+    (home-page "https://github.com/tikv/grpc-rs")
+    (synopsis "FFI bindings to gRPC c core library")
+    (description "This package provides FFI bindings to the @code{gRPC}
+C core library.")
+    (license license:asl2.0)))
+
 (define-public rust-gumdrop-0.8
   (package
     (name "rust-gumdrop")
-- 
2.41.0

[bug#69257] [PATCH 099/228] gnu: Add rust-grpcio-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-grpcio-0.12): Add variable.

Change-Id: I985317ac862f4b50e3428ee6f9dbcf57f8eae5a6
---
 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 d8e4f6f949..83dcf109f1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27823,6 +27823,35 @@ (define-public rust-groupable-0.2
      "This package aggregates groups of values from key-value iterators.")
     (license license:expat)))
 
+(define-public rust-grpcio-0.12
+  (package
+    (name "rust-grpcio")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "grpcio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02j3dxlww8m2gf09m2abiw2msgyqkvd2z4w1viibdbhva3535630"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-futures-executor" ,rust-futures-executor-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-grpcio-sys" ,rust-grpcio-sys-0.12)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-prost" ,rust-prost-0.11)
+                       ("rust-protobuf" ,rust-protobuf-2))))
+    (home-page "https://github.com/tikv/grpc-rs")
+    (synopsis "Rust implementation of gRPC based on the C core library.")
+    (description
+     "This package provides the Rust language implementation of
+@code{gRPC} based on the @code{gRPC} C core library.")
+    (license license:asl2.0)))
+
 (define-public rust-grpcio-compiler-0.12
   (package
     (name "rust-grpcio-compiler")
-- 
2.41.0

[bug#69257] [PATCH 100/228] gnu: Add rust-tonic-build-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-tonic-build-0.9): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 746d450955..50ed2279d1 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4172,6 +4172,31 @@ (define-public rust-tonic-build-0.10
     (description "Codegen module of @code{tonic} @code{gRPC} implementation.")
     (license license:expat)))
 
+(define-public rust-tonic-build-0.9
+  (package
+    (name "rust-tonic-build")
+    (version "0.9.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tonic-build" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01sbpz52sancgvv5jp1gqz46mz6nzck3m022zrqbnf66qbjamzd6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-prettyplease" ,rust-prettyplease-0.1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-prost-build" ,rust-prost-build-0.11)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/hyperium/tonic")
+    (synopsis "Code generation for the `tonic` gRPC implementation")
+    (description
+      "This package provides code generation for the `tonic` @code{gRPC}
+implementation.")
+    (license license:expat)))
+
 (define-public rust-tower-0.4
   (package
     (name "rust-tower")
-- 
2.41.0

[bug#69257] [PATCH 101/228] gnu: rust-rustc-demangle-0.1: Update to 0.1.23.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rustc-demangle-0.1): Update to
0.1.23.

Change-Id: I5aaf308581d64122be297ee3a54a07bbc019fd45
---
 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 83dcf109f1..d38540df2a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58147,7 +58147,7 @@ (define-public rust-rustc-ap-rustc-lexer-725
 (define-public rust-rustc-demangle-0.1
   (package
     (name "rust-rustc-demangle")
-    (version "0.1.16")
+    (version "0.1.23")
     (source
       (origin
         (method url-fetch)
@@ -58155,7 +58155,7 @@ (define-public rust-rustc-demangle-0.1
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "10qp42sl1wrdbgbbh8rnay2grm976z7hqgz32c4y09l1c071qsac"))))
+          "0xnbk2bmyzshacjm2g1kd4zzv2y2az14bw3sjccq5qkpmsfvn9nn"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.41.0

[bug#69257] [PATCH 102/228] gnu: Add rust-opentelemetry-proto-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-opentelemetry-proto-0.4): Add
variable.
(define-module): Use (gnu packages protobuf) module.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d38540df2a..c78cde3ffa 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44434,6 +44434,46 @@ (define-public rust-opentelemetry-jaeger-0.20
 @code{OpenTelemetry}.")
     (license license:asl2.0)))
 
+(define-public rust-opentelemetry-proto-0.4
+  (package
+    (name "rust-opentelemetry-proto")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry-proto" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qblsq0hkksdw3k60bc8yi5xwlynmqwibggz3lyyl4n8bk75bqd2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-grpcio" ,rust-grpcio-0.12)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21)
+        ("rust-prost" ,rust-prost-0.11)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-tonic" ,rust-tonic-0.9))
+       #:cargo-development-inputs
+       (("rust-grpcio-compiler" ,rust-grpcio-compiler-0.12)
+        ("rust-prost-build" ,rust-prost-build-0.11)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-tonic-build" ,rust-tonic-build-0.9))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'set-protoc-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let* ((protobuf (assoc-ref inputs "protobuf"))
+                    (protoc (string-append protobuf "/bin/protoc")))
+               (setenv "PROTOC" protoc)))))))
+    (native-inputs (list protobuf))
+    (home-page (string-append "https://github.com/open-telemetry/opentele"
+                              "metry-rust/tree/main/opentelemetry-proto"))
+    (synopsis "Protobuf generated files and transformations")
+    (description "This package provides Protobuf generated files and
+transformations.")
+    (license license:asl2.0)))
+
 (define-public rust-opentelemetry-sdk-0.21
   (package
     (name "rust-opentelemetry-sdk")
-- 
2.41.0

[bug#69257] [PATCH 103/228] gnu: Add rust-opentelemetry-otlp-0.14.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-opentelemetry-otlp-0.14): Add
variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c78cde3ffa..36b534e767 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44434,6 +44434,49 @@ (define-public rust-opentelemetry-jaeger-0.20
 @code{OpenTelemetry}.")
     (license license:asl2.0)))
 
+(define-public rust-opentelemetry-otlp-0.14
+  (package
+    (name "rust-opentelemetry-otlp")
+    (version "0.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry-otlp" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0c59bh4wa824mf89ayivsjqwipkg1y6r27r4d0y47lhfna1xlk7j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-grpcio" ,rust-grpcio-0.12)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-http" ,rust-opentelemetry-http-0.10)
+        ("rust-opentelemetry-proto" ,rust-opentelemetry-proto-0.4)
+        ("rust-opentelemetry-semantic-conventions"
+         ,rust-opentelemetry-semantic-conventions-0.13)
+        ("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21)
+        ("rust-prost" ,rust-prost-0.11)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-surf" ,rust-surf-2)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tonic" ,rust-tonic-0.9))
+       #:cargo-development-inputs
+       (("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1))))
+    (home-page
+     "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-otlp")
+    (synopsis "Exporter for the OpenTelemetry Collector")
+    (description "This package provides an exporter for the
+@code{OpenTelemetry} Collector.")
+    (license license:asl2.0)))
+
 (define-public rust-opentelemetry-proto-0.4
   (package
     (name "rust-opentelemetry-proto")
-- 
2.41.0

[bug#69257] [PATCH 104/228] gnu: Add rust-opentelemetry-stdout-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-opentelemetry-stdout-0.2): Add
variable.

Change-Id: I962fce6e734d19a362393f33a6adad58d5c1f409
---
 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 36b534e767..667ca26cec 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44583,6 +44583,35 @@ (define-public rust-opentelemetry-semantic-conventions-0.13
 @code{OpenTelemetry}.")
     (license license:asl2.0)))
 
+(define-public rust-opentelemetry-stdout-0.2
+  (package
+    (name "rust-opentelemetry-stdout")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry-stdout" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gpnf02d7aidj7008w0sggxchh53bdr0ca68k84pdharrps2sfy1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+                       ("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21)
+                       ("rust-ordered-float" ,rust-ordered-float-4)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1))))
+    (home-page
+     "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-stdout")
+    (synopsis "OpenTelemetry exporter for stdout")
+    (description "An @code{OpenTelemetry} exporter for stdout.")
+    (license license:asl2.0)))
+
 (define-public rust-opml-1
   (package
     (name "rust-opml")
-- 
2.41.0

[bug#69257] [PATCH 105/228] gnu: Add rust-tracing-opentelemetry-0.22.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-tracing-opentelemetry-0.22): Add
variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 667ca26cec..edde32486a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -74805,6 +74805,54 @@ (define-public rust-tracing-log-0.1
        #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3)
                                    ("rust-tracing" ,rust-tracing-0.1))))))
 
+(define-public rust-tracing-opentelemetry-0.22
+  (package
+    (name "rust-tracing-opentelemetry")
+    (version "0.22.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tracing-opentelemetry" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15jmwmbp6wz15bx20bfsmabx53wmlnd7wvzwz9hvkrq7aifc4yn6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21)
+        ("rust-smallvec" ,rust-smallvec-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-core" ,rust-tracing-core-0.1)
+        ("rust-tracing-log" ,rust-tracing-log-0.2)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-web-time" ,rust-web-time-0.2))
+       #:cargo-development-inputs
+       (("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-criterion" ,rust-criterion-0.5)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-jaeger" ,rust-opentelemetry-jaeger-0.20)
+        ("rust-opentelemetry-otlp" ,rust-opentelemetry-otlp-0.14)
+        ("rust-opentelemetry-semantic-conventions"
+         ,rust-opentelemetry-semantic-conventions-0.13)
+        ("rust-opentelemetry-stdout" ,rust-opentelemetry-stdout-0.2)
+        ("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21)
+        ("rust-pprof" ,rust-pprof-0.13)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+    (home-page "https://github.com/tokio-rs/tracing-opentelemetry")
+    (synopsis "OpenTelemetry integration for tracing")
+    (description
+      "This package provides @code{OpenTelemetry} integration for tracing.")
+    (license license:expat)))
+
 (define-public rust-tracing-serde-0.1
   (package
     (name "rust-tracing-serde")
-- 
2.41.0

[bug#69257] [PATCH 106/228] gnu: Add rust-mas-tower-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-mas-tower-0.7): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 50ed2279d1..1904b3aa77 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3340,6 +3340,36 @@ (define-public rust-isahc-0.9
         ("rust-test-case" ,rust-test-case-1)
         ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2))))))
 
+(define-public rust-mas-tower-0.7
+  (package
+    (name "rust-mas-tower")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mas-tower" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gf55zyv2822xykc2az253a6n7nvjc129rl2nlwmax9yhjkypgpn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-http" ,rust-http-0.2)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-http" ,rust-opentelemetry-http-0.10)
+        ("rust-opentelemetry-semantic-conventions"
+         ,rust-opentelemetry-semantic-conventions-0.13)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tower" ,rust-tower-0.4)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-opentelemetry" ,rust-tracing-opentelemetry-0.22))))
+    (home-page "https://matrix-org.github.io/matrix-authentication-service/")
+    (synopsis "Tower layers used by the Matrix Authentication Service")
+    (description "This package provides the Tower layers used by the
+Matrix Authentication Service.")
+    (license license:asl2.0)))
+
 (define-public rust-multipart-0.18
   (package
     (name "rust-multipart")
-- 
2.41.0

[bug#69257] [PATCH 107/228] gnu: Add rust-mas-http-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-mas-http-0.7): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 1904b3aa77..1bc8f504ab 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3340,6 +3340,51 @@ (define-public rust-isahc-0.9
         ("rust-test-case" ,rust-test-case-1)
         ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2))))))
 
+(define-public rust-mas-http-0.7
+  (package
+    (name "rust-mas-http")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mas-http" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "063q1gkbzv1ky3kixiffdyxylz8cbgh1b582z1rmxh1b39r4hsfs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-axum" ,rust-axum-0.6)
+        ("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-hyper-rustls" ,rust-hyper-rustls-0.24)
+        ("rust-mas-tower" ,rust-mas-tower-0.7)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-rustls" ,rust-rustls-0.21)
+        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("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-tracing-opentelemetry" ,rust-tracing-opentelemetry-0.22)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.25))
+       #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://matrix-org.github.io/matrix-authentication-service/")
+    (synopsis "HTTP utilities for the Matrix Authentication Service")
+    (description "This package provides HTTP utilities for the Matrix
+Authentication Service.")
+    (license license:asl2.0)))
+
 (define-public rust-mas-tower-0.7
   (package
     (name "rust-mas-tower")
-- 
2.41.0

[bug#69257] [PATCH 108/228] gnu: Add rust-chacha20poly1305-0.10.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-chacha20poly1305-0.10): Add
variable.
(rust-chacha20poly1305-0.9): Inherit from rust-chacha20poly1305-0.10.

Change-Id: I8e3d9270bb06baa051bb9eff8a7a507c5ac4a9ad
---
 gnu/packages/crates-crypto.scm | 46 +++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 599fdd3a8c..0a01c18536 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -1169,8 +1169,41 @@ (define-public rust-chacha20-0.8
        (("rust-cipher" ,rust-cipher-0.3)
         ("rust-hex-literal" ,rust-hex-literal-0.2))))))
 
+(define-public rust-chacha20poly1305-0.10
+  (package
+    (name "rust-chacha20poly1305")
+    (version "0.10.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "chacha20poly1305" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dfwq9ag7x7lnd0znafpcn8h7k4nfr9gkzm0w7sc1lcj451pkk8h"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-aead" ,rust-aead-0.5)
+                       ("rust-chacha20" ,rust-chacha20-0.9)
+                       ("rust-cipher" ,rust-cipher-0.4)
+                       ("rust-poly1305" ,rust-poly1305-0.8)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-aead" ,rust-aead-0.5))))
+    (home-page
+     "https://github.com/RustCrypto/AEADs/tree/master/chacha20poly1305")
+    (synopsis
+     "Rust implementation of ChaCha20Poly1305 Authenticated Encryption")
+    (description
+     "Pure Rust implementation of the ChaCha20Poly1305 Authenticated
+Encryption with Additional Data Cipher (RFC 8439) with optional
+architecture-specific hardware acceleration.  Also contains
+implementations of the XChaCha20Poly1305 extended nonce variant of
+ChaCha20Poly1305, and the reduced-round ChaCha8Poly1305 and
+ChaCha12Poly1305 lightweight variants.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-chacha20poly1305-0.9
   (package
+    (inherit rust-chacha20poly1305-0.10)
     (name "rust-chacha20poly1305")
     (version "0.9.1")
     (source
@@ -1185,7 +1218,6 @@ (define-public rust-chacha20poly1305-0.9
         '(begin
            (substitute* "Cargo.toml"
              (("version = \">=1, <1.5\"") "version = \"^1\""))))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-aead" ,rust-aead-0.4)
@@ -1194,17 +1226,7 @@ (define-public rust-chacha20poly1305-0.9
         ("rust-poly1305" ,rust-poly1305-0.7)
         ("rust-zeroize" ,rust-zeroize-1))
        #:cargo-development-inputs
-       (("rust-aead" ,rust-aead-0.4))))
-    (home-page "https://github.com/RustCrypto/AEADs/tree/master/chacha20poly1305")
-    (synopsis
-     "Pure Rust implementation of ChaCha20Poly1305 Authenticated Encryption")
-    (description
-     "Pure Rust implementation of the ChaCha20Poly1305 Authenticated
-Encryption with Additional Data Cipher (RFC 8439) with optional
-architecture-specific hardware acceleration.  Also contains implementations of
-the XChaCha20Poly1305 extended nonce variant of ChaCha20Poly1305, and the
-reduced-round ChaCha8Poly1305 and ChaCha12Poly1305 lightweight variants.")
-    (license (list license:asl2.0 license:expat))))
+       (("rust-aead" ,rust-aead-0.4))))))
 
 (define-public rust-cipher-0.4
   (package
-- 
2.41.0

[bug#69257] [PATCH 109/228] gnu: Add rust-mas-keystore-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-mas-keystore-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index edde32486a..b20eff485b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37113,6 +37113,50 @@ (define-public rust-mas-iana-0.7
 OAuth 2.0.")
     (license license:asl2.0)))
 
+(define-public rust-mas-keystore-0.7
+  (package
+    (name "rust-mas-keystore")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mas-keystore" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04kr3mbmsjnim9s373iy62qrqd236zi4ff9cyqfd41aqiw9jlp57"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-aead" ,rust-aead-0.5)
+                       ("rust-base64ct" ,rust-base64ct-1)
+                       ("rust-chacha20poly1305" ,rust-chacha20poly1305-0.10)
+                       ("rust-const-oid" ,rust-const-oid-0.9)
+                       ("rust-der" ,rust-der-0.7)
+                       ("rust-ecdsa" ,rust-ecdsa-0.16)
+                       ("rust-elliptic-curve" ,rust-elliptic-curve-0.13)
+                       ("rust-generic-array" ,rust-generic-array-0.14)
+                       ("rust-k256" ,rust-k256-0.13)
+                       ("rust-mas-iana" ,rust-mas-iana-0.7)
+                       ("rust-mas-jose" ,rust-mas-jose-0.7)
+                       ("rust-p256" ,rust-p256-0.13)
+                       ("rust-p384" ,rust-p384-0.13)
+                       ("rust-pem-rfc7468" ,rust-pem-rfc7468-0.7)
+                       ("rust-pkcs1" ,rust-pkcs1-0.7)
+                       ("rust-pkcs8" ,rust-pkcs8-0.10)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rsa" ,rust-rsa-0.9)
+                       ("rust-sec1" ,rust-sec1-0.7)
+                       ("rust-spki" ,rust-spki-0.7)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-insta" ,rust-insta-1)
+        ("rust-rand-chacha" ,rust-rand-chacha-0.3))))
+    (home-page "https://matrix-org.github.io/matrix-authentication-service/")
+    (synopsis "Keystore used by the Matrix Authentication Service")
+    (description
+      "This package provides a secret-key store used by the Matrix
+Authentication Service.")
+    (license license:asl2.0)))
+
 (define-public rust-matchit-0.7
   (package
     (name "rust-matchit")
-- 
2.41.0

[bug#69257] [PATCH 110/228] gnu: Place rust-const-format-proc-macros-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-const-format-proc-macros-0.2): Move
variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b20eff485b..cb0d32d7c2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12852,29 +12852,6 @@ (define-public rust-const-format-0.2
     (description "This package provides compile-time string formatting.")
     (license license:zlib)))
 
-(define-public rust-const-format-proc-macros-0.2
-  (package
-    (name "rust-const-format-proc-macros")
-    (version "0.2.32")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "const_format_proc_macros" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0015dzbjbd773nn6096dwqv11fm8m3gy4a4a56cz5x10zl4gzxn7"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-1)
-                       ("rust-unicode-xid" ,rust-unicode-xid-0.2))
-       #:cargo-development-inputs (("rust-fastrand" ,rust-fastrand-1))))
-    (home-page "https://github.com/rodrimati1992/const_format_crates/")
-    (synopsis "Implementation detail of the @code{const_format} crate")
-    (description "Implementation detail of the @code{const_format} crate.")
-    (license license:zlib)))
-
 ;; This package requires features which are unavailable
 ;; on the stable releases of Rust.
 (define-public rust-compiler-builtins-0.1
@@ -13735,6 +13712,29 @@ (define-public rust-const-fn-0.4
 const functions with conditional compilations.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-const-format-proc-macros-0.2
+  (package
+    (name "rust-const-format-proc-macros")
+    (version "0.2.32")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "const_format_proc_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0015dzbjbd773nn6096dwqv11fm8m3gy4a4a56cz5x10zl4gzxn7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1)
+                       ("rust-unicode-xid" ,rust-unicode-xid-0.2))
+       #:cargo-development-inputs (("rust-fastrand" ,rust-fastrand-1))))
+    (home-page "https://github.com/rodrimati1992/const_format_crates/")
+    (synopsis "Implementation detail of the @code{const_format} crate")
+    (description "Implementation detail of the @code{const_format} crate.")
+    (license license:zlib)))
+
 (define-public rust-const-oid-0.9
   (package
     (name "rust-const-oid")
-- 
2.41.0

[bug#69257] [PATCH 111/228] gnu: Place rust-const-format-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-const-format-0.2): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cb0d32d7c2..1fd107c77e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12827,31 +12827,6 @@ (define-public rust-const-fn-assert-0.1
     (description "Assertions for const functions.")
     (license license:expat)))
 
-(define-public rust-const-format-0.2
-  (package
-    (name "rust-const-format")
-    (version "0.2.32")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "const_format" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0wvns8mzqwkyciwr00p2g5g4ak7zz8m473di85srj11xmz3i98p3"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-test-flags
-       '("--release" "--features=__test")
-       #:cargo-inputs
-       (("rust-const-format-proc-macros" ,rust-const-format-proc-macros-0.2)
-        ("rust-konst" ,rust-konst-0.2))
-       #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.5)
-                                   ("rust-fastrand" ,rust-fastrand-1))))
-    (home-page "https://github.com/rodrimati1992/const_format_crates/")
-    (synopsis "Compile-time string formatting")
-    (description "This package provides compile-time string formatting.")
-    (license license:zlib)))
-
 ;; This package requires features which are unavailable
 ;; on the stable releases of Rust.
 (define-public rust-compiler-builtins-0.1
@@ -13712,6 +13687,31 @@ (define-public rust-const-fn-0.4
 const functions with conditional compilations.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-const-format-0.2
+  (package
+    (name "rust-const-format")
+    (version "0.2.32")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "const_format" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0wvns8mzqwkyciwr00p2g5g4ak7zz8m473di85srj11xmz3i98p3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--features=__test")
+       #:cargo-inputs
+       (("rust-const-format-proc-macros" ,rust-const-format-proc-macros-0.2)
+        ("rust-konst" ,rust-konst-0.2))
+       #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.5)
+                                   ("rust-fastrand" ,rust-fastrand-1))))
+    (home-page "https://github.com/rodrimati1992/const_format_crates/")
+    (synopsis "Compile-time string formatting")
+    (description "This package provides compile-time string formatting.")
+    (license license:zlib)))
+
 (define-public rust-const-format-proc-macros-0.2
   (package
     (name "rust-const-format-proc-macros")
-- 
2.41.0

[bug#69257] [PATCH 112/228] gnu: Place rust-const-fn-assert-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-const-fn-assert-0.1): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1fd107c77e..614cccdfc5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12811,22 +12811,6 @@ (define-public rust-const-cstr-0.3
 literals.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-const-fn-assert-0.1
-  (package
-    (name "rust-const-fn-assert")
-    (version "0.1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "const_fn_assert" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "1451yxndri5zj95lyjzckj7m3qlpyj8ibp3pb8bbbxrl7zr19mi7"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/powlpy/const_fn_assert")
-    (synopsis "Assertions for const functions")
-    (description "Assertions for const functions.")
-    (license license:expat)))
-
 ;; This package requires features which are unavailable
 ;; on the stable releases of Rust.
 (define-public rust-compiler-builtins-0.1
@@ -13687,6 +13671,22 @@ (define-public rust-const-fn-0.4
 const functions with conditional compilations.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-const-fn-assert-0.1
+  (package
+    (name "rust-const-fn-assert")
+    (version "0.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "const_fn_assert" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1451yxndri5zj95lyjzckj7m3qlpyj8ibp3pb8bbbxrl7zr19mi7"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/powlpy/const_fn_assert")
+    (synopsis "Assertions for const functions")
+    (description "Assertions for const functions.")
+    (license license:expat)))
+
 (define-public rust-const-format-0.2
   (package
     (name "rust-const-format")
-- 
2.41.0

[bug#69257] [PATCH 113/228] gnu: Place rust-const-cstr-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-const-cstr-0.3): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 614cccdfc5..4ff4eed619 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12792,25 +12792,6 @@ (define-public rust-compound-duration-1
 minutes, seconds.")
     (license license:bsd-3)))
 
-(define-public rust-const-cstr-0.3
-  (package
-    (name "rust-const-cstr")
-    (version "0.3.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "const-cstr" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "19ij6m8s16d0i7vma535l7w4x8bcanjcxs7c6n7sci86ydghnggd"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/cybergeek94/const-cstr")
-    (synopsis "Create static C-compatible strings from Rust string literals")
-    (description
-     "This crate lets you create static C-compatible strings from Rust string
-literals.")
-    (license (list license:expat license:asl2.0))))
-
 ;; This package requires features which are unavailable
 ;; on the stable releases of Rust.
 (define-public rust-compiler-builtins-0.1
@@ -13652,6 +13633,25 @@ (define-public rust-console-log-0.1
 the browser's console.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-const-cstr-0.3
+  (package
+    (name "rust-const-cstr")
+    (version "0.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "const-cstr" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "19ij6m8s16d0i7vma535l7w4x8bcanjcxs7c6n7sci86ydghnggd"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/cybergeek94/const-cstr")
+    (synopsis "Create static C-compatible strings from Rust string literals")
+    (description
+     "This crate lets you create static C-compatible strings from Rust string
+literals.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-const-fn-0.4
   (package
     (name "rust-const-fn")
-- 
2.41.0

[bug#69257] [PATCH 114/228] gnu: Place rust-compound-duration-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-compound-duration-1): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4ff4eed619..af20149f6b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12773,25 +12773,6 @@ (define-public rust-compact-str-0.7
 stores strings on the stack, when possible.")
     (license license:expat)))
 
-(define-public rust-compound-duration-1
-  (package
-    (name "rust-compound-duration")
-    (version "1.2.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "compound_duration" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0rb5kasd7044xxb73wz2qqxv6iwawp9gipvqhya8yybafh7a679r"))))
-    (build-system cargo-build-system)
-    (home-page "https://docs.rs/compound_duration/latest/compound_duration/")
-    (synopsis "Convert seconds to compound duration")
-    (description
-     "Convert seconds to compound duration, such as: week, days, hours,
-minutes, seconds.")
-    (license license:bsd-3)))
-
 ;; This package requires features which are unavailable
 ;; on the stable releases of Rust.
 (define-public rust-compiler-builtins-0.1
@@ -12983,6 +12964,25 @@ (define-public rust-completest-pty-0.5
      "This package provides running completions for your program.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-compound-duration-1
+  (package
+    (name "rust-compound-duration")
+    (version "1.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "compound_duration" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0rb5kasd7044xxb73wz2qqxv6iwawp9gipvqhya8yybafh7a679r"))))
+    (build-system cargo-build-system)
+    (home-page "https://docs.rs/compound_duration/latest/compound_duration/")
+    (synopsis "Convert seconds to compound duration")
+    (description
+     "Convert seconds to compound duration, such as: week, days, hours,
+minutes, seconds.")
+    (license license:bsd-3)))
+
 (define-public rust-comrak-0.18
   (package
     (name "rust-comrak")
-- 
2.41.0

[bug#69257] [PATCH 115/228] gnu: Add rust-warp-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-warp-0.3): Add variable.
(rust-warp-0.2): Inherit from rust-warp-0.3.

Change-Id: I5f3683ac83fd4d607b3095285f263eb889ece61e
---
 gnu/packages/crates-web.scm | 53 ++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 1bc8f504ab..afd85d4d1e 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -5750,8 +5750,54 @@ (define-public rust-typed-headers-0.1
         ("rust-http" ,rust-http-0.1)
         ("rust-mime" ,rust-mime-0.3))))))
 
+(define-public rust-warp-0.3
+  (package
+    (name "rust-warp")
+    (version "0.3.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "warp" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0sfimrpxkyka1mavfhg5wa4x977qs8vyxa510c627w9zw0i2xsf1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-async-compression" ,rust-async-compression-0.3)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-futures-channel" ,rust-futures-channel-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-headers" ,rust-headers-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-mime" ,rust-mime-0.3)
+        ("rust-mime-guess" ,rust-mime-guess-2)
+        ("rust-multer" ,rust-multer-2)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-pin-project" ,rust-pin-project-1)
+        ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+        ("rust-scoped-tls" ,rust-scoped-tls-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.24)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+        ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.20)
+        ("rust-tokio-util" ,rust-tokio-util-0.7)
+        ("rust-tower-service" ,rust-tower-service-0.3)
+        ("rust-tracing" ,rust-tracing-0.1))))
+    (home-page "https://github.com/seanmonstar/warp")
+    (synopsis "Serve the web at warp speeds")
+    (description "Warp is a composable, web server framework.")
+    (license license:expat)))
+
 (define-public rust-warp-0.2
   (package
+    (inherit rust-warp-0.3)
     (name "rust-warp")
     (version "0.2.5")
     (source
@@ -5761,7 +5807,6 @@ (define-public rust-warp-0.2
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "01wl8kv5hh1dd7gcwdrmn9xfs7jjsh9yc8xa06ph8yf9akgyc6zl"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -5786,11 +5831,7 @@ (define-public rust-warp-0.2
         ("rust-tower-service" ,rust-tower-service-0.3)
         ("rust-tracing" ,rust-tracing-0.1)
         ("rust-tracing-futures" ,rust-tracing-futures-0.2)
-        ("rust-urlencoding" ,rust-urlencoding-1))))
-    (home-page "https://github.com/seanmonstar/warp")
-    (synopsis "Composable web server framework")
-    (description "Warp is a composable, web server framework.")
-    (license license:expat)))
+        ("rust-urlencoding" ,rust-urlencoding-1))))))
 
 (define-public rust-web-view-0.7
   (package
-- 
2.41.0

[bug#69257] [PATCH 116/228] gnu: Add rust-ordered-multimap-0.4.

[Herman Rimm via Guix-patches via]

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

Change-Id: Ibe77e9bb8268861c20c848cc9efb2307fb6ff1e7
---
 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 af20149f6b..a1845eeb52 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44922,8 +44922,31 @@ (define-public rust-ordered-float-1
         (base32
          "0625x96987kspdxbikry5mb7hsf5pdc5bbanxd8wjwqlx0ar71hq"))))))
 
+(define-public rust-ordered-multimap-0.4
+  (package
+    (name "rust-ordered-multimap")
+    (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 "0jljv1257pfyf855jlwwas5mqkzk40b9lqfx40f73qbpf7ildmyc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#: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
@@ -44933,18 +44956,12 @@ (define-public rust-ordered-multimap-0.3
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1194q7sb2d6chbllsn7237dhhvx04iqr3sq0ii16w1pcv5x2qrqw"))))
-    (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))))
-    (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)))
+        ("rust-serde" ,rust-serde-1))))))
 
 (define-public rust-ordered-stream-0.2
   (package
-- 
2.41.0

[bug#69257] [PATCH 117/228] gnu: Add rust-rust-ini-0.18.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a1845eeb52..49d7df80a0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58225,23 +58225,22 @@ (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
+     `(#:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-ordered-multimap" ,rust-ordered-multimap-0.3)
+        ("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")
@@ -58249,6 +58248,25 @@ (define-public rust-rust-ini-0.17
      "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#69257] [PATCH 118/228] gnu: Add rust-json5-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-json5-0.4): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index afd85d4d1e..2865501278 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3340,6 +3340,32 @@ (define-public rust-isahc-0.9
         ("rust-test-case" ,rust-test-case-1)
         ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2))))))
 
+(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
+     `(#:cargo-inputs (("rust-pest" ,rust-pest-2)
+                       ("rust-pest-derive" ,rust-pest-derive-2)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-matches" ,rust-matches-0.1)
+                                   ("rust-serde-derive" ,rust-serde-derive-1)
+                                   ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/callum-oakley/json5-rs")
+    (synopsis "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-mas-http-0.7
   (package
     (name "rust-mas-http")
-- 
2.41.0

[bug#69257] [PATCH 119/228] gnu: Add rust-temp-env-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-temp-env-0.2): Add variable.

Change-Id: I190d0442b55fa80522a9a47b8cd516c18efe3ea0
---
 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 49d7df80a0..08e1823a3f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70005,6 +70005,26 @@ (define-public rust-tectonic-xetex-layout-0.2
 a C API.")
     (license license:expat)))
 
+(define-public rust-temp-env-0.2
+  (package
+    (name "rust-temp-env")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "temp-env" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mxbfwcrbzgplf5ixs4n2xsl3pqazna25h2kfjwc9y6xq8v72425"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1))))
+    (home-page "https://github.com/vmx/temp-env")
+    (synopsis "Set environment variables temporarily")
+    (description
+     "This package lets you set environment variables temporarily.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-temp-testdir-0.2
   (package
     (name "rust-temp-testdir")
-- 
2.41.0

[bug#69257] [PATCH 120/228] gnu: Add rust-config-0.13.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 08e1823a3f..e0dd97e5b2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13266,8 +13266,51 @@ (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
+     `(#: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))
+       #:cargo-development-inputs (("rust-chrono" ,rust-chrono-0.4)
+                                   ("rust-float-cmp" ,rust-float-cmp-0.9)
+                                   ("rust-futures" ,rust-futures-0.3)
+                                   ("rust-glob" ,rust-glob-0.3)
+                                   ("rust-notify" ,rust-notify-4)
+                                   ("rust-reqwest" ,rust-reqwest-0.11)
+                                   ("rust-serde-derive" ,rust-serde-derive-1)
+                                   ("rust-temp-env" ,rust-temp-env-0.2)
+                                   ("rust-tokio" ,rust-tokio-1)
+                                   ("rust-warp" ,rust-warp-0.3))))
+    (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
@@ -13277,7 +13320,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
@@ -13288,13 +13330,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#69257] [PATCH 121/228] gnu: Add rust-deadpool-runtime-0.1.

[Herman Rimm via Guix-patches via]

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

Change-Id: I56637f3a98c6695686f8f951346610b4be7d7626
---
 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 e0dd97e5b2..7b060ddf51 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -17905,6 +17905,27 @@ (define-public rust-deadpool-0.7
 type.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-deadpool-runtime-0.1
+  (package
+    (name "rust-deadpool-runtime")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "deadpool-runtime" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0j9zmm37z6m4fnkf40z6qwidi4z1gwk0piqzx7yz6riazrjakpv3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1)
+                       ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/bikeshedder/deadpool")
+    (synopsis "Dead simple async pool utitities for sync managers")
+    (description "This package provides dead simple async pool utitities
+for sync managers.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-debug-helper-0.3
   (package
     (name "rust-debug-helper")
-- 
2.41.0

[bug#69257] [PATCH 122/228] gnu: Add rust-deadpool-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-deadpool-0.9): Add variable.
(rust-deadpool-0.7): Inherit from rust-deadpool-0.9.

Change-Id: I8aee483f5a9e8e7d0a1c11c1452809a957b40e72
---
 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 7b060ddf51..b18058485c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -17877,8 +17877,40 @@ (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-deadpool-0.9
+  (package
+    (name "rust-deadpool")
+    (version "0.9.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "deadpool" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vl5qg5pfx0c9c41g299clfdgz9la6z8361aycb21cia1zwy07s2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-deadpool-runtime" ,rust-deadpool-runtime-0.1)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-retain-mut" ,rust-retain-mut-0.1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1)
+                                   ("rust-config" ,rust-config-0.13)
+                                   ("rust-criterion" ,rust-criterion-0.3)
+                                   ("rust-itertools" ,rust-itertools-0.10)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/bikeshedder/deadpool")
+    (synopsis "Dead simple async pool")
+    (description
+     "Deadpool is a dead simple async pool for connections and objects
+of any type.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-deadpool-0.7
   (package
+    (inherit rust-deadpool-0.9)
     (name "rust-deadpool")
     (version "0.7.0")
     (source
@@ -17888,7 +17920,6 @@ (define-public rust-deadpool-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0vb18xvhmyg6gvvq5vrcqmy4x26ryrmkqpsgwmb4bvkav1wn24ix"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -17897,13 +17928,7 @@ (define-public rust-deadpool-0.7
         ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.3)
         ("rust-num-cpus" ,rust-num-cpus-1)
         ("rust-serde" ,rust-serde-1)
-        ("rust-tokio" ,rust-tokio-1))))
-    (home-page "https://github.com/bikeshedder/deadpool")
-    (synopsis "Dead simple async pool")
-    (description
-     "Deadpool is a dead simple async pool for connections and objects of any
-type.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-tokio" ,rust-tokio-1))))))
 
 (define-public rust-deadpool-runtime-0.1
   (package
-- 
2.41.0

[bug#69257] [PATCH 123/228] gnu: Add rust-assert-json-diff-2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-assert-json-diff-2): Add variable.

Change-Id: I4cba34d21e7d52c9d4110837ce7ad04e065d6f17
---
 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 b18058485c..84aa9a9555 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3838,6 +3838,30 @@ (define-public rust-assert-impl-0.1
     (description "Macro for static assert types implement a trait or not")
     (license license:expat)))
 
+(define-public rust-assert-json-diff-2
+  (package
+    (name "rust-assert-json-diff")
+    (version "2.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "assert-json-diff" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04mg3w0rh3schpla51l18362hsirl23q93aisws2irrj32wg5r27"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-development-inputs
+       (("rust-serde" ,rust-serde-1)
+        ("rust-version-sync" ,rust-version-sync-0.8))))
+    (home-page "https://github.com/davidpdrsn/assert-json-diff")
+    (synopsis "Easily compare two JSON values and get great output")
+    (description "This package lets you easily compare two JSON values
+and get great output.")
+    (license license:expat)))
+
 (define-public rust-assert-matches-1
   (package
     (name "rust-assert-matches")
-- 
2.41.0

[bug#69257] [PATCH 124/228] gnu: Add rust-wiremock-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-wiremock-0.5): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 2865501278..257e16fd1c 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -6257,3 +6257,42 @@ (define-public rust-webview-sys-0.6
 implementation of webview, a tiny cross-platform library to render web-based
 GUIs as desktop applications.")
     (license license:expat)))
+
+(define-public rust-wiremock-0.5
+  (package
+    (name "rust-wiremock")
+    (version "0.5.22")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wiremock" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1sf2adr5q3xqrj4sa89fmbr5vl3x51wb1cfp63fr1wrlmwzab8qk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-assert-json-diff" ,rust-assert-json-diff-2)
+                       ("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-deadpool" ,rust-deadpool-0.9)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-futures-timer" ,rust-futures-timer-3)
+                       ("rust-http-types" ,rust-http-types-2)
+                       ("rust-hyper" ,rust-hyper-0.14)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-actix-rt" ,rust-actix-rt-2)
+                                   ("rust-async-std" ,rust-async-std-1)
+                                   ("rust-isahc" ,rust-isahc-1)
+                                   ("rust-reqwest" ,rust-reqwest-0.11)
+                                   ("rust-surf" ,rust-surf-2)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/LukeMathWalker/wiremock-rs")
+    (synopsis "HTTP mocking to test Rust applications.")
+    (description "This package provides HTTP mocking to test Rust
+applications.")
+    (license (list license:expat license:asl2.0))))
-- 
2.41.0

[bug#69257] [PATCH 125/228] gnu: Add rust-mas-oidc-client-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-mas-oidc-client-0.7): Add variable.

Change-Id: Ib87bf4d854d31e42b2b38189717bd386d64f492b
---
 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 84aa9a9555..b5b1552dc6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37263,6 +37263,62 @@ (define-public rust-mas-keystore-0.7
 Authentication Service.")
     (license license:asl2.0)))
 
+(define-public rust-mas-oidc-client-0.7
+  (package
+    (name "rust-mas-oidc-client")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mas-oidc-client" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0wg5w937sv1ljcfvarmvm8j5mzgi6ss2f7n61rs5ql8g4jsgjf1i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-base64ct" ,rust-base64ct-1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-form-urlencoded" ,rust-form-urlencoded-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-hyper-rustls" ,rust-hyper-rustls-0.24)
+                       ("rust-language-tags" ,rust-language-tags-0.3)
+                       ("rust-mas-http" ,rust-mas-http-0.7)
+                       ("rust-mas-iana" ,rust-mas-iana-0.7)
+                       ("rust-mas-jose" ,rust-mas-jose-0.7)
+                       ("rust-mas-keystore" ,rust-mas-keystore-0.7)
+                       ("rust-mime" ,rust-mime-0.3)
+                       ("rust-oauth2-types" ,rust-oauth2-types-0.7)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rustls" ,rust-rustls-0.21)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
+                       ("rust-serde-with" ,rust-serde-with-3)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("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-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-bitflags" ,rust-bitflags-2)
+        ("rust-mas-keystore" ,rust-mas-keystore-0.7)
+        ("rust-rand-chacha" ,rust-rand-chacha-0.3)
+        ("rust-wiremock" ,rust-wiremock-0.5))))
+    (home-page "https://matrix-org.github.io/matrix-authentication-service/")
+    (synopsis "OpenID Connect library for Matrix Authentication Service")
+    (description
+     "This package provides a @code{OpenID} Connect client library used
+by the Matrix Authentication Service.")
+    (license license:asl2.0)))
+
 (define-public rust-matchit-0.7
   (package
     (name "rust-matchit")
-- 
2.41.0

[bug#69257] [PATCH 126/228] gnu: Add rust-matrix-sdk-test-macros-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-test-macros-0.7): Add
variable.

Change-Id: I0282eb05fcfa9dcda296e0f58178519dac3ce49a
---
 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 b5b1552dc6..f0e2316e8a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37424,6 +37424,27 @@ (define-public rust-matchers-0.0
      `(#:cargo-inputs
        (("rust-regex-automata" ,rust-regex-automata-0.1))))))
 
+(define-public rust-matrix-sdk-test-macros-0.7
+  (package
+    (name "rust-matrix-sdk-test-macros")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-test-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0yr48204a44irzg1l3yx1dlfskj8i71c97i6xki4n92i8pw0qnpb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Helper macros to write tests for the Matrix SDK")
+    (description "This package provides helper macros to write tests for
+the Matrix SDK.")
+    (license license:asl2.0)))
+
 (define-public rust-matrixcompare-core-0.1
   (package
     (name "rust-matrixcompare-core")
-- 
2.41.0

[bug#69257] [PATCH 127/228] gnu: Place rust-kuchiki-0.8 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-kuchiki-0.8): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f0e2316e8a..e33247d898 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29426,31 +29426,6 @@ (define-public rust-konst-proc-macros-0.2
     (description "Implementation detail of the @code{konst} crate.")
     (license license:zlib)))
 
-(define-public rust-kuchiki-0.8
-  (package
-    (name "rust-kuchiki")
-    (version "0.8.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "kuchiki" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "0n53hhscgf4az58nnbjfxlqz9k96h3f02c7fhbzpqdriw33fka0y"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-cssparser" ,rust-cssparser-0.27)
-         ("rust-html5ever" ,rust-html5ever-0.25)
-         ("rust-matches" ,rust-matches-0.1)
-         ("rust-selectors" ,rust-selectors-0.22))))
-    (home-page "https://github.com/SimonSapin/kuchiki")
-    (synopsis "HTML/XML tree manipulation library")
-    (description "A library for parsing and serializing HTML and XML documents
-and traversing, manipulating, and querying the document tree.")
-    (license license:expat)))
-
 (define-public rust-human-format-1
   (package
     (name "rust-human-format")
@@ -33154,6 +33129,31 @@ (define-public rust-kstring-2
     (description "Key String provides a Rust package optimized for map keys.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-kuchiki-0.8
+  (package
+    (name "rust-kuchiki")
+    (version "0.8.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "kuchiki" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "0n53hhscgf4az58nnbjfxlqz9k96h3f02c7fhbzpqdriw33fka0y"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-cssparser" ,rust-cssparser-0.27)
+         ("rust-html5ever" ,rust-html5ever-0.25)
+         ("rust-matches" ,rust-matches-0.1)
+         ("rust-selectors" ,rust-selectors-0.22))))
+    (home-page "https://github.com/SimonSapin/kuchiki")
+    (synopsis "HTML/XML tree manipulation library")
+    (description "A library for parsing and serializing HTML and XML documents
+and traversing, manipulating, and querying the document tree.")
+    (license license:expat)))
+
 (define-public rust-kv-log-macro-1
   (package
     (name "rust-kv-log-macro")
-- 
2.41.0

[bug#69257] [PATCH 128/228] gnu: Add rust-konst-proc-macros-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-konst-proc-macros-0.3): Add variable.
(rust-konst-proc-macros-0.2): Move and inherit from
rust-konst-proc-macros-0.3.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e33247d898..eacdb9a35f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29409,23 +29409,6 @@ (define-public rust-konst-macro-rules-0.2
     (description "Implementation detail of the konst crate.")
     (license license:zlib)))
 
-(define-public rust-konst-proc-macros-0.2
-  (package
-    (name "rust-konst-proc-macros")
-    (version "0.2.11")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "konst_proc_macros" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0dxp8mdh3q9d044ql203way4fgbc50n3j3pi2j1x2snlcaa10klq"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/rodrimati1992/konst/")
-    (synopsis "Implementation detail of the @code{konst} crate")
-    (description "Implementation detail of the @code{konst} crate.")
-    (license license:zlib)))
-
 (define-public rust-human-format-1
   (package
     (name "rust-human-format")
@@ -33058,6 +33041,37 @@ (define-public rust-khronos-api-3
      "The Khronos XML API Registry, exposed as byte string constants.")
     (license license:asl2.0)))
 
+(define-public rust-konst-proc-macros-0.3
+  (package
+    (name "rust-konst-proc-macros")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "konst_proc_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hv07c8b0v8rlcwkf2n1fv46d5ldk8md344c5c6dc2ayqcfsna2f"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/rodrimati1992/konst/")
+    (synopsis "Implementation detail of the @code{konst} crate")
+    (description "@code{konst-proc-macros} is an implementation detail
+of the @code{konst} crate.")
+    (license license:zlib)))
+
+(define-public rust-konst-proc-macros-0.2
+  (package
+    (inherit rust-konst-proc-macros-0.3)
+    (name "rust-konst-proc-macros")
+    (version "0.2.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "konst_proc_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dxp8mdh3q9d044ql203way4fgbc50n3j3pi2j1x2snlcaa10klq"))))))
+
 (define-public rust-kqueue-sys-1
   (package
     (name "rust-kqueue-sys")
-- 
2.41.0

[bug#69257] [PATCH 129/228] gnu: Place rust-konst-macro-rules-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-konst-macro-rules-0.2): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index eacdb9a35f..f2910219ca 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29392,23 +29392,6 @@ (define-public rust-konst-0.2
      "Const equivalents of std functions, compile-time comparison, and parsing.")
     (license license:zlib)))
 
-(define-public rust-konst-macro-rules-0.2
-  (package
-    (name "rust-konst-macro-rules")
-    (version "0.2.19")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "konst_macro_rules" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0dswja0dqcww4x3fwjnirc0azv2n6cazn8yv0kddksd8awzkz4x4"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/rodrimati1992/konst/")
-    (synopsis "Implementation detail of the konst crate")
-    (description "Implementation detail of the konst crate.")
-    (license license:zlib)))
-
 (define-public rust-human-format-1
   (package
     (name "rust-human-format")
@@ -33041,6 +33024,23 @@ (define-public rust-khronos-api-3
      "The Khronos XML API Registry, exposed as byte string constants.")
     (license license:asl2.0)))
 
+(define-public rust-konst-macro-rules-0.2
+  (package
+    (name "rust-konst-macro-rules")
+    (version "0.2.19")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "konst_macro_rules" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dswja0dqcww4x3fwjnirc0azv2n6cazn8yv0kddksd8awzkz4x4"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/rodrimati1992/konst/")
+    (synopsis "Implementation detail of the konst crate")
+    (description "Implementation detail of the konst crate.")
+    (license license:zlib)))
+
 (define-public rust-konst-proc-macros-0.3
   (package
     (name "rust-konst-proc-macros")
-- 
2.41.0

[bug#69257] [PATCH 130/228] gnu: Add rust-typewit-proc-macros-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-typewit-proc-macros-1): Add variable.

Change-Id: I9cbf88a48dc449127f159d2b05adf360490538a8
---
 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 f2910219ca..6a48cce125 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -76361,6 +76361,24 @@ (define-public rust-typenum-1
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-typewit-proc-macros-1
+  (package
+    (name "rust-typewit-proc-macros")
+    (version "1.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "typewit_proc_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mlkh4mhbn4b7xg9640blk74bm5ddaa44ihvl0sljw1w5gm86sp3"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/rodrimati1992/typewit/")
+    (synopsis "Implementation detail of typewit")
+    (description
+      "@code{typewit_proc_macros} is an implementation detail of typewit.")
+    (license license:zlib)))
+
 (define-public rust-ubyte-0.10
   (package
     (name "rust-ubyte")
-- 
2.41.0

[bug#69257] [PATCH 131/228] gnu: Add rust-typewit-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-typewit-1): Add variable.

Change-Id: I82923d67800073dde62dfebea45842e1819b5eee
---
 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 6a48cce125..1583a038b5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -76361,6 +76361,30 @@ (define-public rust-typenum-1
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-typewit-1
+  (package
+    (name "rust-typewit")
+    (version "1.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "typewit" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "093fgb1q5n48vr4nj3hggbhfi6jzab5048scs6jz1ynalgk9myy6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-typewit-proc-macros" ,rust-typewit-proc-macros-1))
+       #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.7)
+                                   ("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://github.com/rodrimati1992/typewit/")
+    (synopsis "Type-witness-based abstractions to emulate polymorphism")
+    (description
+     "This package provides type-witness-based abstractions, mostly for
+emulating polymorphism in @code{const} functions.")
+    (license license:zlib)))
+
 (define-public rust-typewit-proc-macros-1
   (package
     (name "rust-typewit-proc-macros")
-- 
2.41.0

[bug#69257] [PATCH 132/228] gnu: Add rust-const-panic-proc-macros-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-const-panic-proc-macros-0.2): Add
variable.

Change-Id: I2022366b7b8886289fa303d720635d0f448ae803
---
 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 1583a038b5..6683c533eb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13848,6 +13848,30 @@ (define-public rust-const-oid-0.6
         (base32 "12vv7csqqjj0x1l5mf51lgqiw76k5c3mb1yzfhfcqysks2j2lvwx"))))
     (arguments `(#:skip-build? #t))))
 
+(define-public rust-const-panic-proc-macros-0.2
+  (package
+    (name "rust-const-panic-proc-macros")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "const_panic_proc_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1addx3a8vi02cdak3ygrqivv02jj73251h85x49aic78yznrhlrr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1)
+                       ("rust-unicode-xid" ,rust-unicode-xid-0.2))))
+    (home-page "https://github.com/rodrimati1992/const_panic/")
+    (synopsis "Implementation detail of the @code{const_panic} crate")
+    (description
+      "@code{const_panic_proc_macros} are an implementation detail of
+the @code{const_panic} crate.")
+    (license license:zlib)))
+
 (define-public rust-const-random-0.1
   (package
     (name "rust-const-random")
-- 
2.41.0

[bug#69257] [PATCH 133/228] gnu: Add rust-const-panic-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-const-panic-0.2): Add variable.

Change-Id: Idafa58ba78b87f4990cffc17c8655371ddbd403b
---
 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 6683c533eb..22fcbaf98d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13848,6 +13848,28 @@ (define-public rust-const-oid-0.6
         (base32 "12vv7csqqjj0x1l5mf51lgqiw76k5c3mb1yzfhfcqysks2j2lvwx"))))
     (arguments `(#:skip-build? #t))))
 
+(define-public rust-const-panic-0.2
+  (package
+    (name "rust-const-panic")
+    (version "0.2.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "const_panic" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16w72mnzjqgwfhlq8cqm6xhd2n6lc1wan08987izv1pcxhwz4lb0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-const-panic-proc-macros" ,rust-const-panic-proc-macros-0.2)
+                       ("rust-typewit" ,rust-typewit-1))
+       #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.7)
+                                   ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/rodrimati1992/const_panic/")
+    (synopsis "Const panic with formatting")
+    (description "This package provides a const panic with formatting.")
+    (license license:zlib)))
+
 (define-public rust-const-panic-proc-macros-0.2
   (package
     (name "rust-const-panic-proc-macros")
-- 
2.41.0

[bug#69257] [PATCH 134/228] gnu: Add rust-konst-kernel-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-konst-kernel-0.3): Add variable.

Change-Id: I5fbe2abfef2ea1ea26883a45cd2f3912a888d4b5
---
 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 22fcbaf98d..706b48e8cc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33070,6 +33070,28 @@ (define-public rust-khronos-api-3
      "The Khronos XML API Registry, exposed as byte string constants.")
     (license license:asl2.0)))
 
+(define-public rust-konst-kernel-0.3
+  (package
+    (name "rust-konst-kernel")
+    (version "0.3.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "konst_kernel" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "140pxwbaqzchks1a962d8m99dx7b5glbhffgh6520vkb6y6fmins"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-typewit" ,rust-typewit-1))
+       #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.7))))
+    (home-page "https://github.com/rodrimati1992/konst/")
+    (synopsis "Foundational functionality shared by konst and const_panic")
+    (description
+     "This package provides the foundational const functionality shared
+between konst and const_panic.")
+    (license license:zlib)))
+
 (define-public rust-konst-macro-rules-0.2
   (package
     (name "rust-konst-macro-rules")
-- 
2.41.0

[bug#69257] [PATCH 135/228] gnu: Add rust-konst-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-konst-0.3): Add variable.
(rust-konst-0.2): Move and inherit from rust-konst-0.3.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 706b48e8cc..8f15fdfba6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29414,30 +29414,6 @@ (define-public rust-koibumi-base32-0.0.2
     (description "This package provides a Base32 encoder/decoder library.")
     (license license:gpl3+)))
 
-(define-public rust-konst-0.2
-  (package
-    (name "rust-konst")
-    (version "0.2.19")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "konst" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1x3lxxk9vjaiiaabngv7ki2bv9xi36gnqzjzi0s8qfs8wq9hw3rk"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-konst-macro-rules" ,rust-konst-macro-rules-0.2)
-                       ("rust-konst-proc-macros" ,rust-konst-proc-macros-0.2)
-                       ("rust-trybuild" ,rust-trybuild-1))
-       #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8))))
-    (home-page "https://github.com/rodrimati1992/konst/")
-    (synopsis
-     "Const equivalents of std functions, compile-time comparison, and parsing")
-    (description
-     "Const equivalents of std functions, compile-time comparison, and parsing.")
-    (license license:zlib)))
-
 (define-public rust-human-format-1
   (package
     (name "rust-human-format")
@@ -33070,6 +33046,50 @@ (define-public rust-khronos-api-3
      "The Khronos XML API Registry, exposed as byte string constants.")
     (license license:asl2.0)))
 
+(define-public rust-konst-0.3
+  (package
+    (name "rust-konst")
+    (version "0.3.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "konst" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1c7xjlryaac1j6ib30lq2hyi8g2zrdl17xjwia6ly9yl9662lwcd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-const-panic" ,rust-const-panic-0.2)
+                       ("rust-konst-kernel" ,rust-konst-kernel-0.3)
+                       ("rust-konst-proc-macros" ,rust-konst-proc-macros-0.3)
+                       ("rust-trybuild" ,rust-trybuild-1)
+                       ("rust-typewit" ,rust-typewit-1))
+       #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/rodrimati1992/konst/")
+    (synopsis "Const std functions, compile-time comparison and parsing")
+    (description
+     "This package provides Const equivalents of std functions, compile-
+time comparison, and parsing.")
+    (license license:zlib)))
+
+(define-public rust-konst-0.2
+  (package
+    (inherit rust-konst-0.3)
+    (name "rust-konst")
+    (version "0.2.19")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "konst" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1x3lxxk9vjaiiaabngv7ki2bv9xi36gnqzjzi0s8qfs8wq9hw3rk"))))
+    (arguments
+     `(#:cargo-inputs (("rust-konst-macro-rules" ,rust-konst-macro-rules-0.2)
+                       ("rust-konst-proc-macros" ,rust-konst-proc-macros-0.2)
+                       ("rust-trybuild" ,rust-trybuild-1))
+       #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8))))))
+
 (define-public rust-konst-kernel-0.3
   (package
     (name "rust-konst-kernel")
-- 
2.41.0

[bug#69257] [PATCH 136/228] gnu: Place rust-koibumi-base32-0.0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-koibumi-base32-0.0.2): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8f15fdfba6..4410e821bd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29394,26 +29394,6 @@ (define-public rust-jwalk-0.8
      "Filesystem walk performed in parallel with streamed and sorted results.")
     (license license:expat)))
 
-(define-public rust-koibumi-base32-0.0.2
-  (package
-    (name "rust-koibumi-base32")
-    (version "0.0.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "koibumi-base32" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1frb232m6rw50ly8ijhsbllcqfif5kcma1l6hrgm5g22c3c3il94"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-lazy-static" ,rust-lazy-static-1))))
-    (home-page "https://kashiko.gitlab.io/koibumi-rust/")
-    (synopsis "Base32 encoder/decoder library")
-    (description "This package provides a Base32 encoder/decoder library.")
-    (license license:gpl3+)))
-
 (define-public rust-human-format-1
   (package
     (name "rust-human-format")
@@ -33046,6 +33026,26 @@ (define-public rust-khronos-api-3
      "The Khronos XML API Registry, exposed as byte string constants.")
     (license license:asl2.0)))
 
+(define-public rust-koibumi-base32-0.0.2
+  (package
+    (name "rust-koibumi-base32")
+    (version "0.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "koibumi-base32" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1frb232m6rw50ly8ijhsbllcqfif5kcma1l6hrgm5g22c3c3il94"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1))))
+    (home-page "https://kashiko.gitlab.io/koibumi-rust/")
+    (synopsis "Base32 encoder/decoder library")
+    (description "This package provides a Base32 encoder/decoder library.")
+    (license license:gpl3+)))
+
 (define-public rust-konst-0.3
   (package
     (name "rust-konst")
-- 
2.41.0

[bug#69257] [PATCH 137/228] gnu: Place rust-jwalk-0.8 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-jwalk-0.8): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4410e821bd..30eb556d20 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29363,37 +29363,6 @@ (define-public rust-hts-sys-2
     (description "This library provides Rust bindings to HTSlib.")
     (license license:expat)))
 
-(define-public rust-jwalk-0.8
-  (package
-    (name "rust-jwalk")
-    (version "0.8.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "jwalk" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0miw0074ch6p89dbvrlnz9wp13rh7542cf1ak8bx4v1mcrsq8d97"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-crossbeam" ,rust-crossbeam-0.8)
-        ("rust-rayon" ,rust-rayon-1))
-       #:cargo-development-inputs
-       (("rust-criterion" ,rust-criterion-0.4)
-        ("rust-fs-extra" ,rust-fs-extra-1)
-        ("rust-ignore" ,rust-ignore-0.4)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-walkdir" ,rust-walkdir-2))))
-    (home-page "https://github.com/byron/jwalk")
-    (synopsis
-     "Filesystem walk performed in parallel with streamed and sorted results")
-    (description
-     "Filesystem walk performed in parallel with streamed and sorted results.")
-    (license license:expat)))
-
 (define-public rust-human-format-1
   (package
     (name "rust-human-format")
@@ -32952,6 +32921,37 @@ (define-public rust-juniper-0.14
 debugging.")
     (license license:bsd-2)))
 
+(define-public rust-jwalk-0.8
+  (package
+    (name "rust-jwalk")
+    (version "0.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "jwalk" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0miw0074ch6p89dbvrlnz9wp13rh7542cf1ak8bx4v1mcrsq8d97"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-crossbeam" ,rust-crossbeam-0.8)
+        ("rust-rayon" ,rust-rayon-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-fs-extra" ,rust-fs-extra-1)
+        ("rust-ignore" ,rust-ignore-0.4)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-num-cpus" ,rust-num-cpus-1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-walkdir" ,rust-walkdir-2))))
+    (home-page "https://github.com/byron/jwalk")
+    (synopsis
+     "Filesystem walk performed in parallel with streamed and sorted results")
+    (description
+     "Filesystem walk performed in parallel with streamed and sorted results.")
+    (license license:expat)))
+
 (define-public rust-keccak-0.1
   (package
     (name "rust-keccak")
-- 
2.41.0

[bug#69257] [PATCH 138/228] gnu: Add rust-js-int-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-js-int-0.2): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 257e16fd1c..0572eee6fc 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3340,6 +3340,27 @@ (define-public rust-isahc-0.9
         ("rust-test-case" ,rust-test-case-1)
         ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2))))))
 
+(define-public rust-js-int-0.2
+  (package
+    (name "rust-js-int")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "js_int" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02hn954yv5wksn26ck6lq19y3a0sswapf82hi65www5jf1agjdyr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://github.com/ruma/js_int")
+    (synopsis "JavaScript-interoperable integer types")
+    (description
+      "This package provides JavaScript-interoperable integer types.")
+    (license license:expat)))
+
 (define-public rust-json5-0.4
   (package
     (name "rust-json5")
-- 
2.41.0

[bug#69257] [PATCH 139/228] gnu: Add rust-ruma-identifiers-validation-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-identifiers-validation-0.9): Add
variable.

Change-Id: I3c6d7a8c0ed156c7226368d88e499e066844fb8a
---
 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 30eb556d20..2e8e5373d0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57855,6 +57855,27 @@ (define-public rust-rug-1
 floating-point, and complex numbers based on GMP, MPFR and MPC.")
     (license license:lgpl3+)))
 
+(define-public rust-ruma-identifiers-validation-0.9
+  (package
+    (name "rust-ruma-identifiers-validation")
+    (version "0.9.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-identifiers-validation" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hcviq2jzc1qcdxqh78wklb273sabv6d26wh41ygbwklj8jx32mz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Validation logic for ruma-common and ruma-macros")
+    (description "This package provides validation logic for ruma-common
+and ruma-macros.")
+    (license license:expat)))
+
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH 140/228] gnu: Add rust-ruma-macros-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-macros-0.12): Add variable.

Change-Id: Ia606fb813209fdea2539dfe1d156c182c8e7b809
---
 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 2e8e5373d0..53b7c3b5c3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57876,6 +57876,33 @@ (define-public rust-ruma-identifiers-validation-0.9
 and ruma-macros.")
     (license license:expat)))
 
+(define-public rust-ruma-macros-0.12
+  (package
+    (name "rust-ruma-macros")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "105y2inhb9z7ydkax43qfc5ws264z72gm19ji1pl2d1y9d557002"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#: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-ruma-identifiers-validation" ,rust-ruma-identifiers-validation-0.9)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-toml" ,rust-toml-0.8))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Procedural macros used by the Ruma crates.")
+    (description
+      "This package provides procedural macros used by the Ruma crates.")
+    (license license:expat)))
+
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH 141/228] gnu: Place rust-wl-clipboard-rs-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-wl-clipboard-rs-0.4): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 53b7c3b5c3..64a0356d4e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79657,39 +79657,6 @@ (define-public rust-wl-clipboard-rs-0.7
 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
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "wl-clipboard-rs" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (patches (search-patches "rust-wl-clipboard-rs-newer-wl.patch"))
-        (sha256
-          (base32 "1252cm67pkrr6ik5ys2cdyfr2zzw6ds7v351i1cmyi94yiv01l13"))))
-    (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-derive-new" ,rust-derive-new-0.5)
-         ("rust-derive-more" ,rust-derive-more-0.99)
-         ("rust-exitfailure" ,rust-exitfailure-0.5)
-         ("rust-failure" ,rust-failure-0.1)
-         ("rust-libc" ,rust-libc-0.2)
-         ("rust-log" ,rust-log-0.4)
-         ("rust-mime-guess" ,rust-mime-guess-2)
-         ("rust-nix" ,rust-nix-0.18)
-         ("rust-os-pipe" ,rust-os-pipe-0.9)
-         ("rust-stderrlog" ,rust-stderrlog-0.4)
-         ("rust-structopt" ,rust-structopt-0.3)
-         ("rust-tempfile" ,rust-tempfile-3)
-         ("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))))))
-
 (define-public rust-web-sys-0.3
   (package
     (name "rust-web-sys")
@@ -80192,6 +80159,39 @@ (define-public rust-winnow-0.4
                        ("rust-memchr" ,rust-memchr-2)
                        ("rust-terminal-size" ,rust-terminal-size-0.2))))))
 
+(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
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "wl-clipboard-rs" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (patches (search-patches "rust-wl-clipboard-rs-newer-wl.patch"))
+        (sha256
+          (base32 "1252cm67pkrr6ik5ys2cdyfr2zzw6ds7v351i1cmyi94yiv01l13"))))
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-derive-new" ,rust-derive-new-0.5)
+         ("rust-derive-more" ,rust-derive-more-0.99)
+         ("rust-exitfailure" ,rust-exitfailure-0.5)
+         ("rust-failure" ,rust-failure-0.1)
+         ("rust-libc" ,rust-libc-0.2)
+         ("rust-log" ,rust-log-0.4)
+         ("rust-mime-guess" ,rust-mime-guess-2)
+         ("rust-nix" ,rust-nix-0.18)
+         ("rust-os-pipe" ,rust-os-pipe-0.9)
+         ("rust-stderrlog" ,rust-stderrlog-0.4)
+         ("rust-structopt" ,rust-structopt-0.3)
+         ("rust-tempfile" ,rust-tempfile-3)
+         ("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))))))
+
 (define-public rust-wycheproof-0.5
   (package
     (name "rust-wycheproof")
-- 
2.41.0

[bug#69257] [PATCH 142/228] gnu: Place rust-wl-clipboard-rs-0.7 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-wl-clipboard-rs-0.7): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 64a0356d4e..2df80ea510 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79624,39 +79624,6 @@ (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
-     `(#:tests? #f  ; Failed to create a server socket.
-       #: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))
-       #:cargo-development-inputs
-       (("rust-wayland-protocols" ,rust-wayland-protocols-0.29)
-        ("rust-wayland-server" ,rust-wayland-server-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-web-sys-0.3
   (package
     (name "rust-web-sys")
@@ -80159,6 +80126,39 @@ (define-public rust-winnow-0.4
                        ("rust-memchr" ,rust-memchr-2)
                        ("rust-terminal-size" ,rust-terminal-size-0.2))))))
 
+(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
+     `(#:tests? #f  ; Failed to create a server socket.
+       #: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))
+       #:cargo-development-inputs
+       (("rust-wayland-protocols" ,rust-wayland-protocols-0.29)
+        ("rust-wayland-server" ,rust-wayland-server-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)
-- 
2.41.0

[bug#69257] [PATCH 143/228] gnu: Add rust-wildmatch-2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-wildmatch-2): Add variable.

Change-Id: I4928336d9fd07a66bd1921d3b5c64d49ee9bc7c1
---
 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 2df80ea510..8ad5462042 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80080,6 +80080,31 @@ (define-public rust-wild-2
 command-line, uniformly on all platforms")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-wildmatch-2
+  (package
+    (name "rust-wildmatch")
+    (version "2.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wildmatch" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1szw6lfswk6ldr9d1bj3pin5bj32jckg0907yh2m0d61ydxw8pj9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3)
+                                   ("rust-glob" ,rust-glob-0.3)
+                                   ("rust-ntest" ,rust-ntest-0.7)
+                                   ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/becheran/wildmatch")
+    (synopsis "String matching with multi-character wildcard operator.")
+    (description
+     "This package provides simple string matching with single- and
+multi-character wildcard operator.")
+    (license license:expat)))
+
 (define-public rust-winnow-0.5
   (package
     (name "rust-winnow")
-- 
2.41.0

[bug#69257] [PATCH 144/228] gnu: Add rust-assign-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-assign-1): Add variable.

Change-Id: I7e0588e1d1ed21cb721cb3f9f63135acab751728
---
 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 8ad5462042..b4c43a08e9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3948,6 +3948,25 @@ (define-public rust-assert2-macros-0.3
     (description "This package provides procedural macros for assert2.")
     (license license:bsd-2)))
 
+(define-public rust-assign-1
+  (package
+    (name "rust-assign")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "assign" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "00h0r04iyyhhnjr8fwkmw3fpvpd41bn9x1dz8s9j5kdyg3nkw2az"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/Kelerchian/assign")
+    (synopsis "Macro to mutate instances with declarative flavor")
+    (description
+     "This package provides a simple macro to allow mutating instances
+with a declarative flavor.")
+    (license license:expat)))
+
 (define-public rust-associative-cache-1
   (package
     (name "rust-associative-cache")
-- 
2.41.0

[bug#69257] [PATCH 145/228] gnu: Add rust-ruma-common-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-common-0.12): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b4c43a08e9..ad672f1955 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57874,6 +57874,55 @@ (define-public rust-rug-1
 floating-point, and complex numbers based on GMP, MPFR and MPC.")
     (license license:lgpl3+)))
 
+(define-public rust-ruma-common-0.12
+  (package
+    (name "rust-ruma-common")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-common" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "119y69i4mh8f0gcr5acswaq56hf0y3g1pizarv6v8iqfqlrlrjiv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-as-variant" ,rust-as-variant-1)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-form-urlencoded" ,rust-form-urlencoded-1)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-indexmap" ,rust-indexmap-2)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-js-int" ,rust-js-int-0.2)
+        ("rust-konst" ,rust-konst-0.3)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-ruma-identifiers-validation"
+         ,rust-ruma-identifiers-validation-0.9)
+        ("rust-ruma-macros" ,rust-ruma-macros-0.12)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-html-form" ,rust-serde-html-form-0.2)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-url" ,rust-url-2)
+        ("rust-uuid" ,rust-uuid-1)
+        ("rust-wildmatch" ,rust-wildmatch-2))
+       #:cargo-development-inputs
+       (("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-assign" ,rust-assign-1)
+        ("rust-maplit" ,rust-maplit-1)
+        ("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://ruma.io/")
+    (synopsis "Common types for other ruma crates")
+    (description "This package provides common types for other ruma
+crates.")
+    (license license:expat)))
+
 (define-public rust-ruma-identifiers-validation-0.9
   (package
     (name "rust-ruma-identifiers-validation")
-- 
2.41.0

[bug#69257] [PATCH 146/228] gnu: Add rust-js-option-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-js-option-0.1): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 0572eee6fc..3875e0153c 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3361,6 +3361,29 @@ (define-public rust-js-int-0.2
       "This package provides JavaScript-interoperable integer types.")
     (license license:expat)))
 
+(define-public rust-js-option-0.1
+  (package
+    (name "rust-js-option")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "js_option" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0g2273zp51nik16s95zyxqhv5qh6ybdrhdh1cykr65bsjmri6hk8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-serde" ,rust-serde-1)
+                                   ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/ruma/js_option")
+    (synopsis "Option-like type with null and undefined variants")
+    (description
+     "This package provides an Option-like type with separate null and
+undefined variants.")
+    (license license:expat)))
+
 (define-public rust-json5-0.4
   (package
     (name "rust-json5")
-- 
2.41.0

[bug#69257] [PATCH 147/228] gnu: Add rust-ruma-html-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-html-0.1): Add variable.

Change-Id: Ic98ee6e1ef526059c5f12fc674c990c7eb6de241
---
 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 ad672f1955..83a3d12d01 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57923,6 +57923,30 @@ (define-public rust-ruma-common-0.12
 crates.")
     (license license:expat)))
 
+(define-public rust-ruma-html-0.1
+  (package
+    (name "rust-ruma-html")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-html" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nrsm1rp1psk97kvn2cjpn52a0g2kv42i9ab2zi5z5m6n54s2x4n"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-as-variant" ,rust-as-variant-1)
+                       ("rust-html5ever" ,rust-html5ever-0.26)
+                       ("rust-phf" ,rust-phf-0.11)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-wildmatch" ,rust-wildmatch-2))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Opinionated HTML parsing and manipulating")
+    (description
+      "This package provides opinionated HTML parsing and manipulating.")
+    (license license:expat)))
+
 (define-public rust-ruma-identifiers-validation-0.9
   (package
     (name "rust-ruma-identifiers-validation")
-- 
2.41.0

[bug#69257] [PATCH 148/228] gnu: Add rust-ruma-events-0.27.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-events-0.27): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 83a3d12d01..c7dededf6e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57923,6 +57923,52 @@ (define-public rust-ruma-common-0.12
 crates.")
     (license license:expat)))
 
+(define-public rust-ruma-events-0.27
+  (package
+    (name "rust-ruma-events")
+    (version "0.27.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-events" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1wg3smmqxxwl03j5hkk707fdlxng7n5vl50wg85v77ss1rvm42nj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-as-variant" ,rust-as-variant-1)
+        ("rust-criterion" ,rust-criterion-0.5)
+        ("rust-indexmap" ,rust-indexmap-2)
+        ("rust-js-int" ,rust-js-int-0.2)
+        ("rust-js-option" ,rust-js-option-0.1)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-ruma-common" ,rust-ruma-common-0.12)
+        ("rust-ruma-html" ,rust-ruma-html-0.1)
+        ("rust-ruma-identifiers-validation"
+         ,rust-ruma-identifiers-validation-0.9)
+        ("rust-ruma-macros" ,rust-ruma-macros-0.12)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-url" ,rust-url-2)
+        ("rust-wildmatch" ,rust-wildmatch-2))
+       #:cargo-development-inputs
+       (("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-assign" ,rust-assign-1)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-maplit" ,rust-maplit-1)
+        ("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://ruma.io/")
+    (synopsis "Serializable types for events in the Matrix specification")
+    (description
+     "This package provides serializable types for the events in the
+Matrix specification.")
+    (license license:expat)))
+
 (define-public rust-ruma-html-0.1
   (package
     (name "rust-ruma-html")
-- 
2.41.0

[bug#69257] [PATCH 149/228] gnu: Add rust-ruma-appservice-api-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-appservice-api-0.9): Add
variable.

Change-Id: Idc208db555b74b5c1fbf45f27ac8bd74742c0d30
---
 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 c7dededf6e..9884421dd2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57874,6 +57874,34 @@ (define-public rust-rug-1
 floating-point, and complex numbers based on GMP, MPFR and MPC.")
     (license license:lgpl3+)))
 
+(define-public rust-ruma-appservice-api-0.9
+  (package
+    (name "rust-ruma-appservice-api")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-appservice-api" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xabivmgklm7qav1ja84b92pq7fxy4h344zhk25bhgbb4j3zi3y2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-ruma-events" ,rust-ruma-events-0.27)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-development-inputs
+       (("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-serde-yaml" ,rust-serde-yaml-0.9))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Types for Matrix application service API endpoints")
+    (description
+     "This package provides types for the endpoints in the Matrix
+application service API.")
+    (license license:expat)))
+
 (define-public rust-ruma-common-0.12
   (package
     (name "rust-ruma-common")
-- 
2.41.0

[bug#69257] [PATCH 150/228] gnu: Add rust-ruma-federation-api-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-federation-api-0.8): Add variable.

Change-Id: I11e96182899b7220d3849aa7e9099133e7d3b450
---
 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 9884421dd2..106fba0214 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57997,6 +57997,33 @@ (define-public rust-ruma-events-0.27
 Matrix specification.")
     (license license:expat)))
 
+(define-public rust-ruma-federation-api-0.8
+  (package
+    (name "rust-ruma-federation-api")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-federation-api" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1rrzvxzjdxwpxr6d5k5yi8cz7kisqwqa3wlasm97ccmw4wgir471"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-ruma-events" ,rust-ruma-events-0.27)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-development-inputs
+       (("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-http" ,rust-http-0.2))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Types for Matrix server-server API endpoints")
+    (description "This package provides types for the endpoints in the
+Matrix server-server API.")
+    (license license:expat)))
+
 (define-public rust-ruma-html-0.1
   (package
     (name "rust-ruma-html")
-- 
2.41.0

[bug#69257] [PATCH 151/228] gnu: Add rust-ruma-identity-service-api-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-identity-service-api-0.8): Add
variable.

Change-Id: I1274cf295a830452746ade58415eb65a9698f9f9
---
 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 106fba0214..be76a608bd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58069,6 +58069,29 @@ (define-public rust-ruma-identifiers-validation-0.9
 and ruma-macros.")
     (license license:expat)))
 
+(define-public rust-ruma-identity-service-api-0.8
+  (package
+    (name "rust-ruma-identity-service-api")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-identity-service-api" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1wh9qlzlqhlmirki6i0bffp7f9d6n2jdfv26crj24xsvl02a2zgi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Types for Matrix identity service API endpoints.")
+    (description "This package provides types for the endpoints in the
+Matrix identity service API.")
+    (license license:expat)))
+
 (define-public rust-ruma-macros-0.12
   (package
     (name "rust-ruma-macros")
-- 
2.41.0

[bug#69257] [PATCH 152/228] gnu: Add rust-ruma-push-gateway-api-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-push-gateway-api-0.8): Add variable.

Change-Id: I8f14bc984330d4cd614a45fb0794cdfc973f148a
---
 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 be76a608bd..e326377391 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58119,6 +58119,30 @@ (define-public rust-ruma-macros-0.12
       "This package provides procedural macros used by the Ruma crates.")
     (license license:expat)))
 
+(define-public rust-ruma-push-gateway-api-0.8
+  (package
+    (name "rust-ruma-push-gateway-api")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-push-gateway-api" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ss8fylz548ygqa7p91fwdp3whf7yc51c52h7gwl6naa9mf08hzk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-ruma-events" ,rust-ruma-events-0.27)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Types for Matrix push gateway API endpoints")
+    (description "This package provides types for the endpoints in the
+Matrix push gateway API.")
+    (license license:expat)))
+
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH 153/228] gnu: Add rust-yap-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-yap-0.12): Add variable.

Change-Id: I5c9b80a43ce4860e9e21297a976987dc41c1cc08
---
 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 e326377391..a1b1e2cf8f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -81141,6 +81141,31 @@ (define-public rust-yansi-term-0.1
      "Library for ANSI terminal colours and styles (bold, underline).")
     (license license:expat)))
 
+(define-public rust-yap-0.12
+  (package
+    (name "rust-yap")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "yap" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07q53xz7wij2n4vnv71cpy1wsab52c78d5xx1kifi983p3knkqmz"))
+       (modules '((guix build utils)))
+       (snippet '(substitute* "Cargo.toml"
+                              (("\"0.12.0\"") "\"0.13\"")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-logos" ,rust-logos-0.13))))
+    (home-page "https://github.com/jsdw/yap")
+    (synopsis "Utility methods to help with parsing strings and slices")
+    (description
+     "Yet Another Parser library.  A lightweight, dependency free, parser
+combinator inspired set of utility methods to help with parsing strings
+and slices.")
+    (license license:expat)))
+
 (define-public rust-yasna-0.5
   (package
     (name "rust-yasna")
-- 
2.41.0

[bug#69257] [PATCH 154/228] gnu: Add rust-ruma-server-util-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-server-util-0.2): Add variable.

Change-Id: Id7fa3882cb352bde17afa41d83f53fada912a3bf
---
 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 a1b1e2cf8f..2b044e67a6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58143,6 +58143,32 @@ (define-public rust-ruma-push-gateway-api-0.8
 Matrix push gateway API.")
     (license license:expat)))
 
+(define-public rust-ruma-server-util-0.2
+  (package
+    (name "rust-ruma-server-util")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-server-util" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0sr01j9qanlyz3nj8zvdk1blhhffhgk5p13x4jjimhii988fadh8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-headers" ,rust-headers-0.3)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-yap" ,rust-yap-0.11))
+       #:cargo-development-inputs
+       (("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Utilities for implementing Matrix server applications")
+    (description
+      "This package provides utilities for implementing Matrix server
+applications.")
+    (license license:expat)))
+
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH 155/228] gnu: Add rust-curve25519-dalek-derive-0.1.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 0a01c18536..a2b9aa6ae2 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -1743,6 +1743,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
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://doc.dalek.rs/curve25519_dalek")
+    (synopsis "curve25519-dalek Derives")
+    (description "This package provides 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#69257] [PATCH 156/228] gnu: Move rust-fiat-crypto-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-fiat-crypto-0.1): Move from here...
* gnu/packages/crates-crypto.scm (rust-fiat-crypto-0.1): ...to here.

Change-Id: Ie8156d2318a66200c698c78dd2edd7ff92664bc6
---
 gnu/packages/crates-crypto.scm | 18 ++++++++++++++++++
 gnu/packages/crates-io.scm     | 18 ------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index a2b9aa6ae2..5c987ba690 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -2243,6 +2243,24 @@ (define-public rust-elliptic-curve-0.12
                                    ("rust-sha2" ,rust-sha2-0.10)
                                    ("rust-sha3" ,rust-sha3-0.10))))))
 
+(define-public rust-fiat-crypto-0.1
+  (package
+    (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"))))
+    (build-system cargo-build-system)
+    (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-ghash-0.5
   (package
     (name "rust-ghash")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2b044e67a6..2313a8553a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23764,24 +23764,6 @@ (define-public rust-ff-derive-0.12
                        ("rust-quote" ,rust-quote-1)
                        ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-fiat-crypto-0.1
-  (package
-    (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"))))
-    (build-system cargo-build-system)
-    (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-file-diff-1
   (package
     (name "rust-file-diff")
-- 
2.41.0

[bug#69257] [PATCH 157/228] gnu: Add rust-fiat-crypto-0.2.

[Herman Rimm via Guix-patches via]

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

Change-Id: I02442b6b5f95125a2e67b1012d2f9b913ef10923
---
 gnu/packages/crates-crypto.scm | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 5c987ba690..2af59fb983 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -2243,23 +2243,37 @@ (define-public rust-elliptic-curve-0.12
                                    ("rust-sha2" ,rust-sha2-0.10)
                                    ("rust-sha3" ,rust-sha3-0.10))))))
 
-(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.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "fiat-crypto" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "12gyr01z3bkahbxcrj2nsdq42qbqgq12w32dvpr6a7930i0qfxi1"))))
+        (base32 "10hkkkjynhibvchznkxx81gwxqarn9i5sgz40d6xxb8xzhsz8xhn"))))
     (build-system cargo-build-system)
     (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))))
+    (license (list license:expat license:asl2.0 license:bsd-1))))
+
+(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-ghash-0.5
   (package
-- 
2.41.0

[bug#69257] [PATCH 158/228] gnu: Add rust-platforms-3.

[Herman Rimm via Guix-patches via]

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

Change-Id: I2a3e388381d88b1ac1554d62338dac0255dd2381
---
 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 2313a8553a..53a788fd0a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49176,6 +49176,28 @@ (define-public rust-platform-info-2
 a system.")
     (license 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
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))))
+    (home-page "https://rustsec.org")
+    (synopsis "Registry of valid Rust platforms from the Rust compiler")
+    (description
+     "This package provides a 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-pledge-0.4
   (package
     (name "rust-pledge")
-- 
2.41.0

[bug#69257] [PATCH 159/228] gnu: Add rust-curve25519-dalek-4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-curve25519-dalek-4): Add
variable.
(rust-curve25519-dalek-3): Inherit from rust-curve25519-dalek-4.

Change-Id: I997b83ead6f5ad368af932b4f4bfa9d231c5d06e
---
 gnu/packages/crates-crypto.scm | 50 ++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 2af59fb983..4581bedd33 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -1708,8 +1708,49 @@ (define-public rust-ctr-0.6
      `(#:skip-build? #t
        #:cargo-inputs (("rust-cipher" ,rust-cipher-0.2))))))
 
+(define-public rust-curve25519-dalek-4
+  (package
+    (name "rust-curve25519-dalek")
+    (version "4.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "curve25519-dalek" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0j7kqchcgycs4a11gvlda93h9w2jr05nn4hjpfyh2kn94a4pnrqa"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#: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))
+       #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1)
+                                   ("rust-criterion" ,rust-criterion-0.5)
+                                   ("rust-hex" ,rust-hex-0.4)
+                                   ("rust-rand" ,rust-rand-0.8)
+                                   ("rust-rand-core" ,rust-rand-core-0.6)
+                                   ("rust-sha2" ,rust-sha2-0.10))))
+    (home-page "https://doc.dalek.rs/curve25519_dalek")
+    (synopsis "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-3
   (package
+    (inherit rust-curve25519-dalek-4)
     (name "rust-curve25519-dalek")
     (version "3.2.0")
     (source
@@ -1719,7 +1760,6 @@ (define-public rust-curve25519-dalek-3
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0q8v97275cy6v4ly6y2qwv9a8phnpjg9sy8kv7r6mgdjfacxz7qb"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-byteorder" ,rust-byteorder-1)
@@ -1735,13 +1775,7 @@ (define-public rust-curve25519-dalek-3
         ("rust-criterion" ,rust-criterion-0.3)
         ("rust-hex" ,rust-hex-0.4)
         ("rust-rand" ,rust-rand-0.7)
-        ("rust-sha2" ,rust-sha2-0.9))))
-    (home-page "https://dalek.rs/curve25519-dalek")
-    (synopsis "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)))
+        ("rust-sha2" ,rust-sha2-0.9))))))
 
 (define-public rust-curve25519-dalek-derive-0.1
   (package
-- 
2.41.0

[bug#69257] [PATCH 160/228] gnu: Add rust-ring-compat-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ring-compat-0.8): Add variable.

Change-Id: Ide9d1dfc94f4694d060cc06624b16d66941d29e9
---
 gnu/packages/crates-crypto.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 4581bedd33..e2fa124f62 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -4605,6 +4605,40 @@ (define-public rust-ring-0.13
         ;; build dependencies
         ("rust-cc" ,rust-cc-1))))))
 
+(define-public rust-ring-compat-0.8
+  (package
+    (name "rust-ring-compat")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ring-compat" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1m2vvmbg607f55afx75b9kxbyx6b5wqvhhfv2445z08b2np7pknc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-aead" ,rust-aead-0.5)
+                       ("rust-digest" ,rust-digest-0.10)
+                       ("rust-ecdsa" ,rust-ecdsa-0.16)
+                       ("rust-ed25519" ,rust-ed25519-2)
+                       ("rust-generic-array" ,rust-generic-array-0.14)
+                       ("rust-p256" ,rust-p256-0.13)
+                       ("rust-p384" ,rust-p384-0.13)
+                       ("rust-pkcs8" ,rust-pkcs8-0.10)
+                       ("rust-rand-core" ,rust-rand-core-0.6)
+                       ("rust-ring" ,rust-ring-0.17)
+                       ("rust-signature" ,rust-signature-2))
+       #:cargo-development-inputs
+       (("rust-digest" ,rust-digest-0.10)
+        ("rust-hex-literal" ,rust-hex-literal-0.4))))
+    (home-page "https://github.com/RustCrypto/ring-compat")
+    (synopsis "RustCrypto trait and ring crypto algorithm compatibility")
+    (description
+     "This package provides compatibility for using @code{RustCrypto}
+traits with cryptographic algorithm implementations from @code{ring}.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-ripemd-0.1
   (package
     (name "rust-ripemd")
-- 
2.41.0

[bug#69257] [PATCH 161/228] gnu: Add rust-strobe-rs-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-strobe-rs-0.8): Add variable.

Change-Id: I65bd7623f16d6d676f990f6dd6eb14c1375dd7fa
---
 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 53a788fd0a..822829b95c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67101,6 +67101,38 @@ (define-public rust-strip-ansi-escapes-0.1
        #:cargo-inputs
        (("rust-vte" ,rust-vte-0.10))))))
 
+(define-public rust-strobe-rs-0.8
+  (package
+    (name "rust-strobe-rs")
+    (version "0.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "strobe-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0bdb9fqjpgck3fzmlsdsq5b14zhm1l66f0xp9x6gmk6c3j527fzs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-keccak" ,rust-keccak-0.1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-big-array" ,rust-serde-big-array-0.4)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-hex" ,rust-hex-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/rozbb/strobe-rs")
+    (synopsis "Rust implementation of the Strobe protocol framework")
+    (description
+     "This package provides an implementation of the Strobe protocol
+framework in pure Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-strong-xml-0.6
   (package
     (name "rust-strong-xml")
-- 
2.41.0

[bug#69257] [PATCH 162/228] gnu: Add rust-strobe-rs-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-strobe-rs-0.5): Add variable.

Change-Id: Ifc584e0393eb6abb81cf20fb6afeb0ca253e2ef7
---
 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 822829b95c..31a01028fc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67133,6 +67133,31 @@ (define-public rust-strobe-rs-0.8
 framework in pure Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-strobe-rs-0.5
+  (package
+    (inherit rust-strobe-rs-0.8)
+    (name "rust-strobe-rs")
+    (version "0.5.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "strobe-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "10s7f7kr5zlza5f5r06wp0ylhyvp904hyw1kagz9r27af7hsx6qs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-tiny-keccak" ,rust-tiny-keccak-2))
+       #:cargo-development-inputs
+       (("rust-hex" ,rust-hex-0.3)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/rozbb/strobe-rs")))
+
 (define-public rust-strong-xml-0.6
   (package
     (name "rust-strong-xml")
-- 
2.41.0

[bug#69257] [PATCH 163/228] gnu: Add rust-merlin-3.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 31a01028fc..0c52ec0def 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38282,8 +38282,40 @@ (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
+     `(#: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))
+       #:cargo-development-inputs
+       (("rust-curve25519-dalek-ng" ,rust-curve25519-dalek-ng-4)
+        ("rust-rand-chacha" ,rust-rand-chacha-0.3)
+        ("rust-strobe-rs" ,rust-strobe-rs-0.5))))
+    (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
@@ -38301,15 +38333,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-metrics-macros-0.2
   (package
-- 
2.41.0

[bug#69257] [PATCH 164/228] gnu: Add rust-x25519-dalek-2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-x25519-dalek-2): Add variable.
(rust-x25519-dalek-1): Inherit from rust-x25519-dalek-2.

Change-Id: Iff7bd2ed16e99849d57ba6eacde4d361f5976674
---
 gnu/packages/crates-crypto.scm | 46 ++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index e2fa124f62..0c45722177 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -6029,8 +6029,37 @@ (define-public rust-universal-hash-0.3
        (("rust-generic-array" ,rust-generic-array-0.12)
         ("rust-subtle" ,rust-subtle-2))))))
 
+(define-public rust-x25519-dalek-2
+  (package
+    (name "rust-x25519-dalek")
+    (version "2.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "x25519-dalek" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xyjgqpsa0q6pprakdp58q1hy45rf8wnqqscgzx0gyw13hr6ir67"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-curve25519-dalek" ,rust-curve25519-dalek-4)
+                       ("rust-rand-core" ,rust-rand-core-0.6)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1)
+                                   ("rust-criterion" ,rust-criterion-0.5)
+                                   ("rust-rand-core" ,rust-rand-core-0.6))))
+    (home-page "https://doc.dalek.rs/x25519_dalek")
+    (synopsis "X25519 elliptic curve Diffie-Hellman key exchange")
+    (description
+     "This crate provides a Rust implementation of x25519 elliptic curve
+Diffie-Hellman key exchange, with curve operations provided by
+@code{curve25519-dalek}.")
+    (license license:bsd-3)))
+
 (define-public rust-x25519-dalek-1
   (package
+    (inherit rust-x25519-dalek-2)
     (name "rust-x25519-dalek")
     (version "1.2.0")
     (source
@@ -6041,25 +6070,16 @@ (define-public rust-x25519-dalek-1
        (sha256
         (base32 "0xz0m1pczss9r25d1r52420dl2picdypbcn5ycmlwssp9awvd4i3"))
        (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (substitute* "Cargo.toml"
-             (("version = \"=1.3\"") "version = \"^1.3\""))))))
-    (build-system cargo-build-system)
+       (snippet '(substitute* "Cargo.toml"
+                              (("version = \"=1.3\"")
+                               "version = \"^1.3\"")))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-curve25519-dalek" ,rust-curve25519-dalek-3)
         ("rust-rand-core" ,rust-rand-core-0.5)
         ("rust-serde" ,rust-serde-1)
-        ("rust-zeroize" ,rust-zeroize-1))))
-    (home-page "https://dalek.rs/")
-    (synopsis "X25519 elliptic curve Diffie-Hellman key exchange")
-    (description
-     "This crate provides a pure-Rust implementation of x25519 elliptic curve
-Diffie-Hellman key exchange, with curve operations provided by
-@code{curve25519-dalek}.")
-    (license license:bsd-3)))
+        ("rust-zeroize" ,rust-zeroize-1))))))
 
 (define-public rust-x25519-dalek-ng-1
   (package
-- 
2.41.0

[bug#69257] [PATCH 165/228] gnu: Add rust-ed25519-2.

[Herman Rimm via Guix-patches via]

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

Change-Id: I444a61ce5b2e8643d3a9949ce97a1d165a1c6c21
---
 gnu/packages/crates-crypto.scm | 54 +++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 0c45722177..108553a5eb 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -2102,8 +2102,47 @@ (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
+     `(#: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))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-ed25519-dalek" ,rust-ed25519-dalek-2)
+        ("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-ring-compat" ,rust-ring-compat-0.8))))
+    (home-page "https://github.com/RustCrypto/signatures/tree/master/ed25519")
+    (synopsis "Edwards Digital Signature Algorithm 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
@@ -2125,20 +2164,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#69257] [PATCH 166/228] gnu: Add rust-ed25519-dalek-2.

[Herman Rimm via Guix-patches via]

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

Change-Id: I423a0c695b3ec4e70975077b5fe7f14130f70c94
---
 gnu/packages/crates-crypto.scm | 53 +++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 108553a5eb..9835b5af9e 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -2193,8 +2193,52 @@ (define-public rust-ed25519-compact-2
 implementation.")
     (license license:expat)))
 
+(define-public rust-ed25519-dalek-2
+  (package
+    (name "rust-ed25519-dalek")
+    (version "2.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ed25519-dalek" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0w88cafwglg9hjizldbmlza0ns3hls81zk1bcih3m5m3h67algaa"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#: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))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-blake2" ,rust-blake2-0.10)
+        ("rust-criterion" ,rust-criterion-0.5)
+        ("rust-curve25519-dalek" ,rust-curve25519-dalek-4)
+        ("rust-hex" ,rust-hex-0.4)
+        ("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-sha3" ,rust-sha3-0.10)
+        ("rust-toml" ,rust-toml-0.7)
+        ("rust-x25519-dalek" ,rust-x25519-dalek-2))))
+    (home-page "https:///doc.dalek.rs/ed25519_dalek")
+    (synopsis "Ed25519 EdDSA key generations, signing, and verification")
+    (description
+     "This package provides fast and efficient ed25519 @code{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
@@ -2216,13 +2260,8 @@ (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-elliptic-curve-0.13
   (package
-- 
2.41.0

[bug#69257] [PATCH 167/228] gnu: Add rust-macro-attr-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-macro-attr-0.2): Add variable.

Change-Id: I4d012d4be818ac8e8576e8cce7270b65c0243e81
---
 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 0c52ec0def..b1663d0872 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36855,6 +36855,29 @@ (define-public rust-macaddr-1
     (description "This pakcage provides MAC address types.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-macro-attr-0.2
+  (package
+    (name "rust-macro-attr")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "macro-attr" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0anc4valrldnn0gwaqlhlr4b5zh25g1lyy1x3fq65y1b1rpirr80"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-rustc-serialize" ,rust-rustc-serialize-0.3))))
+    (home-page "https://github.com/DanielKeep/rust-custom-derive")
+    (synopsis "macro_attr! macro for custom attributes and derivations")
+    (description
+     "This package provides the `macro_attr!` macro that enables the use
+of custom, macro-based attributes and derivations.  Supercedes the
+`custom_derive` crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-macrotest-1
   (package
     (name "rust-macrotest")
-- 
2.41.0

[bug#69257] [PATCH 168/228] gnu: Add rust-subslice-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-subslice-0.2): Add variable.

Change-Id: I9e9830efb9291b74e4cce30027cd5024eb9fdd06
---
 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 b1663d0872..5ace7a9539 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67966,6 +67966,35 @@ (define-public rust-subprocess-0.2
 inspired by Python's subprocess module, with Rust-specific extensions.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-subslice-0.2
+  (package
+    (name "rust-subslice")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "subslice" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1bkasla3shbfvlqlvkdbisgaz0qsl0dsyzqz3zh2vc1vka0f9a70"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-galil-seiferas" ,rust-galil-seiferas-0.1)
+                       ("rust-jetscii" ,rust-jetscii-0.3)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-unchecked-index" ,rust-unchecked-index-0.2))
+       #:cargo-development-inputs
+       (("rust-itertools" ,rust-itertools-0.7)
+        ("rust-macro-attr" ,rust-macro-attr-0.2)
+        ("rust-newtype-derive" ,rust-newtype-derive-0.1)
+        ("rust-odds" ,rust-odds-0.2)
+        ("rust-quickcheck" ,rust-quickcheck-0.5)
+        ("rust-rand" ,rust-rand-0.3))))
+    (home-page "https://github.com/strake/subslice.rs")
+    (synopsis "Subslice search")
+    (description "This package provides fast subslice search.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-supercow-0.1
   (package
     (name "rust-supercow")
-- 
2.41.0

[bug#69257] [PATCH 169/228] gnu: Add rust-ruma-signatures-0.14.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-signatures-0.14): Add variable.

Change-Id: Id277d9f88df454d095ade9111c0afa56be769579
---
 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 5ace7a9539..689b0b57cd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58220,6 +58220,38 @@ (define-public rust-ruma-server-util-0.2
 applications.")
     (license license:expat)))
 
+(define-public rust-ruma-signatures-0.14
+  (package
+    (name "rust-ruma-signatures")
+    (version "0.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-signatures" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12f76winxclvwgylm5kqy3bqfj7x7x9g4xzkh4nhbfrf7nrkiarh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-base64" ,rust-base64-0.21)
+                       ("rust-ed25519-dalek" ,rust-ed25519-dalek-2)
+                       ("rust-pkcs8" ,rust-pkcs8-0.10)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-subslice" ,rust-subslice-0.2)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-insta" ,rust-insta-1))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Digital signatures according to the Matrix specification")
+    (description
+      "This package provides digital signatures according to the Matrix
+specification.")
+    (license license:expat)))
+
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH 170/228] gnu: Add rust-ruma-client-api-0.17.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-client-api-0.17): Add variable.

Change-Id: I9c9029de0084f2adbf2990e37dbfdcf1c1824be1
---
 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 689b0b57cd..4b84703eef 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57953,6 +57953,39 @@ (define-public rust-ruma-appservice-api-0.9
 application service API.")
     (license license:expat)))
 
+(define-public rust-ruma-client-api-0.17
+  (package
+    (name "rust-ruma-client-api")
+    (version "0.17.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-client-api" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "11ik20rnm1c1a3cdbqg8dayd7xgh9sai8xa74c4af552iwjkf634"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-assign" ,rust-assign-1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-js-option" ,rust-js-option-0.1)
+                       ("rust-maplit" ,rust-maplit-1)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-ruma-events" ,rust-ruma-events-0.27)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-html-form" ,rust-serde-html-form-0.2)
+                       ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-development-inputs
+       (("rust-assert-matches2" ,rust-assert-matches2-0.1))))
+    (home-page "https://ruma.io/")
+    (synopsis "Types for Matrix client-server API endpoints.")
+    (description
+      "This package provides types for the endpoints in the Matrix
+client-server API.")
+    (license license:expat)))
+
 (define-public rust-ruma-common-0.12
   (package
     (name "rust-ruma-common")
-- 
2.41.0

[bug#69257] [PATCH 171/228] gnu: Add rust-ruma-client-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-client-0.12): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4b84703eef..d49c9695de 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57953,6 +57953,45 @@ (define-public rust-ruma-appservice-api-0.9
 application service API.")
     (license license:expat)))
 
+(define-public rust-ruma-client-0.12
+  (package
+    (name "rust-ruma-client")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-client" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "136dbzns8bs9xwr97gpnrz7cblwhpfrr85mnrclb34gm0snq2p3g"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-assign" ,rust-assign-1)
+                       ("rust-async-stream" ,rust-async-stream-0.3)
+                       ("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-lite" ,rust-futures-lite-1)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-hyper" ,rust-hyper-0.14)
+                       ("rust-hyper-rustls" ,rust-hyper-rustls-0.24)
+                       ("rust-hyper-tls" ,rust-hyper-tls-0.5)
+                       ("rust-isahc" ,rust-isahc-1)
+                       ("rust-reqwest" ,rust-reqwest-0.11)
+                       ("rust-ruma-client-api" ,rust-ruma-client-api-0.17)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-html-form" ,rust-serde-html-form-0.2)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-ruma-client-api" ,rust-ruma-client-api-0.17)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Matrix client library")
+    (description "This package provides a Matrix client library.")
+    (license license:expat)))
+
 (define-public rust-ruma-client-api-0.17
   (package
     (name "rust-ruma-client-api")
-- 
2.41.0

[bug#69257] [PATCH 172/228] gnu: Add rust-ruma-state-res-0.10.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-state-res-0.10): Add variable.

Change-Id: Id0b1b2f855746500fe24c4cf4c543370baea05e0
---
 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 d49c9695de..855871dd74 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58324,6 +58324,39 @@ (define-public rust-ruma-signatures-0.14
 specification.")
     (license license:expat)))
 
+(define-public rust-ruma-state-res-0.10
+  (package
+    (name "rust-ruma-state-res")
+    (version "0.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-state-res" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hhfd4ca73bpnrfyr02k675cdc82x2yw0fah8w1s7jsm0wrb2v3q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-criterion" ,rust-criterion-0.5)
+                       ("rust-itertools" ,rust-itertools-0.11)
+                       ("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-ruma-events" ,rust-ruma-events-0.27)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-maplit" ,rust-maplit-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-ruma-events" ,rust-ruma-events-0.27)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Abstraction for Matrix state resolution")
+    (description "This package provides an abstraction for Matrix state
+resolution.")
+    (license license:expat)))
+
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH 173/228] gnu: Add rust-ruma-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-0.9): Add variable.

Change-Id: I98145b8b8b711d0ef4c8abdd914f718da9c90609
---
 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 855871dd74..7a89b00bbb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57925,6 +57925,44 @@ (define-public rust-rug-1
 floating-point, and complex numbers based on GMP, MPFR and MPC.")
     (license license:lgpl3+)))
 
+(define-public rust-ruma-0.9
+  (package
+    (name "rust-ruma")
+    (version "0.9.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dksah6cwdini5ln930plz8x01zv1qqdjnb28xilr5kjy26w6y97"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-assign" ,rust-assign-1)
+        ("rust-js-int" ,rust-js-int-0.2)
+        ("rust-js-option" ,rust-js-option-0.1)
+        ("rust-ruma-appservice-api" ,rust-ruma-appservice-api-0.9)
+        ("rust-ruma-client" ,rust-ruma-client-0.12)
+        ("rust-ruma-client-api" ,rust-ruma-client-api-0.17)
+        ("rust-ruma-common" ,rust-ruma-common-0.12)
+        ("rust-ruma-events" ,rust-ruma-events-0.27)
+        ("rust-ruma-federation-api" ,rust-ruma-federation-api-0.8)
+        ("rust-ruma-html" ,rust-ruma-html-0.1)
+        ("rust-ruma-identity-service-api"
+         ,rust-ruma-identity-service-api-0.8)
+        ("rust-ruma-push-gateway-api" ,rust-ruma-push-gateway-api-0.8)
+        ("rust-ruma-server-util" ,rust-ruma-server-util-0.2)
+        ("rust-ruma-signatures" ,rust-ruma-signatures-0.14)
+        ("rust-ruma-state-res" ,rust-ruma-state-res-0.10))
+       #:cargo-development-inputs (("rust-serde" ,rust-serde-1))))
+    (home-page "https://ruma.io/")
+    (synopsis "Types and traits for working with the Matrix protocol")
+    (description
+      "This package provides types and traits for working with the Matrix
+protocol.")
+    (license license:expat)))
+
 (define-public rust-ruma-appservice-api-0.9
   (package
     (name "rust-ruma-appservice-api")
-- 
2.41.0

[bug#69257] [PATCH 174/228] gnu: Add rust-matrix-sdk-test-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-test-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7a89b00bbb..fa95ad17ec 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37550,6 +37550,37 @@ (define-public rust-matchers-0.0
      `(#:cargo-inputs
        (("rust-regex-automata" ,rust-regex-automata-0.1))))))
 
+(define-public rust-matrix-sdk-test-0.7
+  (package
+    (name "rust-matrix-sdk-test")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-test" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "089qckyfzschdafa2w9vfzz1v980k4x908xfs17bdnmaw3pbkb7a"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ctor" ,rust-ctor-0.2)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-matrix-sdk-test-macros" ,rust-matrix-sdk-test-macros-0.7)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Helpers to write tests for the Matrix SDK")
+    (description
+      "This package provides helpers to write tests for the Matrix SDK.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-test-macros-0.7
   (package
     (name "rust-matrix-sdk-test-macros")
-- 
2.41.0

[bug#69257] [PATCH 175/228] gnu: Add rust-matrix-sdk-common-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-common-0.7): Add variable.

Change-Id: Ifda41c068b8a6539f4ce14424a8c28e65608eaab
---
 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 fa95ad17ec..9f565198fa 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37550,6 +37550,48 @@ (define-public rust-matchers-0.0
      `(#:cargo-inputs
        (("rust-regex-automata" ,rust-regex-automata-0.1))))))
 
+(define-public rust-matrix-sdk-common-0.7
+  (package
+    (name "rust-matrix-sdk-common")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-common" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17wwy8fzgw58ph26sv3h0v5sq69ga9jjbzic8aicdxmnd9i5ldmv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-gloo-timers" ,rust-gloo-timers-0.3)
+        ("rust-instant" ,rust-instant-0.1)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
+        ("rust-web-sys" ,rust-web-sys-0.3))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Common types and imports used in @code{matrix-sdk}")
+    (description
+     "This package provides a collection of common types and imports
+used in the @code{matrix-sdk} crates.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-test-0.7
   (package
     (name "rust-matrix-sdk-test")
-- 
2.41.0

[bug#69257] [PATCH 176/228] gnu: Add rust-tls-codec-derive-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-tls-codec-derive-0.4): Add
variable.

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 9835b5af9e..40e8deadc3 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -5958,6 +5958,30 @@ (define-public rust-tiger-0.1
      "This package provides the Tiger cryptographic hash function.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-tls-codec-derive-0.4
+  (package
+    (name "rust-tls-codec-derive")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tls_codec_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1704w8zpgpj40yjgq9dddnnfzmq44p63n0606c1g6y8fcm2zb7ld"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1))))
+    (home-page
+     "https://github.com/RustCrypto/formats/tree/master/tls_codec/derive")
+    (synopsis "Derive macros for the tls_codec trait")
+    (description
+      "This package provides Derive macros for the tls_codec trait.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-totp-lite-2
   (package
     (name "rust-totp-lite")
-- 
2.41.0

[bug#69257] [PATCH 177/228] gnu: Add rust-tls-codec-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-tls-codec-0.4): Add variable.

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 40e8deadc3..1b690c7d4c 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -5958,6 +5958,37 @@ (define-public rust-tiger-0.1
      "This package provides the Tiger cryptographic hash function.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-tls-codec-0.4
+  (package
+    (name "rust-tls-codec")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tls_codec" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0spv5d8gjpmil4x14d8jk6wps59r4y7kdj77par8b30g6ff8rrxm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-tls-codec-derive" ,rust-tls-codec-derive-0.4)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-anstyle" ,rust-anstyle-1)
+        ("rust-anstyle-parse" ,rust-anstyle-parse-0.2)
+        ("rust-clap" ,rust-clap-4)
+        ("rust-clap-lex" ,rust-clap-lex-0.5)
+        ("rust-criterion" ,rust-criterion-0.5)
+        ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/tls_codec")
+    (synopsis "Rust implementation of TLS (de)serialization")
+    (description
+     "This package provides a Rust implementation of TLS serialization
+and deserialization.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-tls-codec-derive-0.4
   (package
     (name "rust-tls-codec-derive")
-- 
2.41.0

[bug#69257] [PATCH 178/228] gnu: Add rust-x509-cert-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-x509-cert-0.2): Add variable.

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 1b690c7d4c..cfda18a0de 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -6228,3 +6228,39 @@ (define-public rust-x25519-dalek-ng-1
     (description "This package provides a fork x25519-dalek, with an updated
 rand_core.")
     (license license:bsd-3)))
+
+(define-public rust-x509-cert-0.2
+  (package
+    (name "rust-x509-cert")
+    (version "0.2.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "x509-cert" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "155f42vm6m7phn8w7s2wmk9vli3ws45dqpk5z3jilw0a04syj08k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1)
+                       ("rust-const-oid" ,rust-const-oid-0.9)
+                       ("rust-der" ,rust-der-0.7)
+                       ("rust-sha1" ,rust-sha1-0.10)
+                       ("rust-signature" ,rust-signature-2)
+                       ("rust-spki" ,rust-spki-0.7)
+                       ("rust-tls-codec" ,rust-tls-codec-0.4))
+       #:cargo-development-inputs
+       (("rust-ecdsa" ,rust-ecdsa-0.16)
+        ("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-p256" ,rust-p256-0.13)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rsa" ,rust-rsa-0.9)
+        ("rust-rstest" ,rust-rstest-0.18)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/x509-cert")
+    (synopsis "X.509 Public Key Infrastructure Certificate format in Rust")
+    (description
+     "This package provides a pure Rust implementation of the X.509
+Public Key Infrastructure Certificate format as described in RFC 5280.")
+    (license (list license:asl2.0 license:expat))))
-- 
2.41.0

[bug#69257] [PATCH 179/228] gnu: Add rust-pkcs7-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-pkcs7-0.4): Add variable.

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index cfda18a0de..827d1b6561 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -3475,6 +3475,34 @@ (define-public rust-pkcs5-0.3
         ("rust-sha2" ,rust-sha2-0.9)
         ("rust-spki" ,rust-spki-0.4))))))
 
+(define-public rust-pkcs7-0.4
+  (package
+    (name "rust-pkcs7")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pkcs7" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1rvp9gm7vzcbbzz6vr6xz6ri2szgxm35j0zk5dhf01b40sz7i4fp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-der" ,rust-der-0.7)
+                       ("rust-spki" ,rust-spki-0.7)
+                       ("rust-x509-cert" ,rust-x509-cert-0.2))
+       #:cargo-development-inputs
+       (("rust-der" ,rust-der-0.7)
+        ("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-x509-cert" ,rust-x509-cert-0.2))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/pkcs7")
+    (synopsis "Implementation of Public-Key Cryptography Standards (PKCS) #7")
+    (description
+     "This package is a pure Rust implementation of Public-Key
+Cryptography Standards (PKCS) #7: Cryptographic Message Syntax
+Specification (RFC 5652).")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-pkcs8-0.10
   (package
     (name "rust-pkcs8")
-- 
2.41.0

[bug#69257] [PATCH 180/228] gnu: Add rust-matrix-pickle-derive-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-pickle-derive-0.1): Add
variable.

Change-Id: Ib89cc91c6967ade2e336f7f3bdc3ed7cfabd77aa
---
 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 9f565198fa..fe7f6eb57a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37550,6 +37550,30 @@ (define-public rust-matchers-0.0
      `(#:cargo-inputs
        (("rust-regex-automata" ,rust-regex-automata-0.1))))))
 
+(define-public rust-matrix-pickle-derive-0.1
+  (package
+    (name "rust-matrix-pickle-derive")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-pickle-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xf0mjcl1mkbyzznf5xqy65cz4k1hq5b31v2fhsgxhirinkrlxwk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro-crate" ,rust-proc-macro-crate-2)
+                       ("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/matrix-org/matrix-pickle")
+    (synopsis "Derive support for matrix-pickle")
+    (description
+     "This package provides Derive support for @code{matrix-pickle}.")
+    (license license:expat)))
+
 (define-public rust-matrix-sdk-common-0.7
   (package
     (name "rust-matrix-sdk-common")
-- 
2.41.0

[bug#69257] [PATCH 181/228] gnu: Add rust-matrix-pickle-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-pickle-0.1): Add variable.

Change-Id: I63927e6670c9c0a603287546f8b66087b203ffa4
---
 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 fe7f6eb57a..dd547b2568 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37550,6 +37550,31 @@ (define-public rust-matchers-0.0
      `(#:cargo-inputs
        (("rust-regex-automata" ,rust-regex-automata-0.1))))))
 
+(define-public rust-matrix-pickle-0.1
+  (package
+    (name "rust-matrix-pickle")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-pickle" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07c2kmlswi7ir79ldgcizcibm61i8lni9i5rkf6npn757i32dzfp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-matrix-pickle-derive" ,rust-matrix-pickle-derive-0.1)
+        ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)
+                                   ("rust-proptest" ,rust-proptest-1))))
+    (home-page "https://github.com/matrix-org/matrix-pickle")
+    (synopsis "Binary encoding format used in the Matrix world")
+    (description
+     "This package provides a simple binary encoding format used in the
+Matrix world.")
+    (license license:expat)))
+
 (define-public rust-matrix-pickle-derive-0.1
   (package
     (name "rust-matrix-pickle-derive")
-- 
2.41.0

[bug#69257] [PATCH 182/228] gnu: Add rust-olm-sys-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-olm-sys-1): Add variable.

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 827d1b6561..8875fa230f 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -3045,6 +3045,27 @@ (define-public rust-nettle-sys-2
     (license ;; licensed under either of these, at your option
      (list license:lgpl3 license:gpl2 license:gpl3))))
 
+(define-public rust-olm-sys-1
+  (package
+    (name "rust-olm-sys")
+    (version "1.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "olm-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ffk09h237vk962d0iclp13x2bqha9qpy58gkwgh52a9c8jwzzia"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cmake" ,rust-cmake-0.1)
+                       ("rust-fs-extra" ,rust-fs-extra-1))))
+    ;; TODO: try olm input.
+    (home-page "https://gitlab.gnome.org/BrainBlasted/olm-sys")
+    (synopsis "Low level binding for libolm")
+    (description "This package provides low level binding for libolm.")
+    (license license:asl2.0)))
+
 (define-public rust-orion-0.17
   (package
     (name "rust-orion")
-- 
2.41.0

[bug#69257] [PATCH 183/228] gnu: Add rust-olm-rs-2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-olm-rs-2): Add variable.

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 8875fa230f..1c62c49448 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -3045,6 +3045,31 @@ (define-public rust-nettle-sys-2
     (license ;; licensed under either of these, at your option
      (list license:lgpl3 license:gpl2 license:gpl3))))
 
+(define-public rust-olm-rs-2
+  (package
+    (name "rust-olm-rs")
+    (version "2.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "olm-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09f7mq2dahyhy7w0xbb8750skzh7wmzpnvbmnkby830iaiq2qv6x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-olm-sys" ,rust-olm-sys-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-base64" ,rust-base64-0.11)
+                                   ("rust-json" ,rust-json-0.12))))
+    (home-page "https://gitlab.gnome.org/jhaye/olm-rs")
+    (synopsis "A Rust wrapper for libolm.")
+    (description "This package provides a Rust wrapper for libolm.")
+    (license license:asl2.0)))
+
 (define-public rust-olm-sys-1
   (package
     (name "rust-olm-sys")
-- 
2.41.0

[bug#69257] [PATCH 184/228] gnu: Add rust-vodozemac-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-vodozemac-0.5): Add variable.

Change-Id: Ib17beb63cd41531b56372a0ddab64055b328e4aa
---
 gnu/packages/crates-crypto.scm | 45 ++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 1c62c49448..a15234b0fc 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -6223,6 +6223,51 @@ (define-public rust-universal-hash-0.3
        (("rust-generic-array" ,rust-generic-array-0.12)
         ("rust-subtle" ,rust-subtle-2))))))
 
+(define-public rust-vodozemac-0.5
+  (package
+    (name "rust-vodozemac")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "vodozemac" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mm3nazg7zailrwjs4f13nx2636v7b25ba6rfafjj8n5xkzdz417"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-aes" ,rust-aes-0.8)
+                       ("rust-arrayvec" ,rust-arrayvec-0.7)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-cbc" ,rust-cbc-0.1)
+                       ("rust-curve25519-dalek" ,rust-curve25519-dalek-4)
+                       ("rust-ed25519-dalek" ,rust-ed25519-dalek-2)
+                       ("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-matrix-pickle" ,rust-matrix-pickle-0.1)
+                       ("rust-pkcs7" ,rust-pkcs7-0.4)
+                       ("rust-prost" ,rust-prost-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-x25519-dalek" ,rust-x25519-dalek-2)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-olm-rs" ,rust-olm-rs-2)
+        ("rust-proptest" ,rust-proptest-1))))
+    (home-page "https://github.com/matrix-org/vodozemac")
+    (synopsis "Rust implementation of Olm and Megolm")
+    (description
+     "This package provides a Rust implementation of Olm and Megolm.")
+    (license license:asl2.0)))
+
 (define-public rust-x25519-dalek-2
   (package
     (name "rust-x25519-dalek")
-- 
2.41.0

[bug#69257] [PATCH 185/228] gnu: Add rust-qrcode-0.13.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-qrcode-0.13): Add variable.

Change-Id: I99140aa4bbd8abc1548b00534351329275cdbf53
---
 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 dd547b2568..9cfa0b8b0a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53411,6 +53411,26 @@ (define-public rust-python-pkginfo-0.5
         ("rust-zip" ,rust-zip-0.6))
        #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-qrcode-0.13
+  (package
+    (name "rust-qrcode")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrcode" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gyfc3xv94ml441a788p2jk38rakl3vrqr7khs0zk6dizmni6vqn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-image" ,rust-image-0.24))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.24))))
+    (home-page "https://github.com/kennytm/qrcode-rust")
+    (synopsis "QR code encoder in Rust")
+    (description "This package provides a QR code encoder in Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-quantiles-0.7
   (package
     (name "rust-quantiles")
-- 
2.41.0

[bug#69257] [PATCH 186/228] gnu: Add rust-matrix-sdk-qrcode-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-qrcode-0.7): Add variable.

Change-Id: I066ecadc74197eb7dfaf43dde738b27d6b582e70
---
 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 9cfa0b8b0a..dcb87e0b0b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37641,6 +37641,33 @@ (define-public rust-matrix-sdk-common-0.7
 used in the @code{matrix-sdk} crates.")
     (license license:asl2.0)))
 
+(define-public rust-matrix-sdk-qrcode-0.7
+  (package
+    (name "rust-matrix-sdk-qrcode")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-qrcode" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gjcvwy6ri5c2z960zmfzvdbdvkcblcysf1svy6l9rqa0zmn5ccb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-qrcode" ,rust-qrcode-0.13)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-vodozemac" ,rust-vodozemac-0.5))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.24)
+                                   ("rust-qrcode" ,rust-qrcode-0.13))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Encode and decode QR codes for Matrix verifications")
+    (description
+     "This package provides a library to encode and decode QR codes for
+interactive verifications in Matrix land.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-test-0.7
   (package
     (name "rust-matrix-sdk-test")
-- 
2.41.0

[bug#69257] [PATCH 187/228] gnu: Add rust-web-time-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-web-time-1): Add variable.
(rust-web-time-0.2): Inherit from rust-web-time-1.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dcb87e0b0b..a1e357eef2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80397,20 +80397,20 @@ (define-public rust-web-sys-0.3
      "Bindings for all Web APIs, a procedurally generated crate from WebIDL.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-web-time-0.2
+(define-public rust-web-time-1
   (package
     (name "rust-web-time")
-    (version "0.2.4")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "web-time" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1q6gk0nkwbfz30g1pz8g52mq00zjx7m5im36k3474aw73jdh8c5a"))))
+        (base32 "1c7pkivwgxdkpc2j4ga9pmf9zcqgfp68kijb5ixgg6y25kbnkqif"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f      ; Not all files included.
+     `(#:tests? #f      ; TODO: check if not all files included.
        #:cargo-inputs (("rust-js-sys" ,rust-js-sys-0.3)
                        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
        #:cargo-development-inputs
@@ -80425,9 +80425,23 @@ (define-public rust-web-time-0.2
     (home-page "https://github.com/daxpedda/web-time")
     (synopsis "Drop-in replacement for std::time for Wasm in browsers")
     (description
-     "Drop-in replacement for @code{std::time} for Wasm in browsers.")
+     "This package provides a drop-in replacement for @code{std::time}
+for Wasm in browsers.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-web-time-0.2
+  (package
+    (inherit rust-web-time-1)
+    (name "rust-web-time")
+    (version "0.2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "web-time" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1q6gk0nkwbfz30g1pz8g52mq00zjx7m5im36k3474aw73jdh8c5a"))))))
+
 (define-public rust-webbrowser-0.8
   (package
     (name "rust-webbrowser")
-- 
2.41.0

[bug#69257] [PATCH 188/228] gnu: Add rust-ulid-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ulid-1): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a1e357eef2..52add0344c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77517,6 +77517,37 @@ (define-public rust-uint-0.9
 arithmetic.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ulid-1
+  (package
+    (name "rust-ulid")
+    (version "1.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ulid" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0n8jj9gpkli0pxaqnxiivvsn6jlvvcs1yzmm2f4s18jsjqbqqxrl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-postgres-types" ,rust-postgres-types-0.2)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-uuid" ,rust-uuid-1)
+                       ("rust-web-time" ,rust-web-time-1))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher-0.1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/dylanhart/ulid-rs")
+    (synopsis "Universally Unique Lexicographically Sortable Identifier")
+    (description
+     "This package provides a Universally Unique Lexicographically
+Sortable Identifier implementation.")
+    (license license:expat)))
+
 (define-public rust-uluru-3
   (package
     (name "rust-uluru")
-- 
2.41.0

[bug#69257] [PATCH 189/228] gnu: Add rust-bs58-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-bs58-0.5): Add variable.
(rust-bs58-0.2): Inherit from rust-bs58-0.5.

Change-Id: I06a95ce256d22f0a724abbae9f86db47d9e90483
---
 gnu/packages/crates-io.scm | 45 ++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 52add0344c..16d81bd4d5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8141,8 +8141,41 @@ (define-public rust-browserslist-rs-0.6
     (description "Rust-ported Browserslist.")
     (license license:expat)))
 
+(define-public rust-bs58-0.5
+  (package
+    (name "rust-bs58")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bs58" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15kqgld75z03srq6nzsdgraakhvap5avgw364h352x0z6hv3ydgm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-tinyvec" ,rust-tinyvec-1))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-base58" ,rust-base58-0.1)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-rust-base58" ,rust-rust-base58-0.0)
+        ("rust-tinyvec" ,rust-tinyvec-1))))
+    (home-page "https://github.com/Nullus157/bs58-rs")
+    (synopsis "Another Base58 codec implementation")
+    (description
+     "Another Base58 codec implementation.  Compared to the base58 crate
+this is significantly faster at decoding: about 2.4x as fast when
+decoding 32 bytes, almost the same speed for encoding: about 3% slower
+when encoding 32 bytes. @code{rust-bs58} is not limited to 128 bytes
+and supports a configurable alphabet.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-bs58-0.2
   (package
+    (inherit rust-bs58-0.5)
     (name "rust-bs58")
     (version "0.2.5")
     (source
@@ -8154,23 +8187,13 @@ (define-public rust-bs58-0.2
        (sha256
         (base32
          "125i962x0m0ggdif6ds51wfif2lypiicy469dj5j2l6rm6xycpn9"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-sha2" ,rust-sha2-0.8))
        #:cargo-development-inputs
        (("rust-assert-matches" ,rust-assert-matches-1)
         ("rust-base58" ,rust-base58-0.1)
-        ("rust-rust-base58" ,rust-rust-base58-0.0))))
-    (home-page "https://github.com/mycorrhiza/bs58-rs")
-    (synopsis "Another Base58 codec implementation")
-    (description
-     "Another Base58 codec implementation.  Compared to the base58 crate this
-is significantly faster at decoding (about 2.4x as fast when decoding 32
-bytes), almost the same speed for encoding (about 3% slower when encoding 32
-bytes), doesn't have the 128 byte limitation and supports a configurable
-alphabet.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-rust-base58" ,rust-rust-base58-0.0))))))
 
 (define-public rust-bson-2
   (package
-- 
2.41.0

[bug#69257] [PATCH 190/228] gnu: Add rust-matrix-sdk-crypto-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-crypto-0.7): Add variable.

Change-Id: I7cb59cfa23860a09b4f7a6432d576705edc4d989
---
 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 16d81bd4d5..28915dc841 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37664,6 +37664,68 @@ (define-public rust-matrix-sdk-common-0.7
 used in the @code{matrix-sdk} crates.")
     (license license:asl2.0)))
 
+(define-public rust-matrix-sdk-crypto-0.7
+  (package
+    (name "rust-matrix-sdk-crypto")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-crypto" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02fd03zl2x1dqyp2lk2r7an9x6s9pmq94s4crmiplf5ivsiyrakj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-aes" ,rust-aes-0.8)
+                       ("rust-as-variant" ,rust-as-variant-1)
+                       ("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-bs58" ,rust-bs58-0.5)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-cbc" ,rust-cbc-0.1)
+                       ("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-ctr" ,rust-ctr-0.9)
+                       ("rust-eyeball" ,rust-eyeball-0.8)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-itertools" ,rust-itertools-0.12)
+                       ("rust-matrix-sdk-common" ,rust-matrix-sdk-common-0.7)
+                       ("rust-matrix-sdk-qrcode" ,rust-matrix-sdk-qrcode-0.7)
+                       ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rmp-serde" ,rust-rmp-serde-1)
+                       ("rust-ruma" ,rust-ruma-0.9)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-ulid" ,rust-ulid-1)
+                       ("rust-vodozemac" ,rust-vodozemac-0.5)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-indoc" ,rust-indoc-2)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-olm-rs" ,rust-olm-rs-2)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-stream-assert" ,rust-stream-assert-0.1)
+        ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Matrix encryption library")
+    (description "This package provides a matrix encryption library.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-qrcode-0.7
   (package
     (name "rust-matrix-sdk-qrcode")
-- 
2.41.0

[bug#69257] [PATCH 191/228] gnu: Add rust-matrix-sdk-store-encrpytion-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-store-encrpytion-0.7): Add
variable.

Change-Id: Ief65ec753078ebceaeea0bac58670eba6c204bcf
---
 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 28915dc841..b775d9a8b8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37753,6 +37753,39 @@ (define-public rust-matrix-sdk-qrcode-0.7
 interactive verifications in Matrix land.")
     (license license:asl2.0)))
 
+(define-public rust-matrix-sdk-store-encryption-0.7
+  (package
+    (name "rust-matrix-sdk-store-encryption")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-store-encryption" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0756z9ippsfpcazki5w9r3g9gxkm8wdg0vdlgb2s90prx5i32zka"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-blake3" ,rust-blake3-1)
+                       ("rust-chacha20poly1305" ,rust-chacha20poly1305-0.10)
+                       ("rust-displaydoc" ,rust-displaydoc-0.2)
+                       ("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rmp-serde" ,rust-rmp-serde-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Helpers for encrypted storage keys for the Matrix SDK")
+    (description "This package provides helpers for encrypted storage
+keys for the Matrix SDK.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-test-0.7
   (package
     (name "rust-matrix-sdk-test")
-- 
2.41.0

[bug#69257] [PATCH 192/228] gnu: Add rust-matrix-sdk-base-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-base-0.7): Add variable.

Change-Id: I09bf97dcb3b7d40f43d007bb178dfd9548807622
---
 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 b775d9a8b8..e7bc84a9f0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37622,6 +37622,57 @@ (define-public rust-matrix-pickle-derive-0.1
      "This package provides Derive support for @code{matrix-pickle}.")
     (license license:expat)))
 
+(define-public rust-matrix-sdk-base-0.7
+  (package
+    (name "rust-matrix-sdk-base")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-base" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "11qcrwqhv5w2sbcya6sc4cx00xj1lsy6rx1hs7qr8sl2s1a1k280"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-as-variant" ,rust-as-variant-1)
+        ("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-bitflags" ,rust-bitflags-2)
+        ("rust-eyeball" ,rust-eyeball-0.8)
+        ("rust-eyeball-im" ,rust-eyeball-im-0.4)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-matrix-sdk-common" ,rust-matrix-sdk-common-0.7)
+        ("rust-matrix-sdk-crypto" ,rust-matrix-sdk-crypto-0.7)
+        ("rust-matrix-sdk-store-encryption" ,rust-matrix-sdk-store-encryption-0.7)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-assign" ,rust-assign-1)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-stream-assert" ,rust-stream-assert-0.1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Base component to build a Matrix client library")
+    (description
+      "This package provides the base component to build a Matrix client
+library.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-common-0.7
   (package
     (name "rust-matrix-sdk-common")
-- 
2.41.0

[bug#69257] [PATCH 193/228] gnu: Add rust-macroific-attr-parse-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-macroific-attr-parse-1): Add
variable.

Change-Id: Ica78be90e7a10262b25d037a24e5513fef746a32
---
 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 e7bc84a9f0..710a1949b4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36901,6 +36901,29 @@ (define-public rust-macro-attr-0.2
 `custom_derive` crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-macroific-attr-parse-1
+  (package
+    (name "rust-macroific-attr-parse")
+    (version "1.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "macroific_attr_parse" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0rrgdbj4a8xnyb0giwv12vcnld0914s05b910vhyc2mkjpddb57x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Alorel/macroific-rs")
+    (synopsis "Attribute parsing utilities for the macroific crate")
+    (description "This package provides attribute parsing utilities for
+the macroific crate.")
+    (license license:asl2.0)))
+
 (define-public rust-macrotest-1
   (package
     (name "rust-macrotest")
-- 
2.41.0

[bug#69257] [PATCH 194/228] gnu: Add rust-macroific-core-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-macroific-core-1): Add variable.

Change-Id: If66230c66db3b3fff3fb9a601b65c0b40400bd68
---
 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 710a1949b4..aaf9b1c4ca 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36924,6 +36924,28 @@ (define-public rust-macroific-attr-parse-1
 the macroific crate.")
     (license license:asl2.0)))
 
+(define-public rust-macroific-core-1
+  (package
+    (name "rust-macroific-core")
+    (version "1.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "macroific_core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0may8c4ryb3khm0bsplpnwr9k5idcx3zjgybbib7l2b41098q68k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Alorel/macroific-rs")
+    (synopsis "Shared functionality for macroific & macroific_macro")
+    (description "This package provides shared functionality for
+macroific and macroific_macro.")
+    (license license:asl2.0)))
+
 (define-public rust-macrotest-1
   (package
     (name "rust-macrotest")
-- 
2.41.0

[bug#69257] [PATCH 195/228] gnu: Add rust-macroific-macro-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-macroific-macro-1): Add variable.

Change-Id: I27ed29c252a340c5580e486b437cc58bf79e785c
---
 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 aaf9b1c4ca..9c93644c90 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36946,6 +36946,31 @@ (define-public rust-macroific-core-1
 macroific and macroific_macro.")
     (license license:asl2.0)))
 
+(define-public rust-macroific-macro-1
+  (package
+    (name "rust-macroific-macro")
+    (version "1.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "macroific_macro" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1bpmc4dy16v0pw0jmp68cpn1ndlvbzlzwffw84g7zvfb8cqqbjdh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-macroific-attr-parse" ,rust-macroific-attr-parse-1)
+        ("rust-macroific-core" ,rust-macroific-core-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Alorel/macroific-rs")
+    (synopsis "Proc macros for the macroific crate")
+    (description "This package provides proc macros for the macroific
+crate.")
+    (license license:asl2.0)))
+
 (define-public rust-macrotest-1
   (package
     (name "rust-macrotest")
-- 
2.41.0

[bug#69257] [PATCH 196/228] gnu: Add rust-macroific-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-macroific-1): Add variable.

Change-Id: I167467bdaacc9348b3034dd79883c0294db89d51
---
 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 9c93644c90..3be0f77aa8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36901,6 +36901,35 @@ (define-public rust-macro-attr-0.2
 `custom_derive` crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-macroific-1
+  (package
+    (name "rust-macroific")
+    (version "1.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "macroific" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1pdr66v1q80w6ixihag432dg1mwp1ld44z0405fn48k0b6n00p7h"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-macroific-attr-parse" ,rust-macroific-attr-parse-1)
+        ("rust-macroific-core" ,rust-macroific-core-1)
+        ("rust-macroific-macro" ,rust-macroific-macro-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                                   ("rust-quote" ,rust-quote-1)
+                                   ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Alorel/macroific-rs")
+    (synopsis "Proc macro development utilities")
+    (description
+     "This package provides proc macro development utilities.")
+    (license license:asl2.0)))
+
 (define-public rust-macroific-attr-parse-1
   (package
     (name "rust-macroific-attr-parse")
-- 
2.41.0

[bug#69257] [PATCH 197/228] gnu: Add rust-accessory-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-accessory-1): Add variable.

Change-Id: Ia5b35724c32b0d3b9a93552e89ce58ccafef829f
---
 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 3be0f77aa8..c97fcc8283 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -301,6 +301,29 @@ (define-public rust-abomonation-0.7
 library in Rust.")
     (license license:expat)))
 
+(define-public rust-accessory-1
+  (package
+    (name "rust-accessory")
+    (version "1.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "accessory" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02sfmgmr4fpgh4y24gn3dp7y99r5dnnk07dppd7p816wp4sba2w5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-macroific" ,rust-macroific-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Alorel/accessory-rs")
+    (synopsis "Configurable get/set/get_mut derive macro")
+    (description
+     "This package provides a configurable get/set/get_mut derive macro.")
+    (license license:asl2.0)))
+
 (define-public rust-adaptive-barrier-1
   (package
     (name "rust-adaptive-barrier")
-- 
2.41.0

[bug#69257] [PATCH 198/228] gnu: Add rust-delegate-display-2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-delegate-display-2): Add variable.

Change-Id: I68de143a396e2a30e1b5a60a4c49db17516b5c44
---
 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 c97fcc8283..0478093ae4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18507,6 +18507,32 @@ (define-public rust-dejavu-2
      "This package provides the @code{DejaVu} font family for embedding.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-delegate-display-2
+  (package
+    (name "rust-delegate-display")
+    (version "2.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "delegate-display" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0rndsj11q9kl8q42blvvlhly3dfh6rp25xmv3742l51ky80m5a4q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-macroific" ,rust-macroific-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs
+       (("rust-static-assertions" ,rust-static-assertions-1))))
+    (home-page "https://github.com/Alorel/delegate-display-rs")
+    (synopsis "derive(Display, Debug) for structs/enums with one member")
+    (description
+      "This package provides derive(Display, Debug) for structs/enums
+with one member.")
+    (license license:expat)))
+
 (define-public rust-demo-hack-0.0
   (package
     (name "rust-demo-hack")
-- 
2.41.0

[bug#69257] [PATCH 199/228] gnu: Add rust-fancy-constructor-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-fancy-constructor-1): Add variable.

Change-Id: I6e42e7ee6583cd9792bf6ad4bd036dba93a78edd
---
 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 0478093ae4..c1b12bea19 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23142,6 +23142,30 @@ (define-public rust-fallible-streaming-iterator-0.1
     (description "Fallible streaming iteration")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-fancy-constructor-1
+  (package
+    (name "rust-fancy-constructor")
+    (version "1.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fancy_constructor" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dcllqf8hj7yn8fxyi91kn3v3i7aa861kb4gc27jyfzp99z327zp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-macroific" ,rust-macroific-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Alorel/fancy_constructor-rs.git")
+    (synopsis "Derive a highly configurable constructor for your struct")
+    (description
+      "This package lets you derive a highly configurable constructor for
+your struct.")
+    (license license:asl2.0)))
+
 (define-public rust-fancy-regex-0.11
   (package
     (name "rust-fancy-regex")
-- 
2.41.0

[bug#69257] [PATCH 200/228] gnu: Add rust-indexed-db-futures-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-indexed-db-futures-0.4): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c1b12bea19..b56cd52fde 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30440,6 +30440,37 @@ (define-public rust-indenter-0.3
 that efficiently appends and removes common indentation after every newline.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-indexed-db-futures-0.4
+  (package
+    (name "rust-indexed-db-futures")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "indexed_db_futures" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0lhiixh3i8iphxda58cp3zfx4989q817r2xbhliy0bjpc0vhihkc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-accessory" ,rust-accessory-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-delegate-display" ,rust-delegate-display-2)
+        ("rust-fancy-constructor" ,rust-fancy-constructor-1)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-uuid" ,rust-uuid-1)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
+        ("rust-web-sys" ,rust-web-sys-0.3))
+       #:cargo-development-inputs
+       (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/Alorel/rust-indexed-db")
+    (synopsis "Future bindings for IndexedDB via web_sys")
+    (description "This package provides future bindings for
+@code{IndexedDB} via web_sys.")
+    (license license:expat)))
+
 (define-public rust-indexmap-2
   (package
     (name "rust-indexmap")
-- 
2.41.0

[bug#69257] [PATCH 201/228] gnu: Place rust-serdeconv-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-serdeconv-0.4): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b56cd52fde..a01c0ded15 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62886,36 +62886,6 @@ (define-public rust-serde-hjson-0.9
 framework.")
     (license license:expat)))
 
-(define-public rust-serdeconv-0.4
-  (package
-    (name "rust-serdeconv")
-    (version "0.4.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "serdeconv" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0cal6qkzps92g7csycqij4ik1df3ccxn5sxnjvfvm473phnwbvbi"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-rmp-serde" ,rust-rmp-serde-0.15)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-toml" ,rust-toml-0.5)
-        ("rust-trackable" ,rust-trackable-1))
-       #:cargo-development-inputs
-       (("rust-serde-derive" ,rust-serde-derive-1))))
-    (home-page "https://github.com/sile/serdeconv")
-    (synopsis
-     "Convert between TOML/JSON/MessagePack strings and serializable values")
-    (description
-     "This crate provides traits and functions for converting between
-TOML/JSON/MessagePack strings and serializable values.")
-    (license license:expat)))
-
 (define-public rust-serde-derive-1
   (package
     (name "rust-serde-derive")
@@ -63732,6 +63702,36 @@ (define-public rust-serde-wasm-bindgen-0.3
     (description "Native Serde adapter for wasm-bindgen.")
     (license license:expat)))
 
+(define-public rust-serdeconv-0.4
+  (package
+    (name "rust-serdeconv")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serdeconv" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cal6qkzps92g7csycqij4ik1df3ccxn5sxnjvfvm473phnwbvbi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-rmp-serde" ,rust-rmp-serde-0.15)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-toml" ,rust-toml-0.5)
+        ("rust-trackable" ,rust-trackable-1))
+       #:cargo-development-inputs
+       (("rust-serde-derive" ,rust-serde-derive-1))))
+    (home-page "https://github.com/sile/serdeconv")
+    (synopsis
+     "Convert between TOML/JSON/MessagePack strings and serializable values")
+    (description
+     "This crate provides traits and functions for converting between
+TOML/JSON/MessagePack strings and serializable values.")
+    (license license:expat)))
+
 (define-public rust-serial-test-2
   (package
     (name "rust-serial-test")
-- 
2.41.0

[bug#69257] [PATCH 202/228] gnu: Place rust-serde-wasm-bindgen-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

gnu/packages/crates-io.scm (rust-serde-wasm-bindgen-0.3): Move variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a01c0ded15..732c3851ac 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63445,6 +63445,35 @@ (define-public rust-serde-value-0.7
 for later processing.")
     (license license:expat)))
 
+(define-public rust-serde-wasm-bindgen-0.3
+  (package
+    (name "rust-serde-wasm-bindgen")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serde-wasm-bindgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xzh1a3rhapirlca4rbvh6bycphxg5yjmdwjsqij3hl6wpl6b0v1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-fnv" ,rust-fnv-1)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
+       #:cargo-development-inputs
+       (("rust-maplit" ,rust-maplit-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/cloudflare/serde-wasm-bindgen")
+    (synopsis "Native Serde adapter for wasm-bindgen")
+    (description "Native Serde adapter for wasm-bindgen.")
+    (license license:expat)))
+
 (define-public rust-serde-with-3
   (package
     (name "rust-serde-with")
@@ -63673,35 +63702,6 @@ (define-public rust-serde-yaml-0.8
         ("rust-indoc" ,rust-indoc-1)
         ("rust-serde-derive" ,rust-serde-derive-1))))))
 
-(define-public rust-serde-wasm-bindgen-0.3
-  (package
-    (name "rust-serde-wasm-bindgen")
-    (version "0.3.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "serde-wasm-bindgen" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1xzh1a3rhapirlca4rbvh6bycphxg5yjmdwjsqij3hl6wpl6b0v1"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-fnv" ,rust-fnv-1)
-        ("rust-js-sys" ,rust-js-sys-0.3)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
-       #:cargo-development-inputs
-       (("rust-maplit" ,rust-maplit-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-bytes" ,rust-serde-bytes-0.11)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
-    (home-page "https://github.com/cloudflare/serde-wasm-bindgen")
-    (synopsis "Native Serde adapter for wasm-bindgen")
-    (description "Native Serde adapter for wasm-bindgen.")
-    (license license:expat)))
-
 (define-public rust-serdeconv-0.4
   (package
     (name "rust-serdeconv")
-- 
2.41.0

[bug#69257] [PATCH 203/228] gnu: Add rust-serde-wasm-bindgen-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serde-wasm-bindgen-0.6): Add
variable.
(rust-serde-wasm-bindgen-0.3): Inherit from rust-serde-wasm-bindgen-0.6.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 732c3851ac..dc0c2b6df7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63445,8 +63445,39 @@ (define-public rust-serde-value-0.7
 for later processing.")
     (license license:expat)))
 
+(define-public rust-serde-wasm-bindgen-0.6
+  (package
+    (name "rust-serde-wasm-bindgen")
+    (version "0.6.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serde-wasm-bindgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cpik86f5vsyms0jhm553p7w55f2lnyvnnv6ja6izbhk0pvi7dxr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-js-sys" ,rust-js-sys-0.3)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-maplit" ,rust-maplit-1)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/RReverser/serde-wasm-bindgen")
+    (synopsis "Native Serde adapter for wasm-bindgen")
+    (description
+      "This package provides a native Serde adapter for wasm-bindgen.")
+    (license license:expat)))
+
 (define-public rust-serde-wasm-bindgen-0.3
   (package
+    (inherit rust-serde-wasm-bindgen-0.6)
     (name "rust-serde-wasm-bindgen")
     (version "0.3.1")
     (source
@@ -63456,7 +63487,6 @@ (define-public rust-serde-wasm-bindgen-0.3
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1xzh1a3rhapirlca4rbvh6bycphxg5yjmdwjsqij3hl6wpl6b0v1"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-fnv" ,rust-fnv-1)
@@ -63468,11 +63498,7 @@ (define-public rust-serde-wasm-bindgen-0.3
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-bytes" ,rust-serde-bytes-0.11)
         ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
-    (home-page "https://github.com/cloudflare/serde-wasm-bindgen")
-    (synopsis "Native Serde adapter for wasm-bindgen")
-    (description "Native Serde adapter for wasm-bindgen.")
-    (license license:expat)))
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))))
 
 (define-public rust-serde-with-3
   (package
-- 
2.41.0

[bug#69257] [PATCH 204/228] gnu: Add rust-matrix-sdk-indexeddb-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-indexeddb-0.7): Add
variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dc0c2b6df7..21cdb049f0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37980,6 +37980,55 @@ (define-public rust-matrix-sdk-crypto-0.7
     (description "This package provides a matrix encryption library.")
     (license license:asl2.0)))
 
+(define-public rust-matrix-sdk-indexeddb-0.7
+  (package
+    (name "rust-matrix-sdk-indexeddb")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-indexeddb" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12x5si7148a7a3rgbfjimghz81m6gym54pa0izrjzvflql2q0f5d"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-gloo-utils" ,rust-gloo-utils-0.2)
+        ("rust-indexed-db-futures" ,rust-indexed-db-futures-0.4)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-matrix-sdk-crypto" ,rust-matrix-sdk-crypto-0.7)
+        ("rust-matrix-sdk-store-encryption"
+         ,rust-matrix-sdk-store-encryption-0.7)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-wasm-bindgen" ,rust-serde-wasm-bindgen-0.6)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-web-sys" ,rust-web-sys-0.3))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-matrix-sdk-common" ,rust-matrix-sdk-common-0.7)
+        ("rust-matrix-sdk-crypto" ,rust-matrix-sdk-crypto-0.7)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-uuid" ,rust-uuid-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Web's IndexedDB Storage backend for matrix-sdk")
+    (description "Web's @code{IndexedDB} Storage backend for matrix-sdk")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-qrcode-0.7
   (package
     (name "rust-matrix-sdk-qrcode")
-- 
2.41.0

[bug#69257] [PATCH 205/228] gnu: Add rust-deadpool-sync-0.1.

[Herman Rimm via Guix-patches via]

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

Change-Id: I6faa6f867eb0b05e7748a7db6fc9d68180121c3f
---
 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 21cdb049f0..a0fbcf7028 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18086,6 +18086,27 @@ (define-public rust-deadpool-runtime-0.1
 for sync managers.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-deadpool-sync-0.1
+  (package
+    (name "rust-deadpool-sync")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "deadpool-sync" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02habnbf9gna5yg5parpfbgz1342mzyxmd5lcz7f9jhk9i4p1nzq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-deadpool-runtime" ,rust-deadpool-runtime-0.1)
+                       ("rust-tracing" ,rust-tracing-0.1))))
+    (home-page "https://github.com/bikeshedder/deadpool")
+    (synopsis "Dead simple async pool utitities for sync managers")
+    (description "This package provides dead simple async pool utitities
+for sync managers.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-debug-helper-0.3
   (package
     (name "rust-debug-helper")
-- 
2.41.0

[bug#69257] [PATCH 206/228] gnu: Add rust-fallible-iterator-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-fallible-iterator-0.3): Add variable.
(rust-fallible-iterator-0.2): Inherit from rust-fallible-iterator-0.3.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a0fbcf7028..a3766215a1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23124,8 +23124,29 @@ (define-public rust-failure-derive-0.1
     (description "Derives for the failure crate.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-fallible-iterator-0.3
+  (package
+    (name "rust-fallible-iterator")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fallible-iterator" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ja6l56yka5vn4y4pk6hn88z0bpny7a8k1919aqjzp0j1yhy9k1a"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/sfackler/rust-fallible-iterator")
+    (synopsis "Fallible iterator traits")
+    (description "If the @code{std} or @code{alloc} features are enabled, this
+crate provides implementations for @code{Box}, @code{Vec}, @code{BTreeMap}, and
+@code{BTreeSet}.  If the @code{std} feature is enabled, this crate additionally
+provides implementations for @code{HashMap} and @code{HashSet}.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-fallible-iterator-0.2
   (package
+    (inherit rust-fallible-iterator-0.3)
     (name "rust-fallible-iterator")
     (version "0.2.0")
     (source
@@ -23135,16 +23156,7 @@ (define-public rust-fallible-iterator-0.2
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1xq759lsr8gqss7hva42azn3whgrbrs2sd9xpn92c5ickxm1fhs4"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/sfackler/rust-fallible-iterator")
-    (synopsis "Fallible iterator traits")
-    (description "If the @code{std} or @code{alloc} features are enabled, this
-crate provides implementations for @code{Box}, @code{Vec}, @code{BTreeMap}, and
-@code{BTreeSet}.  If the @code{std} feature is enabled, this crate additionally
-provides implementations for @code{HashMap} and @code{HashSet}.")
-    (license (list license:asl2.0
-                   license:expat))))
+          "1xq759lsr8gqss7hva42azn3whgrbrs2sd9xpn92c5ickxm1fhs4"))))))
 
 (define-public rust-fallible-streaming-iterator-0.1
   (package
-- 
2.41.0

[bug#69257] [PATCH 207/228] gnu: Add rust-sqlite3-parser-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-sqlite3-parser-0.12): Add variable.

Change-Id: If2ce99a11a402db86ffbcbe9127e8644cb903944
---
 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 a3766215a1..3252a49fd4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66997,6 +66997,39 @@ (define-public rust-sqlite-0.26
        (("rust-libc" ,rust-libc-0.2)
         ("rust-sqlite3-sys" ,rust-sqlite3-sys-0.13))))))
 
+(define-public rust-sqlite3-parser-0.12
+  (package
+    (name "rust-sqlite3-parser")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sqlite3-parser" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dx8j16ki2fsrwn1p36wnf079pvcs17549rin29x99vhkcpjbpcs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-cc" ,rust-cc-1)
+                       ("rust-fallible-iterator" ,rust-fallible-iterator-0.3)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-phf" ,rust-phf-0.11)
+                       ("rust-phf-codegen" ,rust-phf-codegen-0.11)
+                       ("rust-phf-shared" ,rust-phf-shared-0.11)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ;; TODO: do not add normal+build dependency twice.
+                       ("rust-uncased" ,rust-uncased-0.9))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.10))))
+    (home-page "https://github.com/gwenn/lemon-rs")
+    (synopsis "Parser for SQL as understood by SQLite")
+    (description
+      "This package provides a parser for as understood by SQLite.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-sqlite3-src-0.5
   (package
     (name "rust-sqlite3-src")
-- 
2.41.0

[bug#69257] [PATCH 208/228] gnu: Add rust-rusqlite-macros-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rusqlite-macros-0.1): Add variable.

Change-Id: I4d1af84aafa7e818aaf315e9731b4d1b5a0a63a1
---
 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 3252a49fd4..87a5ea1f99 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59251,6 +59251,28 @@ (define-public rust-rusqlite-0.26
         ("rust-url" ,rust-url-2)
         ("rust-uuid" ,rust-uuid-0.8))))))
 
+(define-public rust-rusqlite-macros-0.1
+  (package
+    (name "rust-rusqlite-macros")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rusqlite-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0bbgnp7pgk358js63666ix6a9p4fr4lgigaaf4av3aj45qksi4ix"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-fallible-iterator" ,rust-fallible-iterator-0.3)
+                       ("rust-sqlite3-parser" ,rust-sqlite3-parser-0.12))))
+    (home-page "https://github.com/rusqlite/rusqlite")
+    (synopsis "Private implementation detail of rusqlite crate")
+    (description
+      "This package provides a private implementation detail of the
+rusqlite crate.")
+    (license license:expat)))
+
 (define-public rust-rust-htslib-0.38
   (package
     (name "rust-rust-htslib")
-- 
2.41.0

[bug#69257] [PATCH 209/228] gnu: Add rust-rusqlite-0.30.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rusqlite-0.30): Add variable.
(rust-rusqlite-0.29): Inherit from rust-rusqlite-0.30.

Change-Id: Iacc5a42c8b6cd2ec21d929eb48489bddd85d192f
---
 gnu/packages/crates-io.scm | 53 ++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 87a5ea1f99..82c35ffa3b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59179,8 +59179,50 @@ (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-rusqlite-0.30
+  (package
+    (name "rust-rusqlite")
+    (version "0.30.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rusqlite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0kgjk7h53wp8k2di2j83ivf50f0bk6rg7bq8j36ygxb42lb4d057"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-2)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-csv" ,rust-csv-1)
+        ("rust-fallible-iterator" ,rust-fallible-iterator-0.3)
+        ("rust-fallible-streaming-iterator"
+         ,rust-fallible-streaming-iterator-0.1)
+        ("rust-hashlink" ,rust-hashlink-0.8)
+        ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.27)
+        ("rust-rusqlite-macros" ,rust-rusqlite-macros-0.1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-smallvec" ,rust-smallvec-1)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-url" ,rust-url-2)
+        ("rust-uuid" ,rust-uuid-1))
+       #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)
+                                   ("rust-doc-comment" ,rust-doc-comment-0.3)
+                                   ("rust-lazy-static" ,rust-lazy-static-1)
+                                   ("rust-regex" ,rust-regex-1)
+                                   ("rust-tempfile" ,rust-tempfile-3)
+                                   ("rust-unicase" ,rust-unicase-2)
+                                   ("rust-uuid" ,rust-uuid-1))))
+    (inputs (list sqlite))
+    (home-page "https://github.com/rusqlite/rusqlite")
+    (synopsis "Wrapper for SQLite")
+    (description "This crate provides a wrapper for SQLite.")
+    (license license:expat)))
+
 (define-public rust-rusqlite-0.29
   (package
+    (inherit rust-rusqlite-0.30)
     (name "rust-rusqlite")
     (version "0.29.0")
     (source (origin
@@ -59190,14 +59232,14 @@ (define-public rust-rusqlite-0.29
               (sha256
                (base32
                 "1wj12rmwa8g0bfhsk307fl84k0xcw8ji872xx3k447apdl1rv6sl"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-2)
         ("rust-chrono" ,rust-chrono-0.4)
         ("rust-csv" ,rust-csv-1)
         ("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
-        ("rust-fallible-streaming-iterator" ,rust-fallible-streaming-iterator-0.1)
+        ("rust-fallible-streaming-iterator"
+         ,rust-fallible-streaming-iterator-0.1)
         ("rust-hashlink" ,rust-hashlink-0.8)
         ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.26)
         ("rust-serde-json" ,rust-serde-json-1)
@@ -59212,12 +59254,7 @@ (define-public rust-rusqlite-0.29
         ("rust-regex" ,rust-regex-1)
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-unicase" ,rust-unicase-2)
-        ("rust-uuid" ,rust-uuid-1))))
-    (inputs (list sqlite))
-    (home-page "https://github.com/rusqlite/rusqlite")
-    (synopsis "Wrapper for SQLite")
-    (description "This crate provides a wrapper for SQLite.")
-    (license license:expat)))
+        ("rust-uuid" ,rust-uuid-1))))))
 
 (define-public rust-rusqlite-0.26
   (package
-- 
2.41.0

[bug#69257] [PATCH 210/228] gnu: Add rust-deadpool-0.10.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-deadpool-0.10): Add variable.
(rust-deadpool-0.9): Inherit from rust-deadpool-0.10.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 82c35ffa3b..8535fc72de 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18012,22 +18012,23 @@ (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-deadpool-0.9
+(define-public rust-deadpool-0.10
   (package
     (name "rust-deadpool")
-    (version "0.9.5")
+    (version "0.10.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "deadpool" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0vl5qg5pfx0c9c41g299clfdgz9la6z8361aycb21cia1zwy07s2"))))
+        (base32 "145lq79dlc4jn7jvlcf4lb105bs3z3jy6g7d15zv7iy1g04i117v"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
                        ("rust-deadpool-runtime" ,rust-deadpool-runtime-0.1)
                        ("rust-num-cpus" ,rust-num-cpus-1)
+                       ;; Needed by rust-deadpool-0.9.
                        ("rust-retain-mut" ,rust-retain-mut-0.1)
                        ("rust-serde" ,rust-serde-1)
                        ("rust-tokio" ,rust-tokio-1))
@@ -18043,6 +18044,19 @@ (define-public rust-deadpool-0.9
 of any type.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-deadpool-0.9
+  (package
+    (inherit rust-deadpool-0.10)
+    (name "rust-deadpool")
+    (version "0.9.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "deadpool" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vl5qg5pfx0c9c41g299clfdgz9la6z8361aycb21cia1zwy07s2"))))))
+
 (define-public rust-deadpool-0.7
   (package
     (inherit rust-deadpool-0.9)
-- 
2.41.0

[bug#69257] [PATCH 211/228] gnu: Add rust-deadpool-sqlite-0.7.

[Herman Rimm via Guix-patches via]

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

Change-Id: I7d7d34de137e36a7adefcd88e31adf2dad28154e
---
 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 8535fc72de..5c15a641b2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18100,6 +18100,32 @@ (define-public rust-deadpool-runtime-0.1
 for sync managers.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-deadpool-sqlite-0.7
+  (package
+    (name "rust-deadpool-sqlite")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "deadpool-sqlite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b621w3hl1ay39c6kp80lzcymbi0mys7ir558cjy4frgw4v0w0dq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-deadpool" ,rust-deadpool-0.10)
+                       ("rust-deadpool-sync" ,rust-deadpool-sync-0.1)
+                       ("rust-rusqlite" ,rust-rusqlite-0.30)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-config" ,rust-config-0.13)
+                                   ("rust-dotenv" ,rust-dotenv-0.15)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/bikeshedder/deadpool")
+    (synopsis "Dead simple async pool for rusqlite")
+    (description
+      "This package provides dead simple async pool for rusqlite.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-deadpool-sync-0.1
   (package
     (name "rust-deadpool-sync")
-- 
2.41.0

[bug#69257] [PATCH 212/228] gnu: Add rust-matrix-sdk-sqlite-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-sqlite-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5c15a641b2..c927b13e78 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38129,6 +38129,51 @@ (define-public rust-matrix-sdk-qrcode-0.7
 interactive verifications in Matrix land.")
     (license license:asl2.0)))
 
+(define-public rust-matrix-sdk-sqlite-0.7
+  (package
+    (name "rust-matrix-sdk-sqlite")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-sqlite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1p0ivgb7p9l3v1fxhhw798mxb5k18qkvlhmj2qsxkv57byy3dg90"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-deadpool-sqlite" ,rust-deadpool-sqlite-0.7)
+        ("rust-itertools" ,rust-itertools-0.12)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-matrix-sdk-crypto" ,rust-matrix-sdk-crypto-0.7)
+        ("rust-matrix-sdk-store-encryption"
+         ,rust-matrix-sdk-store-encryption-0.7)
+        ("rust-rmp-serde" ,rust-rmp-serde-1)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-rusqlite" ,rust-rusqlite-0.30)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-vodozemac" ,rust-vodozemac-0.5))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-glob" ,rust-glob-0.3)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-matrix-sdk-crypto" ,rust-matrix-sdk-crypto-0.7)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Sqlite storage backend for matrix-sdk")
+    (description
+     "This package provides an sqlite storage backend for matrix-sdk.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-store-encryption-0.7
   (package
     (name "rust-matrix-sdk-store-encryption")
-- 
2.41.0

[bug#69257] [PATCH 213/228] gnu: Add rust-matrix-sdk-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c927b13e78..930e657ce3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37898,6 +37898,93 @@ (define-public rust-matrix-pickle-derive-0.1
      "This package provides Derive support for @code{matrix-pickle}.")
     (license license:expat)))
 
+(define-public rust-matrix-sdk-0.7
+  (package
+    (name "rust-matrix-sdk")
+    (version "0.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1v22ssxamvkigwx35a5igw60k8z9cy59h7k864d6ccwbzkjqfrik"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-anymap2" ,rust-anymap2-0.13)
+        ("rust-aquamarine" ,rust-aquamarine-0.5)
+        ("rust-as-variant" ,rust-as-variant-1)
+        ("rust-async-channel" ,rust-async-channel-2)
+        ("rust-async-stream" ,rust-async-stream-0.3)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-backoff" ,rust-backoff-0.4)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-bytesize" ,rust-bytesize-1)
+        ("rust-cfg-vis" ,rust-cfg-vis-0.3)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-event-listener" ,rust-event-listener-4)
+        ("rust-eyeball" ,rust-eyeball-0.8)
+        ("rust-eyeball-im" ,rust-eyeball-im-0.4)
+        ("rust-eyeball-im-util" ,rust-eyeball-im-util-0.5)
+        ("rust-eyre" ,rust-eyre-0.6)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-gloo-timers" ,rust-gloo-timers-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-image" ,rust-image-0.24)
+        ("rust-imbl" ,rust-imbl-2)
+        ("rust-indexmap" ,rust-indexmap-2)
+        ("rust-language-tags" ,rust-language-tags-0.3)
+        ("rust-mas-oidc-client" ,rust-mas-oidc-client-0.7)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-matrix-sdk-common" ,rust-matrix-sdk-common-0.7)
+        ("rust-matrix-sdk-indexeddb" ,rust-matrix-sdk-indexeddb-0.7)
+        ("rust-matrix-sdk-sqlite" ,rust-matrix-sdk-sqlite-0.7)
+        ("rust-mime" ,rust-mime-0.3)
+        ("rust-mime2ext" ,rust-mime2ext-0.1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-html-form" ,rust-serde-html-form-0.2)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+        ("rust-tokio-util" ,rust-tokio-util-0.7)
+        ("rust-tower" ,rust-tower-0.4)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-url" ,rust-url-2)
+        ("rust-urlencoding" ,rust-urlencoding-2)
+        ("rust-uuid" ,rust-uuid-1)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-assert-json-diff" ,rust-assert-json-diff-2)
+        ("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-dirs" ,rust-dirs-5)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
+        ("rust-stream-assert" ,rust-stream-assert-0.1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
+        ("rust-wiremock" ,rust-wiremock-0.5))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "High level Matrix client-server library")
+    (description
+     "This package provides a high level Matrix client-server library.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-base-0.7
   (package
     (name "rust-matrix-sdk-base")
-- 
2.41.0

[bug#69257] [PATCH 214/228] gnu: Add rust-oneshot-uniffi-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-oneshot-uniffi-0.1): Add variable.

Change-Id: I4396a88b687af2ef9e546f4d073cf4a1be0f8f36
---
 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 930e657ce3..1f638fa96b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45007,6 +45007,31 @@ (define-public rust-ogg-0.8
 spec in pure Rust.")
     (license license:expat)))
 
+(define-public rust-oneshot-uniffi-0.1
+  (package
+    (name "rust-oneshot-uniffi")
+    (version "0.1.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "oneshot-uniffi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "175j04f7rpgy552h5m51ywq7184cqhcfs31dsxanjvwpg1f8sm3c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-async-std" ,rust-async-std-1)
+                                   ("rust-criterion" ,rust-criterion-0.3)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/faern/oneshot")
+    (synopsis
+     "Patched version of oneshot specifically for the UniFFI project.")
+    (description
+     "This package provides a patched version of oneshot specifically for
+the @code{UniFFI} project.  This removes the `loom` target and dependency
+which helps with @code{UniFFI's} downstream consumers.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-onig-6
   (package
     (name "rust-onig")
-- 
2.41.0

[bug#69257] [PATCH 215/228] gnu: Add rust-async-compat-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-async-compat-0.2): Add variable.

Change-Id: Iaded7273d198b3efd112b4a84c775bc8445df1fe
---
 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 1f638fa96b..083f08b0f6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4115,6 +4115,36 @@ (define-public rust-async-channel-1
        (("rust-easy-parallel" ,rust-easy-parallel-3)
         ("rust-futures-lite" ,rust-futures-lite-1))))))
 
+(define-public rust-async-compat-0.2
+  (package
+    (name "rust-async-compat")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async-compat" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06s625ydwms36y4sn723mwq7s4bba2gmp9pq0y65s2gb3xy712pn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-io" ,rust-futures-io-0.3)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-blocking" ,rust-blocking-1)
+                                   ("rust-futures" ,rust-futures-0.3)
+                                   ("rust-reqwest" ,rust-reqwest-0.11)
+                                   ("rust-tokio" ,rust-tokio-1)
+                                   ("rust-warp" ,rust-warp-0.3))))
+    (home-page "https://github.com/smol-rs/async-compat")
+    (synopsis "Compatibility adapter between tokio and futures")
+    (description
+      "This package provides compatibility adapter between tokio and
+futures.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-async-compression-0.4
   (package
     (name "rust-async-compression")
-- 
2.41.0

[bug#69257] [PATCH 216/228] gnu: Add rust-uniffi-core-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-core-0.25): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 083f08b0f6..6bb64838a4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -78978,6 +78978,37 @@ (define-public rust-unicode-xid-0.0
         (base32
          "1p5l9h3n3i53cp95fb65p8q3vbwib79ryd9z5z5h5kr9gl6qc7wc"))))))
 
+(define-public rust-uniffi-core-0.25
+  (package
+    (name "rust-uniffi-core")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nxd3z5290w3spzd109j232l69iwd2rx4bfij36na5mglcks28b1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-async-compat" ,rust-async-compat-0.2)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-camino" ,rust-camino-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-oneshot-uniffi" ,rust-oneshot-uniffi-0.1)
+        ("rust-paste" ,rust-paste-1)
+        ("rust-static-assertions" ,rust-static-assertions-1))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis
+      "Runtime support code for uniffi, a language bindings generator")
+    (description
+     "This package provides runtime support code for uniffi: a multi-
+language bindings generator for Rust.")
+    (license license:mpl2.0)))
+
 (define-public rust-unindent-0.2
   (package
     (name "rust-unindent")
-- 
2.41.0

[bug#69257] [PATCH 217/228] gnu: Add rust-uniffi-checksum-derive-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-checksum-derive-0.25): Add
variable.

Change-Id: I85834ff0f83bf71bb35f8a7df7d18eb35395d15d
---
 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 6bb64838a4..c94b24e02f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -78978,6 +78978,28 @@ (define-public rust-unicode-xid-0.0
         (base32
          "1p5l9h3n3i53cp95fb65p8q3vbwib79ryd9z5z5h5kr9gl6qc7wc"))))))
 
+(define-public rust-uniffi-checksum-derive-0.25
+  (package
+    (name "rust-uniffi-checksum-derive")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_checksum_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b00ld4k1riwq445ghw95rsq3hxxc7x6cpcqzlq96bbi5w97q4sm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "Checksum custom derive for uniffi")
+    (description
+     "This package provides a checksum custom derive for uniffi: a multi-
+language bindings generator for Rust.")
+    (license license:mpl2.0)))
+
 (define-public rust-uniffi-core-0.25
   (package
     (name "rust-uniffi-core")
-- 
2.41.0

[bug#69257] [PATCH 218/228] gnu: Add rust-uniffi-meta-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-meta-0.25): Add variable.

Change-Id: Ib787259564adec446321d5cecf0e0ca41414b45b
---
 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 c94b24e02f..09b4f3440a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79031,6 +79031,29 @@ (define-public rust-uniffi-core-0.25
 language bindings generator for Rust.")
     (license license:mpl2.0)))
 
+(define-public rust-uniffi-meta-0.25
+  (package
+    (name "rust-uniffi-meta")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_meta" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18hp6jnk8dhv3w92bia06k0bygi7i14a6v9xciqlpb5ilxrqbp3i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-siphasher" ,rust-siphasher-0.3)
+        ("rust-uniffi-checksum-derive" ,rust-uniffi-checksum-derive-0.25))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "Metadata for uniffi")
+    (description "This package provides metadata for uniffi.")
+    (license license:mpl2.0)))
+
 (define-public rust-unindent-0.2
   (package
     (name "rust-unindent")
-- 
2.41.0

[bug#69257] [PATCH 219/228] gnu: Add rust-uniffi-testing-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-testing-0.25): Add variable.

Change-Id: Iac02d49084be4e185cacf527e4c23e8e0d82deb5
---
 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 09b4f3440a..9743b5a40d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79054,6 +79054,30 @@ (define-public rust-uniffi-meta-0.25
     (description "This package provides metadata for uniffi.")
     (license license:mpl2.0)))
 
+(define-public rust-uniffi-testing-0.25
+  (package
+    (name "rust-uniffi-testing")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_testing" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0g7jv7w979n43nkmkrjk6w9f1drsjgxhalwcpvfpddpwpzg4i10i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-camino" ,rust-camino-1)
+                       ("rust-cargo-metadata" ,rust-cargo-metadata-0.15)
+                       ("rust-fs-err" ,rust-fs-err-2)
+                       ("rust-once-cell" ,rust-once-cell-1))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "Testing helpers for uniffi")
+    (description
+     "This package provides testing helpers for uniffi.")
+    (license license:mpl2.0)))
+
 (define-public rust-unindent-0.2
   (package
     (name "rust-unindent")
-- 
2.41.0

[bug#69257] [PATCH 220/228] gnu: Add rust-weedle2-4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-weedle2-4): Add variable.

Change-Id: I5fa4769fd2b986c555e1d2441612e631bb87b645
---
 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 9743b5a40d..856fa6307c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -81444,6 +81444,26 @@ (define-public rust-wee-alloc-0.4
     (description "wee_alloc: The Wasm-Enabled, Elfin Allocator.")
     (license license:mpl2.0)))
 
+(define-public rust-weedle2-4
+  (package
+    (name "rust-weedle2")
+    (version "4.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "weedle2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hbph2pwmwvkn6lcbrpjc24j5r2y0aaxnjyndwqa4hqzdqhcay9f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-nom" ,rust-nom-7))
+       #:cargo-development-inputs (("rust-fs-err" ,rust-fs-err-2))))
+    (home-page "https://github.com/mozilla/uniffi-rs/tree/main/weedle2")
+    (synopsis "WebIDL parser")
+    (description "This package provides a @code{WebIDL} parser.")
+    (license license:expat)))
+
 (define-public rust-weezl-0.1
   (package
     (name "rust-weezl")
-- 
2.41.0

[bug#69257] [PATCH 221/228] gnu: Add rust-uniffi-udl-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-udl-0.25): Add variable.

Change-Id: Ifc7822e7b07fc57c71a01c8da7c5dc7e17a40807
---
 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 856fa6307c..6186bd9b8c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79078,6 +79078,29 @@ (define-public rust-uniffi-testing-0.25
      "This package provides testing helpers for uniffi.")
     (license license:mpl2.0)))
 
+(define-public rust-uniffi-udl-0.25
+  (package
+    (name "rust-uniffi-udl")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_udl" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hx14kfd3m0vxzsvshfid0s6njpp1h3v9sak1sz8l1y615qxp7l8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-uniffi-meta" ,rust-uniffi-meta-0.25)
+                       ("rust-uniffi-testing" ,rust-uniffi-testing-0.25)
+                       ("rust-weedle2" ,rust-weedle2-4))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "UDL parsing for the uniffi project")
+    (description
+      "This package provides UDL parsing for the uniffi project.")
+    (license license:mpl2.0)))
+
 (define-public rust-unindent-0.2
   (package
     (name "rust-unindent")
-- 
2.41.0

[bug#69257] [PATCH 222/228] gnu: Add rust-uniffi-bindgen-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-bindgen-0.25): Add variable.

Change-Id: Idcd2286e3f4d8410b95f12dd1a788ff00ba24e05
---
 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 6186bd9b8c..3d4a604c2e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -78978,6 +78978,42 @@ (define-public rust-unicode-xid-0.0
         (base32
          "1p5l9h3n3i53cp95fb65p8q3vbwib79ryd9z5z5h5kr9gl6qc7wc"))))))
 
+(define-public rust-uniffi-bindgen-0.25
+  (package
+    (name "rust-uniffi-bindgen")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_bindgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0h39vsp2qpw9qxna9fdk3h0agmz35vzixbvmb2fq4lx054ljz6gx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-askama" ,rust-askama-0.12)
+                       ("rust-camino" ,rust-camino-1)
+                       ("rust-cargo-metadata" ,rust-cargo-metadata-0.15)
+                       ("rust-clap" ,rust-clap-4)
+                       ("rust-fs-err" ,rust-fs-err-2)
+                       ("rust-glob" ,rust-glob-0.3)
+                       ("rust-goblin" ,rust-goblin-0.6)
+                       ("rust-heck" ,rust-heck-0.4)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-paste" ,rust-paste-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-toml" ,rust-toml-0.5)
+                       ("rust-uniffi-meta" ,rust-uniffi-meta-0.25)
+                       ("rust-uniffi-testing" ,rust-uniffi-testing-0.25)
+                       ("rust-uniffi-udl" ,rust-uniffi-udl-0.25))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "Codegen and CLI tooling for uniffi")
+    (description
+     "This package provides code generation and CLI tooling for uniffi:
+a multi-language bindings generator for Rust.")
+    (license license:mpl2.0)))
+
 (define-public rust-uniffi-checksum-derive-0.25
   (package
     (name "rust-uniffi-checksum-derive")
-- 
2.41.0

[bug#69257] [PATCH 223/228] gnu: Add rust-uniffi-build-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-build-0.25): Add variable.

Change-Id: I3870708c9bc9ba991adb0d4655146b229eb2bc93
---
 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 3d4a604c2e..6841edcd8c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79014,6 +79014,27 @@ (define-public rust-uniffi-bindgen-0.25
 a multi-language bindings generator for Rust.")
     (license license:mpl2.0)))
 
+(define-public rust-uniffi-build-0.25
+  (package
+    (name "rust-uniffi-build")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_build" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1sbl3jipbl9jpfb5xdi7pjcnchn3z6n7bbrs9c401ml26vfn8680"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-camino" ,rust-camino-1)
+                       ("rust-uniffi-bindgen" ,rust-uniffi-bindgen-0.25))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "Build script helpers for uniffi")
+    (description "This package provides build script helpers for uniffi.")
+    (license license:mpl2.0)))
+
 (define-public rust-uniffi-checksum-derive-0.25
   (package
     (name "rust-uniffi-checksum-derive")
-- 
2.41.0

[bug#69257] [PATCH 224/228] gnu: Add rust-uniffi-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-0.25): Add variable.

Change-Id: Ie5f5ba4b01e0395ace44d2df5727dbd28c210595
---
 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 6841edcd8c..828d64255f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -78978,6 +78978,34 @@ (define-public rust-unicode-xid-0.0
         (base32
          "1p5l9h3n3i53cp95fb65p8q3vbwib79ryd9z5z5h5kr9gl6qc7wc"))))))
 
+(define-public rust-uniffi-0.25
+  (package
+    (name "rust-uniffi")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17wizn2iday1726gnngmn72437mfsi9nrmbzqi4gv4hhsdr52d11"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-camino" ,rust-camino-1)
+                       ("rust-clap" ,rust-clap-4)
+                       ("rust-uniffi-bindgen" ,rust-uniffi-bindgen-0.25)
+                       ("rust-uniffi-build" ,rust-uniffi-build-0.25)
+                       ("rust-uniffi-core" ,rust-uniffi-core-0.25)
+                       ("rust-uniffi-macros" ,rust-uniffi-macros-0.25))
+       #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "Multi-language bindings generator for Rust")
+    (description
+      "This package provides a multi-language bindings generator for
+Rust.")
+    (license license:mpl2.0)))
+
 (define-public rust-uniffi-bindgen-0.25
   (package
     (name "rust-uniffi-bindgen")
-- 
2.41.0

[bug#69257] [PATCH 225/228] gnu: Add rust-async-cell-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-async-cell-0.2): Add variable.

Change-Id: I3853fb732bd70f51cb5378b99914c06444a68c78
---
 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 828d64255f..d33cefea9e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4065,6 +4065,27 @@ (define-public rust-async-broadcast-0.5
     (description "This package provides async broadcast channels in Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-async-cell-0.2
+  (package
+    (name "rust-async-cell")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async_cell" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1g32g9ybgmnxl4kz44v6wxzbbmp98g69xw2s9lxhl4qqwnffwkl3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-parking-lot" ,rust-parking-lot-0.12))
+       #:cargo-development-inputs (("rust-loom" ,rust-loom-0.5))))
+    (home-page "https://gitlab.com/samsartor/async_cell")
+    (synopsis "Cell<Option<T>> you can await on")
+    (description
+     "This package provides a Cell<Option<T>> that you can await on.")
+    (license license:expat)))
+
 (define-public rust-async-channel-2
   (package
     (name "rust-async-channel")
-- 
2.41.0

[bug#69257] [PATCH 226/228] gnu: Add rust-async-rx-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-async-rx-0.1): Add variable.

Change-Id: I7988733ce92750a0062cd8a81437b454f24cf548
---
 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 d33cefea9e..d694a218f5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4825,6 +4825,33 @@ (define-public rust-async-recursion-1
     (description "This package provides recursion for async functions in Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-async-rx-0.1
+  (package
+    (name "rust-async-rx")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async-rx" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18k88ihl7qkjgnpaxfmpbkm8z4qb1p5acf7pi7ilf2cs6bjy83d3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2))
+       #:cargo-development-inputs
+       (("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-stream-assert" ,rust-stream-assert-0.1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1))))
+    (home-page "https://github.com/jplatte/async-rx")
+    (synopsis "Utility functions for async reactive programming")
+    (description
+      "This package provides utility functions for async reactive
+programming.")
+    (license license:mpl2.0)))
+
 (define-public rust-async-signal-0.2
   (package
     (name "rust-async-signal")
-- 
2.41.0

[bug#69257] [PATCH 227/228] gnu: Add rust-matrix-sdk-ui-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-ui-0.7): Add variable.

Change-Id: Iffbe2d64046dc96e78dd3d290dddb6d7cfdb065f
---
 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 d694a218f5..1d8a027547 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38424,6 +38424,68 @@ (define-public rust-matrix-sdk-test-macros-0.7
 the Matrix SDK.")
     (license license:asl2.0)))
 
+(define-public rust-matrix-sdk-ui-0.7
+  (package
+    (name "rust-matrix-sdk-ui")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-ui" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16wbz5qianr7awfv4x78ppva7pwwi7rvhvvsci1163gkijygkspp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-as-variant" ,rust-as-variant-1)
+        ("rust-async-once-cell" ,rust-async-once-cell-0.5)
+        ("rust-async-rx" ,rust-async-rx-0.1)
+        ("rust-async-stream" ,rust-async-stream-0.3)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-async-cell" ,rust-async-cell-0.2)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-eyeball" ,rust-eyeball-0.8)
+        ("rust-eyeball-im" ,rust-eyeball-im-0.4)
+        ("rust-eyeball-im-util" ,rust-eyeball-im-util-0.5)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3)
+        ("rust-imbl" ,rust-imbl-2)
+        ("rust-indexmap" ,rust-indexmap-2)
+        ("rust-itertools" ,rust-itertools-0.12)
+        ("rust-matrix-sdk" ,rust-matrix-sdk-0.7)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-mime" ,rust-mime-0.3)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)
+        ("rust-uniffi" ,rust-uniffi-0.25)
+        ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-assert-json-diff" ,rust-assert-json-diff-2)
+        ("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-eyeball-im-util" ,rust-eyeball-im-util-0.5)
+        ("rust-matrix-sdk" ,rust-matrix-sdk-0.7)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-stream-assert" ,rust-stream-assert-0.1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-wiremock" ,rust-wiremock-0.5))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "GUI-centric utilities on top of matrix-rust-sdk.")
+    (description
+     "This package provides experimental GUI-centric utilities on top of
+matrix-rust-sdk.")
+    (license license:asl2.0)))
+
 (define-public rust-matrixcompare-core-0.1
   (package
     (name "rust-matrixcompare-core")
-- 
2.41.0

[bug#69257] [PATCH 228/228] WIP: gnu: Add fractal.

[Herman Rimm via Guix-patches via]

* gnu/packages/rust-apps.scm (fractal): Add variable.

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

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 01e01ecba3..ce23d185c4 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -65,6 +65,7 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages crates-crypto)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-graphics)
+  #:use-module (gnu packages crates-gtk)
   #:use-module (gnu packages crates-tls)
   #:use-module (gnu packages crates-vcs)
   #:use-module (gnu packages crates-web)
@@ -649,6 +650,70 @@ (define-public fd
 defaults for 80% of the use cases.")
      (license (list license:expat license:asl2.0))))
 
+(define-public fractal
+  (package
+    (name "fractal")
+    (version "6.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/World/fractal")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "11n32kkfwlv38mj9018hp5rbg4w3d1vq9f6x8rhqahs19mm5amqa"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (;("rust-ashpd" ,rust-ashpd-0.6)
+                       ;("rust-djb-hash" ,rust-djb-hash-0.1)
+                       ("rust-eyeball-im" ,rust-eyeball-im-0.4)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ;("rust-geo-uri" ,rust-geo-uri-0.2)
+                       ;("rust-gstreamer" ,rust-gstreamer-0.21)
+                       ;("rust-gstreamer-base" ,rust-gstreamer-base-0.21)
+                       ;("rust-gstreamer-pbutils" ,rust-gstreamer-pbutils-0.21)
+                       ;("rust-gstreamer-play" ,rust-gstreamer-play-0.21)
+                       ;("rust-gstreamer-video" ,rust-gstreamer-video-0.21)
+                       ("rust-gtk" ,rust-gtk4-0.7)
+                       ("rust-html-escape" ,rust-html-escape-0.2)
+                       ;("rust-html2pango" ,rust-html2pango-0.6)
+                       ;("rust-html5gum" ,rust-html5gum-0.5)
+                       ("rust-image" ,rust-image-0.24)
+                       ;("rust-indexmap" ,rust-indexmap-2)
+                       ;("rust-libadwaita" ,rust-libadwaita-0.5)
+                       ;("rust-libshumate" ,rust-libshumate-0.4)
+                       ("rust-matrix-sdk" ,rust-matrix-sdk-0.7)
+                       ("rust-matrix-sdk-ui" ,rust-matrix-sdk-ui-0.7)
+                       ("rust-mime" ,rust-mime-0.3)
+                       ("rust-mime-guess" ,rust-mime-guess-2)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ;("rust-oo7" ,rust-oo7-0.2)
+                       ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9)
+                       ;("rust-qrcode" ,rust-qrcode-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-rmp-serde" ,rust-rmp-serde-1)
+                       ;("rust-rqrr" ,rust-rqrr-0.6)
+                       ("rust-ruma" ,rust-ruma-0.9)
+                       ;("rust-secular" ,rust-secular-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ;("rust-sourceview5" ,rust-sourceview5-0.7)
+                       ("rust-strum" ,rust-strum-0.25)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+                       ("rust-url" ,rust-url-2))))
+    (home-page "https://gitlab.gnome.org/World/fractal")
+    (synopsis "Matrix messaging app for GNOME written in Rust")
+    (description "Fractal is a Matrix messaging app for GNOME written in
+Rust. Its interface is optimized for collaboration in large groups, such
+as free software projects, and will fit all screens, big or small.")
+    (license license:gpl3+)))
+
 (define-public hexyl
   (package
     (name "hexyl")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 000/117] Fix dependencies.

[Herman Rimm via Guix-patches via]

Hello,

I managed to build all the dependency packages I submitted in the
previous patch series revision. This patch series uses the patch series
in [bug#70606] as its base, that is where all the alphabetical sorting
is done now. In that series I had accidentally removed a package
definition, which the first patch of this series adds back.

Cheers,
Herman

Herman Rimm (117):
  fixup! gnu: Place rust-snapbox-macros-0.3 in alphabetical order.
  gnu: Add rust-aquamarine-0.5.
  gnu: Add rust-pnet-sys-0.34.
  gnu: Add rust-opentelemetry-sdk-0.21.
  gnu: Add rust-opentelemetry-semantic-conventions-0.13.
  gnu: Add rust-prost-types-0.11.
  gnu: Add rust-tonic-0.9.
  gnu: rust-aead-0.5: Upgrade to 0.5.2.
  gnu: Add rust-opentelemetry-jaeger-0.20.
  gnu: Add rust-prost-build-0.11.
  gnu: Add rust-grpcio-compiler-0.12.
  gnu: Add rust-grpcio-sys-0.12.
  gnu: Add rust-grpcio-0.12.
  gnu: Add rust-tonic-build-0.9.
  gnu: Add rust-opentelemetry-proto-0.4.
  gnu: Add rust-opentelemetry-otlp-0.14.
  gnu: Add rust-opentelemetry-stdout-0.2.
  gnu: Add rust-tracing-opentelemetry-0.22.
  gnu: Add rust-mas-tower-0.7.
  gnu: rust-bytes-1: Upgrade to 1.6.0.
  gnu: Add rust-mas-http-0.7.
  gnu: Add rust-mas-keystore-0.7.
  gnu: Add rust-ordered-multimap-0.4.
  gnu: Add rust-mas-oidc-client-0.7.
  gnu: Add rust-matrix-sdk-test-macros-0.7.
  gnu: Add rust-konst-proc-macros-0.3.
  gnu: Add rust-konst-kernel-0.3.
  gnu: Add rust-konst-0.3.
  gnu: Add rust-js-int-0.2.
  gnu: Add rust-ruma-identifiers-validation-0.9.
  gnu: Add rust-ruma-macros-0.12.
  gnu: Add rust-assign-1.
  gnu: Add rust-ruma-common-0.12.
  gnu: Add rust-js-option-0.1.
  gnu: Add rust-ruma-html-0.1.
  gnu: Add rust-ruma-events-0.27.
  gnu: Add rust-ruma-appservice-api-0.9.
  gnu: Add rust-ruma-federation-api-0.8.
  gnu: Add rust-ruma-identity-service-api-0.8.
  gnu: Add rust-ruma-push-gateway-api-0.8.
  gnu: Add rust-yap-0.12.
  gnu: Add rust-yap-0.11.
  gnu: Add rust-ruma-server-util-0.2.
  gnu: Add rust-curve25519-dalek-derive-0.1.
  gnu: Add rust-macro-attr-0.2.
  gnu: Add rust-subslice-0.2.
  gnu: Add rust-ruma-signatures-0.14.
  gnu: Add rust-ruma-client-api-0.17.
  gnu: Add rust-ruma-client-0.12.
  gnu: Add rust-ruma-state-res-0.10.
  gnu: Add rust-ruma-0.9.
  gnu: Add rust-matrix-sdk-test-0.7.
  gnu: Add rust-matrix-sdk-common-0.7.
  gnu: Add rust-matrix-pickle-derive-0.1.
  gnu: Add rust-matrix-pickle-0.1.
  gnu: Add rust-olm-sys-1.
  gnu: Add rust-olm-rs-2.
  gnu: Add rust-vodozemac-0.5.
  gnu: rust-serde-bytes-0.11: Upgrade to 0.11.14.
  gnu: Add rust-qrcode-0.13.
  gnu: Add rust-matrix-sdk-qrcode-0.7.
  gnu: Add rust-bitstring-0.1.
  gnu: Add rust-cidr-0.2.
  gnu: rust-postgres-derive-0.4: Upgrade to 0.4.5.
  gnu: rust-postgres-protocol-0.6: Upgrade to 0.6.6.
  gnu: rust-postgres-types-0.2: Upgrade to 0.2.6.
  gnu: Add rust-ulid-1.
  gnu: Add rust-matrix-sdk-crypto-0.7.
  gnu: Add rust-matrix-sdk-store-encryption-0.7.
  gnu: Add rust-matrix-sdk-base-0.7.
  gnu: Add rust-macroific-attr-parse-1.
  gnu: Add rust-macroific-core-1.
  gnu: Add rust-macroific-macro-1.
  gnu: Add rust-macroific-1.
  gnu: Add rust-accessory-1.
  gnu: Add rust-delegate-display-2.
  gnu: Add rust-fancy-constructor-1.
  gnu: Add rust-indexed-db-futures-0.4.
  gnu: Add rust-serde-wasm-bindgen-0.6.
  gnu: Add rust-gloo-utils-0.2.
  gnu: Add rust-matrix-sdk-indexeddb-0.7.
  gnu: rust-sqlite3-parser-0.12: Remove duplicate dependency.
  gnu: Add rust-deadpool-0.10.
  gnu: Add rust-deadpool-sqlite-0.7.
  gnu: Add rust-matrix-sdk-sqlite-0.7.
  gnu: Add rust-mime2ext-0.1.
  gnu: Add rust-matrix-sdk-0.7.
  gnu: Add rust-oneshot-uniffi-0.1.
  gnu: Add rust-uniffi-core-0.25.
  gnu: Add rust-uniffi-checksum-derive-0.25.
  gnu: Add rust-uniffi-meta-0.25.
  gnu: Add rust-uniffi-testing-0.25.
  gnu: Add rust-weedle2-4.
  gnu: Add rust-uniffi-udl-0.25.
  gnu: Add rust-uniffi-bindgen-0.25.
  gnu: Add rust-uniffi-build-0.25.
  gnu: Add rust-uniffi-macros-0.25.
  gnu: Add rust-uniffi-0.25.
  gnu: Add rust-async-cell-0.2.
  gnu: Add rust-async-rx-0.1.
  gnu: Add rust-matrix-sdk-ui-0.7.
  WIP: gnu: Add rust-sourceview5-0.7.
  WIP: gnu: Add rust-async-fs-2.
  WIP: gnu: Add rust-gdk4-wayland-0.7.
  WIP: gnu: Add rust-gdk4-x11-0.7.
  WIP: gnu: Add rust-pipewire-0.7.
  WIP: gnu: Add rust-ashpd-0.6.
  WIP: gnu: Add rust-djb-hash-0.1.
  WIP: gnu: Add rust-geo-uri-0.2.
  WIP: gnu: Add rust-html2pango-0.6.
  WIP: gnu: Add rust-html5gum-0.5.
  WIP: gnu: Add rust-libshumate-0.4.
  WIP: gnu: Add rust-oo7-0.2.
  WIP: gnu: Add rust-qrcode-0.12.
  WIP: gnu: Add rust-rqrr-0.6.
  WIP: gnu: Add rust-secular-1.
  WIP: gnu: Add fractal.

 gnu/packages/crates-crypto.scm |  129 +-
 gnu/packages/crates-gtk.scm    |  112 ++
 gnu/packages/crates-io.scm     | 3020 +++++++++++++++++++++++++++++++-
 gnu/packages/crates-web.scm    |  280 ++-
 gnu/packages/rust-apps.scm     |   65 +
 5 files changed, 3526 insertions(+), 80 deletions(-)


base-commit: 2c90e7aa2f078da27d517b2b77b61810f4513809
prerequisite-patch-id: cd71b7377bd70db92d29473f032b619956874a92
prerequisite-patch-id: d009cb761bd9afb01edad7446256b4be4d38d4d6
prerequisite-patch-id: 8dfb9608a341d531d5980d338841b2b16cb17ed6
prerequisite-patch-id: fca6a67797441ffde49725c5adc1cab210fe76df
prerequisite-patch-id: ee2886f77f4286987e260b9c8062faba94a28dd5
prerequisite-patch-id: 76f775d8722ba3d580791375513a6a80648772f3
prerequisite-patch-id: 4a9f556a809ff30908fa6ea8666538429274793f
prerequisite-patch-id: 8aa6409ae3d342d8899be0d3c5fcacc599ce31b2
prerequisite-patch-id: 6fb37200241c8ad689ab7f2ff92eb6d40a8f1025
prerequisite-patch-id: a4dab76261ba18ab0cef2b2d98e5356398608955
prerequisite-patch-id: 460b099a1223fb1e6074632ddd61dffe5b9023da
prerequisite-patch-id: 095939d0a8a4812dc2e7e3ef63c52699cccf3cd8
prerequisite-patch-id: 9f10b04ca72f29f142b63f6d612179e65ffd2c88
prerequisite-patch-id: 6a0c24348779ff232cce2ee6e5ccf28b3621dfbe
prerequisite-patch-id: fe1f20396641e4967d16b1d0835c72f52770e8fc
prerequisite-patch-id: 4f59345c48236c7bb801976c538ca5437bae1aa3
prerequisite-patch-id: 4fea48abffc31386616e6d5f2cb5a158479e2ec0
prerequisite-patch-id: 11354bd1fdc76640783112e8c369f7186b8d30ac
prerequisite-patch-id: fcb4e290b4f3822c4895964a4011352d8be813c3
prerequisite-patch-id: 34a3928dac5edc64edf52e04ac88fcab7c6c6db3
prerequisite-patch-id: d5e88d0957d1cd6a9307678b176121f8e76d34e2
prerequisite-patch-id: da258e798de3b6cecd7594d5c229733b82102668
prerequisite-patch-id: 6f0b549249771f2ce793c68405cab15973fb7b42
prerequisite-patch-id: f73d4e83bd170c7f81438598751c3a77e7403063
prerequisite-patch-id: 739c2f6b54912138d193d0399aa33df2b5e631ca
prerequisite-patch-id: 631cf49d3bf1aa23775af492628319c550f516ed
prerequisite-patch-id: 3dc3a33d02075b265a8ae051dafe5412e999b3f0
prerequisite-patch-id: a37fa1afd02cda158b8c0cf5fa70bd49b3e6a483
prerequisite-patch-id: cbfeff1ebbb19a8ecd16588c3b811f74b8c3069e
prerequisite-patch-id: 7514bcd7b4f56a2de7f4f1b9c8c57deb5a6feb7f
prerequisite-patch-id: 794a60284f05f00b8eb0c9107e3ec1aea7756a13
prerequisite-patch-id: a5a06c9b5bbe7b509369de7400dfd470220f41d1
prerequisite-patch-id: 835059407a0849871438defab5953fafb4358ee6
prerequisite-patch-id: b18a90512bd18c47bf89231186e95a6a4f9e361f
prerequisite-patch-id: 1d2a4a79d15f9c8a10391ae1952f846beefa3b3a
prerequisite-patch-id: 1ff9aacdb2d01b2c7ae25f5732792efef5374a3d
prerequisite-patch-id: 26e93d3982908e7bc073799e02bc5eed13452c1c
prerequisite-patch-id: 848291a22398afb9ead5a93bd317f67cc34cd9cb
prerequisite-patch-id: 8e43fa9ba2da77f3626df067cef4f6a96238c16b
prerequisite-patch-id: 0403ecd8e935dfc55f506480cfe8b12027198bcb
prerequisite-patch-id: 4bedb2d7052eba220071dda2a6c9b79f52ff1365
prerequisite-patch-id: e9a64f7b613fb6417da0e757017d80566d5a0bdd
prerequisite-patch-id: 81dbb47ac8b9c12f6e0f82e359698915d14f13f6
prerequisite-patch-id: 06fe2d0d7d6a7bbe47eb633c5b13cb97f8d32b34
prerequisite-patch-id: 78d962eb0d6ac5d53b0cc2dabc830f66e211dbc1
prerequisite-patch-id: 661d7c4631e790b3db2fc2b7a7d59d2dccc5b2fe
prerequisite-patch-id: 35b43c527b1a8294da3d144b53e3a9921fba2725
prerequisite-patch-id: b5020990a3a638d923b86be31fb42db7426e92dc
prerequisite-patch-id: c76c3e06ea5a19d44fd05a54a8d06a0cc27ab3a0
prerequisite-patch-id: 9491ad4f3d5efab12d8b23285ad04dab809ca636
prerequisite-patch-id: 38c20dfa8e98adbf8fc1a7179c5671773d97d6ad
prerequisite-patch-id: aa4f0c870ddbd6f053447c30e17f3bb48afe5c56
prerequisite-patch-id: a475f5914cf5091af4073583880c9b74105bfe9a
prerequisite-patch-id: d13f40544b5cd662eb3f82a29075549ee482d257
prerequisite-patch-id: 0d72cd5db9cf402adf486e4d5d50ab3d20092f6f
prerequisite-patch-id: 7de5ac497f662c1f95d294d0d43d0bfdd99674a4
prerequisite-patch-id: 53b1409d9195029ee18bbfebdabb875669af9af0
prerequisite-patch-id: 15afd0bc9a83a174b74a4a7fb4753694769fc12d
prerequisite-patch-id: 16c8b7888fcb7632b08d852283721243edf93c8d
prerequisite-patch-id: 5bc6d8177da10b12c06886a0c81fb3b1dd33578b
prerequisite-patch-id: e3200f75ff3a8860c345415ae5f5e9fbed0267c8
prerequisite-patch-id: 797d7cdf1c89fa1136cba882d593f6396dd447f6
prerequisite-patch-id: 9b67785bfc19464a17b49a6f68e1cdf42b5c4537
prerequisite-patch-id: 707ed40206af216a17eba8677b392795ef867601
prerequisite-patch-id: e24edfb9e8f3e1f800e407e06db013ec659a1057
prerequisite-patch-id: 9c8529bc7a3a69d6458f52de51fc170468711ffb
prerequisite-patch-id: a4b13f2ffb78a11f68022f96943266fc3f03674e
prerequisite-patch-id: b36ca86618725fb7de54909722bded1ac83c7a1a
prerequisite-patch-id: 43bfa5ede7d07097deb14fd7307c94cb55841ec4
prerequisite-patch-id: c1b7ecb3b49e3a6ca1dd6caa96d733bff2b5c40a
prerequisite-patch-id: ab8a1b186a80e47ad4221af15457c4def5403698
prerequisite-patch-id: b82e5bb771cb6eaa5f3a18699a5ec20439e20e5d
prerequisite-patch-id: d3ad744fdf32139b1ca5ded2b58092ec64393709
prerequisite-patch-id: 028ff2480c018154fd123e6dc8785cb15b36a63a
prerequisite-patch-id: e09cef3ae3a3a2b5f0829c90dd2e9ef5a326ee3c
prerequisite-patch-id: 2158ae57a62465d9081ef87a3c02e226e0a33dff
prerequisite-patch-id: 5d2d52dcc645ba21f24ef3e109a33b822f53c6fc
prerequisite-patch-id: 5190fe7ff9bbfaceb71e304f478d8ec74a21ce53
prerequisite-patch-id: 47715f4e0dc2c8b313d0cb71a8e298a45de7fae4
prerequisite-patch-id: 23ada03e9575fac1251a6554ca0c29d3cb5f97e9
prerequisite-patch-id: 10ac7049eda06335f4128aa7e561e9d7299c21ab
prerequisite-patch-id: 8a98e886391f7bb8eb8a316d283187ca8a0285b7
prerequisite-patch-id: b796fc09e90754b9c716d7f9a788f664895682a0
prerequisite-patch-id: fc6d2121cf4adef41f27fb13e79a53c6b123f52c
prerequisite-patch-id: 0841f9f7e2b7c245cb55284a0bf73d31c5fcb8ec
prerequisite-patch-id: fdf778a1d72801627d8f5a460869199f2ce79c6e
prerequisite-patch-id: 843a882b7a9c80f5b338e444fd7f1b862c260368
prerequisite-patch-id: fa972ec23b3b6a01df259c5d2b2f097921ccf1d0
prerequisite-patch-id: ab234f56a9e7bb7b7b222a4a95af350e365f38a9
prerequisite-patch-id: 441329738bb48bd01ace73117a8d4a093c809440
prerequisite-patch-id: ed44a95e5989c45f332151d817a06fb0805351a7
prerequisite-patch-id: deb663e6a647838374941ae8f48c57a4b6a32bba
prerequisite-patch-id: 3383e3a08c293f40b50fcc010cd8e8bda1b989e0
prerequisite-patch-id: 57e9fa33771513041c3a6299b23ac05687b746f4
prerequisite-patch-id: 5f018d2ae955375941cbee4f14de51c58743413c
prerequisite-patch-id: c2b6aabb267b9856b84025c14423a5c614543007
prerequisite-patch-id: 0bf3a396ff4e39a5506c8a53a616b49405d453ac
prerequisite-patch-id: 59827f09b6bef901e4d6f09e7f9696ef88bc8e07
prerequisite-patch-id: 525362f46ab77730756e1a2937d69caaae5363c6
prerequisite-patch-id: 05ef6414c423c2ac2a1ea6e42e12aa202aa9111f
prerequisite-patch-id: 428bb8195d76aa712c8fa1adbac9c5d2535eaf47
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 001/117] fixup! gnu: Place rust-snapbox-macros-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7ea09ffcb7..ebe7704072 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71826,6 +71826,19 @@ (define-public rust-snapbox-macros-0.3
 It is also flexible enough to build your own test harness like @code{trycmd}.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-snapbox-macros-0.2
+  (package
+    (inherit rust-snapbox-macros-0.3)
+    (name "rust-snapbox-macros")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "snapbox-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0c79lnjcs9yp62y665swv5y5y6088qc256bfr3s7xcnb0izfl7f0"))))))
+
 (define-public rust-snappy-cpp-0.1
   (package
     (name "rust-snappy-cpp")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 002/117] gnu: Add rust-aquamarine-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-aquamarine-0.5): Add variable.
---
 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 ebe7704072..0322c5b93d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2374,6 +2374,34 @@ (define-public rust-approx-0.1
          "153awzwywmb61xg857b80l63b1x6hifx2pha7lxf6fck9qxwraq8"))))
     (arguments '())))
 
+(define-public rust-aquamarine-0.5
+  (package
+    (name "rust-aquamarine")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "aquamarine" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0kizryj8h9zgwrb0q5q5f1c6bg56gnbg19wan5g06icj6141bk11"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-include-dir" ,rust-include-dir-0.7)
+                       ("rust-itertools" ,rust-itertools-0.10)
+                       ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+                       ("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))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://github.com/mersinvald/aquamarine")
+    (synopsis "Mermaid.js integration for rustdoc")
+    (description "This package provides a mermaid.js integration for
+rustdoc.")
+    (license license:expat)))
+
 (define-public rust-arbitrary-1
   (package
     (name "rust-arbitrary")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 003/117] gnu: Add rust-pnet-sys-0.34.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pnet-sys-0.34): Add variable.
(rust-pnet-sys-0.27): Inherit rust-pnet-sys-0.34.

Change-Id: I00cfe081f4414616c7524af5093ebd639c8cd37f
---
 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 0322c5b93d..863fcbf594 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53748,6 +53748,28 @@ (define-public rust-pnet-sys-0.34
      "This crate providess access to network related system function and calls.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pnet-sys-0.34
+  (package
+    (name "rust-pnet-sys")
+    (version "0.34.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pnet_sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "004d28vbaxv3m55cd741mpjm34031c3p2dpp8kazcwxms7n0nz21"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; Tries to use sockets.
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/libpnet/libpnet")
+    (synopsis "Access to network related system functions")
+    (description
+     "This crate providess access to network related system function and calls.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-pnet-sys-0.27
   (package
     (inherit rust-pnet-sys-0.34)
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 004/117] gnu: Add rust-opentelemetry-sdk-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-opentelemetry-sdk-0.21): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 863fcbf594..ac8ec15e66 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48952,6 +48952,50 @@ (define-public rust-opentelemetry-0.21
 framework.")
     (license license:asl2.0)))
 
+(define-public rust-opentelemetry-sdk-0.21
+  (package
+    (name "rust-opentelemetry-sdk")
+    (version "0.21.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry_sdk" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1r7gw2j2n800rd0vdnga32yhlfmc3c4y0sadcr97licam74aw5ig"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
+        ("rust-futures-channel" ,rust-futures-channel-0.3)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-glob" ,rust-glob-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-http" ,rust-opentelemetry-http-0.10)
+        ("rust-ordered-float" ,rust-ordered-float-4)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+        ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5)
+                                   ("rust-indexmap" ,rust-indexmap-2)
+                                   ("rust-pprof" ,rust-pprof-0.13))))
+    (home-page "https://github.com/open-telemetry/opentelemetry-rust")
+    (synopsis "SDK for the OpenTelemetry framework")
+    (description
+     "This package provides the SDK for the @code{OpenTelemetry} metrics
+collection and distributed tracing framework.")
+    (license license:asl2.0)))
+
 (define-public rust-opml-1
   (package
     (name "rust-opml")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 005/117] gnu: Add rust-opentelemetry-semantic-conventions-0.13.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm
(rust-opentelemetry-semantic-conventions-0.13): Add variable.

Change-Id: I836880e1cd72b5ba1f5919144daf30f9a56e4b1b
---
 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 ac8ec15e66..86bd4a3f38 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48996,6 +48996,36 @@ (define-public rust-opentelemetry-sdk-0.21
 collection and distributed tracing framework.")
     (license license:asl2.0)))
 
+(define-public rust-opentelemetry-semantic-conventions-0.13
+  (package
+    (name "rust-opentelemetry-semantic-conventions")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry-semantic-conventions" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "115wbgk840dklyhpg3lwp4x1m643qd7f0vkz8hmfz0pry4g4yxzm"))
+       (modules '((guix build utils)))
+       (snippet '(substitute* "Cargo.toml"
+                   (("\\[dev-dependencies\\]" all)
+                    (string-append
+                      all "\nopentelemetry_sdk = { features = "
+                      "[\"trace\"], version = \"0.21\" }"))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-opentelemetry" ,rust-opentelemetry-0.21))
+       #:cargo-development-inputs
+       (("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21))))
+    (home-page (string-append
+                 "https://github.com/open-telemetry/opentelemetry-"
+                 "rust/tree/main/opentelemetry-semantic-conventions"))
+    (synopsis "Semantic conventions for OpenTelemetry")
+    (description "This package provides semantic conventions for
+@code{OpenTelemetry}.")
+    (license license:asl2.0)))
+
 (define-public rust-opml-1
   (package
     (name "rust-opml")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 006/117] gnu: Add rust-prost-types-0.11.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 86bd4a3f38..0904363ffb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57192,6 +57192,22 @@ (define-public rust-prost-types-0.12
 Protobuf reference for more information about well known types.")
     (license license:asl2.0)))
 
+(define-public rust-prost-types-0.11
+  (package
+    (inherit rust-prost-types-0.12)
+    (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"))))
+    (arguments
+     `(#:cargo-inputs (("rust-prost" ,rust-prost-0.11))
+       #:cargo-development-inputs (("rust-proptest" ,rust-proptest-1))))))
+
 (define-public rust-prost-types-0.10
   (package
     (inherit rust-prost-types-0.12)
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 007/117] gnu: Add rust-tonic-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-tonic-0.9): Add variable.

Change-Id: I43391a9e3a9dbbd833756a18a34012704563ed98
---
 gnu/packages/crates-web.scm | 109 ++++++++++++++++++++++++++----------
 1 file changed, 80 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index eab91e7139..7107dc7e11 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -5350,6 +5350,56 @@ (define-public rust-tonic-0.10
 on high performance, interoperability, and flexibility.")
     (license license:expat)))
 
+(define-public rust-tonic-0.9
+  (package
+    (inherit rust-tonic-0.10)
+    (name "rust-tonic")
+    (version "0.9.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tonic" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nlx35lvah5hdcp6lg1d6dlprq0zz8ijj6f727szfcv479m6d0ih"))))
+    (arguments
+     `(#:cargo-test-flags '("--release" "--lib" "--bins" "--tests")
+       #:cargo-inputs
+       (("rust-async-stream" ,rust-async-stream-0.3)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-axum" ,rust-axum-0.6)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-h2" ,rust-h2-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-http-body" ,rust-http-body-0.4)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-hyper-timeout" ,rust-hyper-timeout-0.4)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-pin-project" ,rust-pin-project-1)
+        ("rust-prost" ,rust-prost-0.11)
+        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
+        ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.24)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+        ("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-webpki-roots" ,rust-webpki-roots-0.23))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher-0.1)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-quickcheck-macros" ,rust-quickcheck-macros-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tower" ,rust-tower-0.4))))))
+
 (define-public rust-tonic-0.8
   (package
     (inherit rust-tonic-0.10)
@@ -5364,35 +5414,36 @@ (define-public rust-tonic-0.8
         (base32 "1yymp2xi1p60g81p5jfaybcawpfkb01vqvzqn4cyz6wj7fnry8cg"))))
     (arguments
      `(#:cargo-test-flags '("--release" "--lib" "--bins" "--tests")
-       #:cargo-inputs (("rust-async-stream" ,rust-async-stream-0.3)
-                       ("rust-async-trait" ,rust-async-trait-0.1)
-                       ("rust-axum" ,rust-axum-0.6)
-                       ("rust-base64" ,rust-base64-0.13)
-                       ("rust-bytes" ,rust-bytes-1)
-                       ("rust-flate2" ,rust-flate2-1)
-                       ("rust-futures-core" ,rust-futures-core-0.3)
-                       ("rust-futures-util" ,rust-futures-util-0.3)
-                       ("rust-h2" ,rust-h2-0.3)
-                       ("rust-http" ,rust-http-0.2)
-                       ("rust-http-body" ,rust-http-body-0.4)
-                       ("rust-hyper" ,rust-hyper-0.14)
-                       ("rust-hyper-timeout" ,rust-hyper-timeout-0.4)
-                       ("rust-percent-encoding" ,rust-percent-encoding-2)
-                       ("rust-pin-project" ,rust-pin-project-1)
-                       ("rust-prost" ,rust-prost-0.11)
-                       ("rust-prost-derive" ,rust-prost-derive-0.11)
-                       ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
-                       ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
-                       ("rust-tokio" ,rust-tokio-1)
-                       ("rust-tokio-rustls" ,rust-tokio-rustls-0.23)
-                       ("rust-tokio-stream" ,rust-tokio-stream-0.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-tracing-futures" ,rust-tracing-futures-0.2)
-                       ("rust-webpki-roots" ,rust-webpki-roots-0.22))
+       #:cargo-inputs
+       (("rust-async-stream" ,rust-async-stream-0.3)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-axum" ,rust-axum-0.6)
+        ("rust-base64" ,rust-base64-0.13)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-h2" ,rust-h2-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-http-body" ,rust-http-body-0.4)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-hyper-timeout" ,rust-hyper-timeout-0.4)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-pin-project" ,rust-pin-project-1)
+        ("rust-prost" ,rust-prost-0.11)
+        ("rust-prost-derive" ,rust-prost-derive-0.11)
+        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
+        ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.23)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.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-tracing-futures" ,rust-tracing-futures-0.2)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.22))
        #:cargo-development-inputs
        (("rust-bencher" ,rust-bencher-0.1)
         ("rust-quickcheck" ,rust-quickcheck-1)
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 008/117] gnu: rust-aead-0.5: Upgrade to 0.5.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-aead-0.5): Update to 0.5.2.
[cargo-inputs]: Add rust-arrayvec-0.7.

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 2073f8fb9d..1fbcf949a6 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -66,18 +66,19 @@ (define-module (gnu packages crates-crypto)
 (define-public rust-aead-0.5
   (package
     (name "rust-aead")
-    (version "0.5.1")
+    (version "0.5.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "aead" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1j6pmc8pk4ha64bj9l6xzbhd85s2y1dblna2zsq83h0zy6w2w6aw"))))
+        (base32 "1c32aviraqag7926xcb9sybdm36v5vh9gnxpn4pxdwjc50zl28ni"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-blobby" ,rust-blobby-0.3)
+       (("rust-arrayvec" ,rust-arrayvec-0.7)
+        ("rust-blobby" ,rust-blobby-0.3)
         ("rust-bytes" ,rust-bytes-1)
         ("rust-crypto-common" ,rust-crypto-common-0.1)
         ("rust-generic-array" ,rust-generic-array-0.14)
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 009/117] gnu: Add rust-opentelemetry-jaeger-0.20.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-opentelemetry-jaeger-0.20): Add variable.

Change-Id: I4c793b9b993a15d0d31ad2cb485bf79ce32789d1
---
 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 0904363ffb..98e1931205 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48952,6 +48952,62 @@ (define-public rust-opentelemetry-0.21
 framework.")
     (license license:asl2.0)))
 
+(define-public rust-opentelemetry-jaeger-0.20
+  (package
+    (name "rust-opentelemetry-jaeger")
+    (version "0.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry-jaeger" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18gq28byn3x1lfqmji2x29dhk4vkr3yk4sfnpc6hxr48smpwc5z6"))))
+    (build-system cargo-build-system)
+    (arguments
+      ;; error[E0433]: failed to resolve:
+      ;; could not find `testing` in `opentelemetry`
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-headers" ,rust-headers-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-hyper-tls" ,rust-hyper-tls-0.5)
+        ("rust-isahc" ,rust-isahc-1)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-http" ,rust-opentelemetry-http-0.10)
+        ("rust-opentelemetry-semantic-conventions"
+         ,rust-opentelemetry-semantic-conventions-0.13)
+        ("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-prost" ,rust-prost-0.11)
+        ("rust-prost-types" ,rust-prost-types-0.11)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-surf" ,rust-surf-2)
+        ("rust-thrift" ,rust-thrift-0.17)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tonic" ,rust-tonic-0.9)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
+        ("rust-web-sys" ,rust-web-sys-0.3))
+       #:cargo-development-inputs
+       (("rust-bytes" ,rust-bytes-1)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-tokio" ,rust-tokio-1))))
+    (home-page (string-append "https://github.com/open-telemetry/opentele"
+                              "metry-rust/tree/main/opentelemetry-jaeger"))
+    (synopsis "Jaeger exporter for OpenTelemetry")
+    (description "This package provides a Jaeger exporter for
+@code{OpenTelemetry}.")
+    (license license:asl2.0)))
+
 (define-public rust-opentelemetry-sdk-0.21
   (package
     (name "rust-opentelemetry-sdk")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 010/117] gnu: Add rust-prost-build-0.11.

[Herman Rimm via Guix-patches via]

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

Change-Id: I797b4ce58b870497f268a3555c9c404710b54d86
---
 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 98e1931205..a62742adbf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57111,6 +57111,48 @@ (define-public rust-prost-build-0.12
 files as part of a Cargo build.")
     (license license:asl2.0)))
 
+(define-public rust-prost-build-0.11
+  (package
+    (inherit rust-prost-build-0.12)
+    (name "rust-prost-build")
+    (version "0.11.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "prost-build" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0w5jx97q96ydhkg67wx3lb11kfy8195c56g0476glzws5iak758i"))
+       (modules '((guix build utils)))
+       (snippet '(substitute* "src/lib.rs"
+                   ;; Fix doctests
+                   (("fn fds\\(\\) -> " all)
+                    (string-append all "prost_types::"))
+                   (("(compile_fds.+)\\?;" stmt expr)
+                    expr)))))
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            "--skip=tests::test_generate_message_attributes")
+       #:cargo-inputs
+       (("rust-bytes" ,rust-bytes-1)
+        ("rust-heck" ,rust-heck-0.4)
+        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-multimap" ,rust-multimap-0.8)
+        ("rust-petgraph" ,rust-petgraph-0.6)
+        ("rust-prettyplease" ,rust-prettyplease-0.1)
+        ("rust-prost" ,rust-prost-0.11)
+        ("rust-prost-types" ,rust-prost-types-0.11)
+        ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9)
+        ("rust-pulldown-cmark-to-cmark" ,rust-pulldown-cmark-to-cmark-10)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-syn" ,rust-syn-1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-which" ,rust-which-4))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.8))))))
+
 (define-public rust-prost-build-0.10
   (package
     (inherit rust-prost-build-0.12)
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 011/117] gnu: Add rust-grpcio-compiler-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-grpcio-compiler-0.12): Add variable.

Change-Id: Id485ae69a2ff3d93442f4bd51d269e9fda18f5b4
---
 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 a62742adbf..a2ffce5820 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30678,6 +30678,31 @@ (define-public rust-groupable-0.2
      "This package aggregates groups of values from key-value iterators.")
     (license license:expat)))
 
+(define-public rust-grpcio-compiler-0.12
+  (package
+    (name "rust-grpcio-compiler")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "grpcio-compiler" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1rck9047121w1fd6lgg344frn0dv32mh5y7hc0ca15rm8w9hcgfs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5)
+                       ("rust-prost" ,rust-prost-0.11)
+                       ("rust-prost-build" ,rust-prost-build-0.11)
+                       ("rust-prost-types" ,rust-prost-types-0.11)
+                       ("rust-protobuf" ,rust-protobuf-2)
+                       ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/tikv/grpc-rs")
+    (synopsis "gRPC compiler for grpcio")
+    (description
+      "This package provides a @code{gRPC} compiler for grpcio.")
+    (license license:asl2.0)))
+
 (define-public rust-gumdrop-0.8
   (package
     (name "rust-gumdrop")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 012/117] gnu: Add rust-grpcio-sys-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-grpcio-sys-0.12): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a2ffce5820..faea57c6f7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70,6 +70,7 @@ (define-module (gnu packages crates-io)
   #:use-module (gnu packages)
   #:use-module (gnu packages acl)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages avahi)
@@ -110,6 +111,8 @@ (define-module (gnu packages crates-io)
   #:use-module (gnu packages protobuf)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages regex)
+  #:use-module (gnu packages rpc)
   #:use-module (gnu packages rust)
   #:use-module (gnu packages rust-apps)
   #:use-module (gnu packages selinux)
@@ -30703,6 +30706,47 @@ (define-public rust-grpcio-compiler-0.12
       "This package provides a @code{gRPC} compiler for grpcio.")
     (license license:asl2.0)))
 
+(define-public rust-grpcio-sys-0.12
+  (package
+    (name "rust-grpcio-sys")
+    (version "0.12.1+1.46.5-patched")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "grpcio-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qpcvarqzwd2lz43z02wxx6rkd3zhk7dm3a2y01l5x5n0cc5sqng"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (substitute* "Cargo.toml.orig"
+                     (("boringssl(-src)? = .*") "")
+                     ;; Do not use static zlib.
+                     ((", \"static\"") ""))
+                   (copy-file "Cargo.toml.orig" "Cargo.toml")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--features" "openssl") ; Required to build.
+       #:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.59)
+                       ("rust-cc" ,rust-cc-1)
+                       ("rust-cmake" ,rust-cmake-0.1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libz-sys" ,rust-libz-sys-1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3)
+                       ("rust-walkdir" ,rust-walkdir-2))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'use-pkg-config
+           (lambda _ (setenv "GRPCIO_SYS_USE_PKG_CONFIG" "1"))))))
+    (inputs (list abseil-cpp c-ares grpc-for-python-grpcio openssl re2 zlib))
+    (native-inputs (list pkg-config))
+    (home-page "https://github.com/tikv/grpc-rs")
+    (synopsis "FFI bindings to gRPC C core library")
+    (description "This package provides FFI bindings to the @code{gRPC}
+C core library.")
+    (license license:asl2.0)))
+
 (define-public rust-gumdrop-0.8
   (package
     (name "rust-gumdrop")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 013/117] gnu: Add rust-grpcio-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-grpcio-0.12): Add variable.

Change-Id: I985317ac862f4b50e3428ee6f9dbcf57f8eae5a6
---
 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 faea57c6f7..9f4eacad2f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30681,6 +30681,57 @@ (define-public rust-groupable-0.2
      "This package aggregates groups of values from key-value iterators.")
     (license license:expat)))
 
+(define-public rust-grpcio-0.12
+  (package
+    (name "rust-grpcio")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "grpcio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02j3dxlww8m2gf09m2abiw2msgyqkvd2z4w1viibdbhva3535630"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (substitute* "Cargo.toml.orig"
+                     ;; Workspace members are not included.
+                     (("path = \"(grpc-sys|compiler)\", ") "")
+                     (("    \"(proto|benchmark|compiler|health)\",\n") "")
+                     (("    \"(interop|tests-and-examples)\",\n") "")
+                     ;; Use openssl and remove boringssl.
+                     (("\"boringssl\"")
+                      "\"openssl\"")
+                     (("boringssl = .*") "")
+                     ;; Use patch crate as direct dependency.
+                     (("patch.crates-io")
+                      "target.'cfg(unix)'.dependencies"))
+                   (copy-file "Cargo.toml.orig" "Cargo.toml")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-futures-executor" ,rust-futures-executor-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-grpcio-sys" ,rust-grpcio-sys-0.12)
+                       ("rust-grpcio-compiler" ,rust-grpcio-compiler-0.12)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-prost" ,rust-prost-0.11)
+                       ("rust-protobuf" ,rust-protobuf-2))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'use-pkg-config
+           (lambda _ (setenv "GRPCIO_SYS_USE_PKG_CONFIG" "1"))))))
+    (native-inputs (list pkg-config))
+    (inputs (list abseil-cpp c-ares grpc-for-python-grpcio openssl re2 zlib))
+    (home-page "https://github.com/tikv/grpc-rs")
+    (synopsis "Rust implementation of gRPC based on the C core library.")
+    (description
+     "This package provides the Rust language implementation of
+@code{gRPC} based on the @code{gRPC} C core library.")
+    (license license:asl2.0)))
+
 (define-public rust-grpcio-compiler-0.12
   (package
     (name "rust-grpcio-compiler")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 014/117] gnu: Add rust-tonic-build-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-tonic-build-0.9): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 7107dc7e11..68178fdde1 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -5527,6 +5527,31 @@ (define-public rust-tonic-build-0.10
     (description "Codegen module of @code{tonic} @code{gRPC} implementation.")
     (license license:expat)))
 
+(define-public rust-tonic-build-0.9
+  (package
+    (name "rust-tonic-build")
+    (version "0.9.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tonic-build" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01sbpz52sancgvv5jp1gqz46mz6nzck3m022zrqbnf66qbjamzd6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-prettyplease" ,rust-prettyplease-0.1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-prost-build" ,rust-prost-build-0.11)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/hyperium/tonic")
+    (synopsis "Code generation for the `tonic` gRPC implementation")
+    (description
+      "This package provides code generation for the `tonic` @code{gRPC}
+implementation.")
+    (license license:expat)))
+
 (define-public rust-tower-0.4
   (package
     (name "rust-tower")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 015/117] gnu: Add rust-opentelemetry-proto-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-opentelemetry-proto-0.4): Add
variable.
(define-module): Use (gnu packages protobuf) module.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9f4eacad2f..cf23951055 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49128,6 +49128,46 @@ (define-public rust-opentelemetry-jaeger-0.20
 @code{OpenTelemetry}.")
     (license license:asl2.0)))
 
+(define-public rust-opentelemetry-proto-0.4
+  (package
+    (name "rust-opentelemetry-proto")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry-proto" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qblsq0hkksdw3k60bc8yi5xwlynmqwibggz3lyyl4n8bk75bqd2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-grpcio" ,rust-grpcio-0.12)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21)
+        ("rust-prost" ,rust-prost-0.11)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-tonic" ,rust-tonic-0.9))
+       #:cargo-development-inputs
+       (("rust-grpcio-compiler" ,rust-grpcio-compiler-0.12)
+        ("rust-prost-build" ,rust-prost-build-0.11)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-tonic-build" ,rust-tonic-build-0.9))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'set-protoc-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let* ((protobuf (assoc-ref inputs "protobuf"))
+                    (protoc (string-append protobuf "/bin/protoc")))
+               (setenv "PROTOC" protoc)))))))
+    (native-inputs (list protobuf))
+    (home-page (string-append "https://github.com/open-telemetry/opentele"
+                              "metry-rust/tree/main/opentelemetry-proto"))
+    (synopsis "Protobuf generated files and transformations")
+    (description "This package provides Protobuf generated files and
+transformations.")
+    (license license:asl2.0)))
+
 (define-public rust-opentelemetry-sdk-0.21
   (package
     (name "rust-opentelemetry-sdk")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 016/117] gnu: Add rust-opentelemetry-otlp-0.14.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-opentelemetry-otlp-0.14): Add
variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cf23951055..974c74cadd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49128,6 +49128,50 @@ (define-public rust-opentelemetry-jaeger-0.20
 @code{OpenTelemetry}.")
     (license license:asl2.0)))
 
+(define-public rust-opentelemetry-otlp-0.14
+  (package
+    (name "rust-opentelemetry-otlp")
+    (version "0.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry-otlp" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0c59bh4wa824mf89ayivsjqwipkg1y6r27r4d0y47lhfna1xlk7j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--all-targets")
+       #:cargo-inputs
+       (("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-grpcio" ,rust-grpcio-0.12)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-http" ,rust-opentelemetry-http-0.10)
+        ("rust-opentelemetry-proto" ,rust-opentelemetry-proto-0.4)
+        ("rust-opentelemetry-semantic-conventions"
+         ,rust-opentelemetry-semantic-conventions-0.13)
+        ("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21)
+        ("rust-prost" ,rust-prost-0.11)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-surf" ,rust-surf-2)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tonic" ,rust-tonic-0.9))
+       #:cargo-development-inputs
+       (("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1))))
+    (home-page
+     "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-otlp")
+    (synopsis "Exporter for the OpenTelemetry Collector")
+    (description "This package provides an exporter for the
+@code{OpenTelemetry} Collector.")
+    (license license:asl2.0)))
+
 (define-public rust-opentelemetry-proto-0.4
   (package
     (name "rust-opentelemetry-proto")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 017/117] gnu: Add rust-opentelemetry-stdout-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-opentelemetry-stdout-0.2): Add
variable.

Change-Id: I962fce6e734d19a362393f33a6adad58d5c1f409
---
 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 974c74cadd..15cadddc21 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49286,6 +49286,35 @@ (define-public rust-opentelemetry-semantic-conventions-0.13
 @code{OpenTelemetry}.")
     (license license:asl2.0)))
 
+(define-public rust-opentelemetry-stdout-0.2
+  (package
+    (name "rust-opentelemetry-stdout")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "opentelemetry-stdout" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gpnf02d7aidj7008w0sggxchh53bdr0ca68k84pdharrps2sfy1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+                       ("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21)
+                       ("rust-ordered-float" ,rust-ordered-float-4)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1))))
+    (home-page
+     "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-stdout")
+    (synopsis "OpenTelemetry exporter for stdout")
+    (description "An @code{OpenTelemetry} exporter for stdout.")
+    (license license:asl2.0)))
+
 (define-public rust-opml-1
   (package
     (name "rust-opml")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 018/117] gnu: Add rust-tracing-opentelemetry-0.22.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-tracing-opentelemetry-0.22): Add
variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 15cadddc21..aa0b7d0878 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -83383,6 +83383,54 @@ (define-public rust-tracing-log-0.1
        #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3)
                                    ("rust-tracing" ,rust-tracing-0.1))))))
 
+(define-public rust-tracing-opentelemetry-0.22
+  (package
+    (name "rust-tracing-opentelemetry")
+    (version "0.22.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tracing-opentelemetry" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15jmwmbp6wz15bx20bfsmabx53wmlnd7wvzwz9hvkrq7aifc4yn6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21)
+        ("rust-smallvec" ,rust-smallvec-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-core" ,rust-tracing-core-0.1)
+        ("rust-tracing-log" ,rust-tracing-log-0.2)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-web-time" ,rust-web-time-0.2))
+       #:cargo-development-inputs
+       (("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-criterion" ,rust-criterion-0.5)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-jaeger" ,rust-opentelemetry-jaeger-0.20)
+        ("rust-opentelemetry-otlp" ,rust-opentelemetry-otlp-0.14)
+        ("rust-opentelemetry-semantic-conventions"
+         ,rust-opentelemetry-semantic-conventions-0.13)
+        ("rust-opentelemetry-stdout" ,rust-opentelemetry-stdout-0.2)
+        ("rust-opentelemetry-sdk" ,rust-opentelemetry-sdk-0.21)
+        ("rust-pprof" ,rust-pprof-0.13)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+    (home-page "https://github.com/tokio-rs/tracing-opentelemetry")
+    (synopsis "OpenTelemetry integration for tracing")
+    (description
+      "This package provides @code{OpenTelemetry} integration for tracing.")
+    (license license:expat)))
+
 (define-public rust-tracing-serde-0.1
   (package
     (name "rust-tracing-serde")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 019/117] gnu: Add rust-mas-tower-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-mas-tower-0.7): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 68178fdde1..582bfd05db 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4143,6 +4143,36 @@ (define-public rust-jsonwebtoken-7
     (description "Create and decode JWTs in a strongly typed way.")
     (license license:expat)))
 
+(define-public rust-mas-tower-0.7
+  (package
+    (name "rust-mas-tower")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mas-tower" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gf55zyv2822xykc2az253a6n7nvjc129rl2nlwmax9yhjkypgpn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-http" ,rust-http-0.2)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-opentelemetry-http" ,rust-opentelemetry-http-0.10)
+        ("rust-opentelemetry-semantic-conventions"
+         ,rust-opentelemetry-semantic-conventions-0.13)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tower" ,rust-tower-0.4)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-opentelemetry" ,rust-tracing-opentelemetry-0.22))))
+    (home-page "https://matrix-org.github.io/matrix-authentication-service/")
+    (synopsis "Tower layers used by the Matrix Authentication Service")
+    (description "This package provides the Tower layers used by the
+Matrix Authentication Service.")
+    (license license:asl2.0)))
+
 (define-public rust-mockito-1
   (package
     (name "rust-mockito")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 020/117] gnu: rust-bytes-1: Upgrade to 1.6.0.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-bytes-1): Update to 1.6.0.
[cargo-development-inputs]: Replace rust-loom-0.5 with 0.7.

Change-Id: I2519a4df97b56bb8133d84d06120a5f58de9473e
---
 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 aa0b7d0878..ce9a314906 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10044,20 +10044,20 @@ (define-public rust-byteorder-0.5
 (define-public rust-bytes-1
   (package
     (name "rust-bytes")
-    (version "1.4.0")
+    (version "1.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "bytes" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1gkh3fk4fm9xv5znlib723h5md5sxsvbd5113sbxff6g1lmgvcl9"))))
+        (base32 "1jf2awc1fywpk15m6pxay3wqcg65ararg9xi4b08vnszwiyy2kai"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
-       (("rust-loom" ,rust-loom-0.5)
+       (("rust-loom" ,rust-loom-0.7)
         ("rust-serde-test" ,rust-serde-test-1))))
     (home-page "https://github.com/tokio-rs/bytes")
     (synopsis "Types and traits for working with bytes")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 021/117] gnu: Add rust-mas-http-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-mas-http-0.7): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 582bfd05db..d68e4eeab3 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4143,6 +4143,51 @@ (define-public rust-jsonwebtoken-7
     (description "Create and decode JWTs in a strongly typed way.")
     (license license:expat)))
 
+(define-public rust-mas-http-0.7
+  (package
+    (name "rust-mas-http")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mas-http" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "063q1gkbzv1ky3kixiffdyxylz8cbgh1b582z1rmxh1b39r4hsfs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-axum" ,rust-axum-0.6)
+        ("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-hyper-rustls" ,rust-hyper-rustls-0.24)
+        ("rust-mas-tower" ,rust-mas-tower-0.7)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-opentelemetry" ,rust-opentelemetry-0.21)
+        ("rust-rustls" ,rust-rustls-0.21)
+        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("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-tracing-opentelemetry" ,rust-tracing-opentelemetry-0.22)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.25))
+       #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://matrix-org.github.io/matrix-authentication-service/")
+    (synopsis "HTTP utilities for the Matrix Authentication Service")
+    (description "This package provides HTTP utilities for the Matrix
+Authentication Service.")
+    (license license:asl2.0)))
+
 (define-public rust-mas-tower-0.7
   (package
     (name "rust-mas-tower")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 022/117] gnu: Add rust-mas-keystore-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-mas-keystore-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ce9a314906..4bd03d7925 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40977,6 +40977,50 @@ (define-public rust-mas-iana-0.7
 OAuth 2.0.")
     (license license:asl2.0)))
 
+(define-public rust-mas-keystore-0.7
+  (package
+    (name "rust-mas-keystore")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mas-keystore" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04kr3mbmsjnim9s373iy62qrqd236zi4ff9cyqfd41aqiw9jlp57"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-aead" ,rust-aead-0.5)
+                       ("rust-base64ct" ,rust-base64ct-1)
+                       ("rust-chacha20poly1305" ,rust-chacha20poly1305-0.10)
+                       ("rust-const-oid" ,rust-const-oid-0.9)
+                       ("rust-der" ,rust-der-0.7)
+                       ("rust-ecdsa" ,rust-ecdsa-0.16)
+                       ("rust-elliptic-curve" ,rust-elliptic-curve-0.13)
+                       ("rust-generic-array" ,rust-generic-array-0.14)
+                       ("rust-k256" ,rust-k256-0.13)
+                       ("rust-mas-iana" ,rust-mas-iana-0.7)
+                       ("rust-mas-jose" ,rust-mas-jose-0.7)
+                       ("rust-p256" ,rust-p256-0.13)
+                       ("rust-p384" ,rust-p384-0.13)
+                       ("rust-pem-rfc7468" ,rust-pem-rfc7468-0.7)
+                       ("rust-pkcs1" ,rust-pkcs1-0.7)
+                       ("rust-pkcs8" ,rust-pkcs8-0.10)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rsa" ,rust-rsa-0.9)
+                       ("rust-sec1" ,rust-sec1-0.7)
+                       ("rust-spki" ,rust-spki-0.7)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-insta" ,rust-insta-1)
+        ("rust-rand-chacha" ,rust-rand-chacha-0.3))))
+    (home-page "https://matrix-org.github.io/matrix-authentication-service/")
+    (synopsis "Keystore used by the Matrix Authentication Service")
+    (description
+      "This package provides a secret-key store used by the Matrix
+Authentication Service.")
+    (license license:asl2.0)))
+
 (define-public rust-match-cfg-0.1
   (package
     (name "rust-match-cfg")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 023/117] gnu: Add rust-ordered-multimap-0.4.

[Herman Rimm via Guix-patches via]

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

Change-Id: Ibe77e9bb8268861c20c848cc9efb2307fb6ff1e7
---
 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 4bd03d7925..5bdcf94204 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49685,6 +49685,28 @@ (define-public rust-ordered-multimap-0.4
 insertion order across all keys and values.")
     (license license:expat)))
 
+(define-public rust-ordered-multimap-0.4
+  (package
+    (name "rust-ordered-multimap")
+    (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 "0jljv1257pfyf855jlwwas5mqkzk40b9lqfx40f73qbpf7ildmyc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#: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)
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 024/117] gnu: Add rust-mas-oidc-client-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-mas-oidc-client-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5bdcf94204..7c37fef4bc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41021,6 +41021,63 @@ (define-public rust-mas-keystore-0.7
 Authentication Service.")
     (license license:asl2.0)))
 
+(define-public rust-mas-oidc-client-0.7
+  (package
+    (name "rust-mas-oidc-client")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mas-oidc-client" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0wg5w937sv1ljcfvarmvm8j5mzgi6ss2f7n61rs5ql8g4jsgjf1i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags `("--release" "--lib" "--bins") ; missing files
+       #:cargo-inputs (("rust-base64ct" ,rust-base64ct-1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-form-urlencoded" ,rust-form-urlencoded-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-hyper-rustls" ,rust-hyper-rustls-0.24)
+                       ("rust-language-tags" ,rust-language-tags-0.3)
+                       ("rust-mas-http" ,rust-mas-http-0.7)
+                       ("rust-mas-iana" ,rust-mas-iana-0.7)
+                       ("rust-mas-jose" ,rust-mas-jose-0.7)
+                       ("rust-mas-keystore" ,rust-mas-keystore-0.7)
+                       ("rust-mime" ,rust-mime-0.3)
+                       ("rust-oauth2-types" ,rust-oauth2-types-0.7)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rustls" ,rust-rustls-0.21)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
+                       ("rust-serde-with" ,rust-serde-with-3)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("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-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-bitflags" ,rust-bitflags-2)
+        ("rust-mas-keystore" ,rust-mas-keystore-0.7)
+        ("rust-rand-chacha" ,rust-rand-chacha-0.3)
+        ("rust-wiremock" ,rust-wiremock-0.5))))
+    (home-page "https://matrix-org.github.io/matrix-authentication-service/")
+    (synopsis "OpenID Connect library for Matrix Authentication Service")
+    (description
+     "This package provides a @code{OpenID} Connect client library used
+by the Matrix Authentication Service.")
+    (license license:asl2.0)))
+
 (define-public rust-match-cfg-0.1
   (package
     (name "rust-match-cfg")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 025/117] gnu: Add rust-matrix-sdk-test-macros-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-test-macros-0.7): Add
variable.

Change-Id: I0282eb05fcfa9dcda296e0f58178519dac3ce49a
---
 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 7c37fef4bc..8b3083c71f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41182,6 +41182,27 @@ (define-public rust-matchit-0.7
      "This package provides a high performance, zero-copy URL router.")
     (license (list license:expat license:bsd-3))))
 
+(define-public rust-matrix-sdk-test-macros-0.7
+  (package
+    (name "rust-matrix-sdk-test-macros")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-test-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0yr48204a44irzg1l3yx1dlfskj8i71c97i6xki4n92i8pw0qnpb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Helper macros to write tests for the Matrix SDK")
+    (description "This package provides helper macros to write tests for
+the Matrix SDK.")
+    (license license:asl2.0)))
+
 (define-public rust-matrixcompare-0.3
   (package
     (name "rust-matrixcompare")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 026/117] gnu: Add rust-konst-proc-macros-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-konst-proc-macros-0.3): Add variable.
(rust-konst-proc-macros-0.2): Inherit from rust-konst-proc-macros-0.3.
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8b3083c71f..b8e789e763 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36418,23 +36418,38 @@ (define-public rust-konst-macro-rules-0.2
     (description "Implementation detail of the konst crate.")
     (license license:zlib)))
 
-(define-public rust-konst-proc-macros-0.2
+(define-public rust-konst-proc-macros-0.3
   (package
     (name "rust-konst-proc-macros")
-    (version "0.2.11")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "konst_proc_macros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0dxp8mdh3q9d044ql203way4fgbc50n3j3pi2j1x2snlcaa10klq"))))
+        (base32 "0hv07c8b0v8rlcwkf2n1fv46d5ldk8md344c5c6dc2ayqcfsna2f"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/rodrimati1992/konst/")
     (synopsis "Implementation detail of the @code{konst} crate")
-    (description "Implementation detail of the @code{konst} crate.")
+    (description
+      "@code{konst-proc-macros} is an implementation detail of the
+@code{konst} crate.")
     (license license:zlib)))
 
+(define-public rust-konst-proc-macros-0.2
+  (package
+    (inherit rust-konst-proc-macros-0.3)
+    (name "rust-konst-proc-macros")
+    (version "0.2.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "konst_proc_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dxp8mdh3q9d044ql203way4fgbc50n3j3pi2j1x2snlcaa10klq"))))))
+
 (define-public rust-kqueue-1
   (package
     (name "rust-kqueue")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 027/117] gnu: Add rust-konst-kernel-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-konst-kernel-0.3): Add variable.

Change-Id: I5fbe2abfef2ea1ea26883a45cd2f3912a888d4b5
---
 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 b8e789e763..4493bb97b4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36401,6 +36401,28 @@ (define-public rust-konst-0.2
      "Const equivalents of std functions, compile-time comparison, and parsing.")
     (license license:zlib)))
 
+(define-public rust-konst-kernel-0.3
+  (package
+    (name "rust-konst-kernel")
+    (version "0.3.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "konst_kernel" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "140pxwbaqzchks1a962d8m99dx7b5glbhffgh6520vkb6y6fmins"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-typewit" ,rust-typewit-1))
+       #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.7))))
+    (home-page "https://github.com/rodrimati1992/konst/")
+    (synopsis "Foundational functionality shared by konst and const_panic")
+    (description
+     "This package provides the foundational const functionality shared
+between konst and const_panic.")
+    (license license:zlib)))
+
 (define-public rust-konst-macro-rules-0.2
   (package
     (name "rust-konst-macro-rules")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 028/117] gnu: Add rust-konst-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-konst-0.3): Add variable.
(rust-konst-0.2): Inherit from rust-konst-0.3.

Change-Id: I74632d7cd34a03e28b6dfdc2a77f222338fea935
---
 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 4493bb97b4..cab773860b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36377,8 +36377,39 @@ (define-public rust-koibumi-base32-0.0.2
     (description "This package provides a Base32 encoder/decoder library.")
     (license license:gpl3+)))
 
+(define-public rust-konst-0.3
+  (package
+    (name "rust-konst")
+    (version "0.3.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "konst" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1c7xjlryaac1j6ib30lq2hyi8g2zrdl17xjwia6ly9yl9662lwcd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags `("--release" "--all-targets" "--"
+                            "--skip=string::priv_string_tests::invalid_both"
+                            "--skip=string::priv_string_tests::invalid_end"
+                            "--skip=string::priv_string_tests::invalid_start")
+       #:cargo-inputs (("rust-const-panic" ,rust-const-panic-0.2)
+                       ("rust-konst-kernel" ,rust-konst-kernel-0.3)
+                       ("rust-konst-proc-macros" ,rust-konst-proc-macros-0.3)
+                       ("rust-trybuild" ,rust-trybuild-1)
+                       ("rust-typewit" ,rust-typewit-1))
+       #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/rodrimati1992/konst/")
+    (synopsis "Const std functions, compile-time comparison and parsing")
+    (description
+     "This package provides Const equivalents of std functions, compile-
+time comparison, and parsing.")
+    (license license:zlib)))
+
 (define-public rust-konst-0.2
   (package
+    (inherit rust-konst-0.3)
     (name "rust-konst")
     (version "0.2.19")
     (source
@@ -36388,18 +36419,11 @@ (define-public rust-konst-0.2
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1x3lxxk9vjaiiaabngv7ki2bv9xi36gnqzjzi0s8qfs8wq9hw3rk"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-konst-macro-rules" ,rust-konst-macro-rules-0.2)
                        ("rust-konst-proc-macros" ,rust-konst-proc-macros-0.2)
                        ("rust-trybuild" ,rust-trybuild-1))
-       #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8))))
-    (home-page "https://github.com/rodrimati1992/konst/")
-    (synopsis
-     "Const equivalents of std functions, compile-time comparison, and parsing")
-    (description
-     "Const equivalents of std functions, compile-time comparison, and parsing.")
-    (license license:zlib)))
+       #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8))))))
 
 (define-public rust-konst-kernel-0.3
   (package
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 029/117] gnu: Add rust-js-int-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-js-int-0.2): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index d68e4eeab3..d5dd1f556d 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4092,6 +4092,27 @@ (define-public rust-isahc-0.9
         ("rust-test-case" ,rust-test-case-1)
         ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2))))))
 
+(define-public rust-js-int-0.2
+  (package
+    (name "rust-js-int")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "js_int" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02hn954yv5wksn26ck6lq19y3a0sswapf82hi65www5jf1agjdyr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://github.com/ruma/js_int")
+    (synopsis "JavaScript-interoperable integer types")
+    (description
+      "This package provides JavaScript-interoperable integer types.")
+    (license license:expat)))
+
 (define-public rust-json5-0.4
   (package
     (name "rust-json5")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 030/117] gnu: Add rust-ruma-identifiers-validation-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-identifiers-validation-0.9): Add
variable.

Change-Id: I3c6d7a8c0ed156c7226368d88e499e066844fb8a
---
 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 cab773860b..c90aa0e5d1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64354,6 +64354,27 @@ (define-public rust-rug-1
 floating-point, and complex numbers based on GMP, MPFR and MPC.")
     (license license:lgpl3+)))
 
+(define-public rust-ruma-identifiers-validation-0.9
+  (package
+    (name "rust-ruma-identifiers-validation")
+    (version "0.9.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-identifiers-validation" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hcviq2jzc1qcdxqh78wklb273sabv6d26wh41ygbwklj8jx32mz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Validation logic for ruma-common and ruma-macros")
+    (description "This package provides validation logic for ruma-common
+and ruma-macros.")
+    (license license:expat)))
+
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 031/117] gnu: Add rust-ruma-macros-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-macros-0.12): Add variable.

Change-Id: Ia606fb813209fdea2539dfe1d156c182c8e7b809
---
 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 c90aa0e5d1..6ec1fb522f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64375,6 +64375,33 @@ (define-public rust-ruma-identifiers-validation-0.9
 and ruma-macros.")
     (license license:expat)))
 
+(define-public rust-ruma-macros-0.12
+  (package
+    (name "rust-ruma-macros")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "105y2inhb9z7ydkax43qfc5ws264z72gm19ji1pl2d1y9d557002"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#: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-ruma-identifiers-validation" ,rust-ruma-identifiers-validation-0.9)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-toml" ,rust-toml-0.8))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Procedural macros used by the Ruma crates.")
+    (description
+      "This package provides procedural macros used by the Ruma crates.")
+    (license license:expat)))
+
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 032/117] gnu: Add rust-assign-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-assign-1): Add variable.

Change-Id: I7e0588e1d1ed21cb721cb3f9f63135acab751728
---
 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 6ec1fb522f..cc06baad1d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4629,6 +4629,25 @@ (define-public rust-assert2-macros-0.3
     (description "This package provides procedural macros for assert2.")
     (license license:bsd-2)))
 
+(define-public rust-assign-1
+  (package
+    (name "rust-assign")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "assign" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "00h0r04iyyhhnjr8fwkmw3fpvpd41bn9x1dz8s9j5kdyg3nkw2az"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/Kelerchian/assign")
+    (synopsis "Macro to mutate instances with declarative flavor")
+    (description
+     "This package provides a simple macro to allow mutating instances
+with a declarative flavor.")
+    (license license:expat)))
+
 (define-public rust-associative-cache-1
   (package
     (name "rust-associative-cache")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 033/117] gnu: Add rust-ruma-common-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-common-0.12): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cc06baad1d..4e796d95a7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64373,6 +64373,60 @@ (define-public rust-rug-1
 floating-point, and complex numbers based on GMP, MPFR and MPC.")
     (license license:lgpl3+)))
 
+(define-public rust-ruma-common-0.12
+  (package
+    (name "rust-ruma-common")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-common" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "119y69i4mh8f0gcr5acswaq56hf0y3g1pizarv6v8iqfqlrlrjiv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-as-variant" ,rust-as-variant-1)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-form-urlencoded" ,rust-form-urlencoded-1)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-indexmap" ,rust-indexmap-2)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-js-int" ,rust-js-int-0.2)
+        ("rust-konst" ,rust-konst-0.3)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-ruma-identifiers-validation"
+         ,rust-ruma-identifiers-validation-0.9)
+        ("rust-ruma-macros" ,rust-ruma-macros-0.12)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-html-form" ,rust-serde-html-form-0.2)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-url" ,rust-url-2)
+        ("rust-uuid" ,rust-uuid-1)
+        ("rust-wildmatch" ,rust-wildmatch-2))
+       #:cargo-development-inputs
+       (("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-assign" ,rust-assign-1)
+        ("rust-maplit" ,rust-maplit-1)
+        ("rust-trybuild" ,rust-trybuild-1))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'ignore-broken-test
+           (lambda _
+             (setenv "TRYBUILD" "overwrite"))))))
+    (home-page "https://ruma.io/")
+    (synopsis "Common types for other ruma crates")
+    (description "This package provides common types for other ruma
+crates.")
+    (license license:expat)))
+
 (define-public rust-ruma-identifiers-validation-0.9
   (package
     (name "rust-ruma-identifiers-validation")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 034/117] gnu: Add rust-js-option-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-js-option-0.1): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index d5dd1f556d..940662b3ae 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4113,6 +4113,29 @@ (define-public rust-js-int-0.2
       "This package provides JavaScript-interoperable integer types.")
     (license license:expat)))
 
+(define-public rust-js-option-0.1
+  (package
+    (name "rust-js-option")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "js_option" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0g2273zp51nik16s95zyxqhv5qh6ybdrhdh1cykr65bsjmri6hk8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-serde" ,rust-serde-1)
+                                   ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/ruma/js_option")
+    (synopsis "Option-like type with null and undefined variants")
+    (description
+     "This package provides an Option-like type with separate null and
+undefined variants.")
+    (license license:expat)))
+
 (define-public rust-json5-0.4
   (package
     (name "rust-json5")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 035/117] gnu: Add rust-ruma-html-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-html-0.1): Add variable.

Change-Id: Ic98ee6e1ef526059c5f12fc674c990c7eb6de241
---
 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 4e796d95a7..7f119309b1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64427,6 +64427,30 @@ (define-public rust-ruma-common-0.12
 crates.")
     (license license:expat)))
 
+(define-public rust-ruma-html-0.1
+  (package
+    (name "rust-ruma-html")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-html" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nrsm1rp1psk97kvn2cjpn52a0g2kv42i9ab2zi5z5m6n54s2x4n"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-as-variant" ,rust-as-variant-1)
+                       ("rust-html5ever" ,rust-html5ever-0.26)
+                       ("rust-phf" ,rust-phf-0.11)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-wildmatch" ,rust-wildmatch-2))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Opinionated HTML parsing and manipulating")
+    (description
+      "This package provides opinionated HTML parsing and manipulating.")
+    (license license:expat)))
+
 (define-public rust-ruma-identifiers-validation-0.9
   (package
     (name "rust-ruma-identifiers-validation")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 036/117] gnu: Add rust-ruma-events-0.27.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-events-0.27): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7f119309b1..41f2fa68e6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64427,6 +64427,52 @@ (define-public rust-ruma-common-0.12
 crates.")
     (license license:expat)))
 
+(define-public rust-ruma-events-0.27
+  (package
+    (name "rust-ruma-events")
+    (version "0.27.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-events" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1wg3smmqxxwl03j5hkk707fdlxng7n5vl50wg85v77ss1rvm42nj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-as-variant" ,rust-as-variant-1)
+        ("rust-criterion" ,rust-criterion-0.5)
+        ("rust-indexmap" ,rust-indexmap-2)
+        ("rust-js-int" ,rust-js-int-0.2)
+        ("rust-js-option" ,rust-js-option-0.1)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-ruma-common" ,rust-ruma-common-0.12)
+        ("rust-ruma-html" ,rust-ruma-html-0.1)
+        ("rust-ruma-identifiers-validation"
+         ,rust-ruma-identifiers-validation-0.9)
+        ("rust-ruma-macros" ,rust-ruma-macros-0.12)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-url" ,rust-url-2)
+        ("rust-wildmatch" ,rust-wildmatch-2))
+       #:cargo-development-inputs
+       (("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-assign" ,rust-assign-1)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-maplit" ,rust-maplit-1)
+        ("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://ruma.io/")
+    (synopsis "Serializable types for events in the Matrix specification")
+    (description
+     "This package provides serializable types for the events in the
+Matrix specification.")
+    (license license:expat)))
+
 (define-public rust-ruma-html-0.1
   (package
     (name "rust-ruma-html")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 037/117] gnu: Add rust-ruma-appservice-api-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-appservice-api-0.9): Add
variable.

Change-Id: Idc208db555b74b5c1fbf45f27ac8bd74742c0d30
---
 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 41f2fa68e6..01fccc1729 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64373,6 +64373,34 @@ (define-public rust-rug-1
 floating-point, and complex numbers based on GMP, MPFR and MPC.")
     (license license:lgpl3+)))
 
+(define-public rust-ruma-appservice-api-0.9
+  (package
+    (name "rust-ruma-appservice-api")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-appservice-api" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xabivmgklm7qav1ja84b92pq7fxy4h344zhk25bhgbb4j3zi3y2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-ruma-events" ,rust-ruma-events-0.27)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-development-inputs
+       (("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-serde-yaml" ,rust-serde-yaml-0.9))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Types for Matrix application service API endpoints")
+    (description
+     "This package provides types for the endpoints in the Matrix
+application service API.")
+    (license license:expat)))
+
 (define-public rust-ruma-common-0.12
   (package
     (name "rust-ruma-common")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 038/117] gnu: Add rust-ruma-federation-api-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-federation-api-0.8): Add variable.

Change-Id: I11e96182899b7220d3849aa7e9099133e7d3b450
---
 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 01fccc1729..e1bf330999 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64501,6 +64501,33 @@ (define-public rust-ruma-events-0.27
 Matrix specification.")
     (license license:expat)))
 
+(define-public rust-ruma-federation-api-0.8
+  (package
+    (name "rust-ruma-federation-api")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-federation-api" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1rrzvxzjdxwpxr6d5k5yi8cz7kisqwqa3wlasm97ccmw4wgir471"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-ruma-events" ,rust-ruma-events-0.27)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-development-inputs
+       (("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-http" ,rust-http-0.2))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Types for Matrix server-server API endpoints")
+    (description "This package provides types for the endpoints in the
+Matrix server-server API.")
+    (license license:expat)))
+
 (define-public rust-ruma-html-0.1
   (package
     (name "rust-ruma-html")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 039/117] gnu: Add rust-ruma-identity-service-api-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-identity-service-api-0.8): Add
variable.

Change-Id: I1274cf295a830452746ade58415eb65a9698f9f9
---
 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 e1bf330999..1e12186b61 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64573,6 +64573,29 @@ (define-public rust-ruma-identifiers-validation-0.9
 and ruma-macros.")
     (license license:expat)))
 
+(define-public rust-ruma-identity-service-api-0.8
+  (package
+    (name "rust-ruma-identity-service-api")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-identity-service-api" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1wh9qlzlqhlmirki6i0bffp7f9d6n2jdfv26crj24xsvl02a2zgi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Types for Matrix identity service API endpoints.")
+    (description "This package provides types for the endpoints in the
+Matrix identity service API.")
+    (license license:expat)))
+
 (define-public rust-ruma-macros-0.12
   (package
     (name "rust-ruma-macros")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 040/117] gnu: Add rust-ruma-push-gateway-api-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-push-gateway-api-0.8): Add variable.

Change-Id: I8f14bc984330d4cd614a45fb0794cdfc973f148a
---
 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 1e12186b61..7c7967e0b7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64623,6 +64623,30 @@ (define-public rust-ruma-macros-0.12
       "This package provides procedural macros used by the Ruma crates.")
     (license license:expat)))
 
+(define-public rust-ruma-push-gateway-api-0.8
+  (package
+    (name "rust-ruma-push-gateway-api")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-push-gateway-api" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ss8fylz548ygqa7p91fwdp3whf7yc51c52h7gwl6naa9mf08hzk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-ruma-events" ,rust-ruma-events-0.27)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Types for Matrix push gateway API endpoints")
+    (description "This package provides types for the endpoints in the
+Matrix push gateway API.")
+    (license license:expat)))
+
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 041/117] gnu: Add rust-yap-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-yap-0.12): Add variable.

Change-Id: I5c9b80a43ce4860e9e21297a976987dc41c1cc08
---
 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 7c7967e0b7..9270b74b11 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -90881,6 +90881,33 @@ (define-public rust-yansi-term-0.1
      "Library for ANSI terminal colours and styles (bold, underline).")
     (license license:expat)))
 
+(define-public rust-yap-0.12
+  (package
+    (name "rust-yap")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "yap" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07q53xz7wij2n4vnv71cpy1wsab52c78d5xx1kifi983p3knkqmz"))
+       (modules '((guix build utils)))
+       (snippet '(begin (substitute* "Cargo.toml.orig"
+                          (("logos = \"0.12.0\"")
+                           "logos = \"0.13\""))
+                        (copy-file "Cargo.toml.orig" "Cargo.toml")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-logos" ,rust-logos-0.13))))
+    (home-page "https://github.com/jsdw/yap")
+    (synopsis "Utility methods to help with parsing strings and slices")
+    (description
+     "Yet Another Parser library.  A lightweight, dependency free, parser
+combinator inspired set of utility methods to help with parsing strings
+and slices.")
+    (license license:expat)))
+
 (define-public rust-yasna-0.5
   (package
     (name "rust-yasna")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 042/117] gnu: Add rust-yap-0.11.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-yap-0.11): Add variable.

Change-Id: I0379fec2b0b737e4ab3176b55f71962f9143f9da
---
 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 9270b74b11..d0953744bb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -90908,6 +90908,24 @@ (define-public rust-yap-0.12
 and slices.")
     (license license:expat)))
 
+(define-public rust-yap-0.11
+  (package
+    (inherit rust-yap-0.12)
+    (name "rust-yap")
+    (version "0.11.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "yap" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kr49a96x7p1fjpj7vdvpk00q1q7clfyp36p12x9wqn49chj8igz"))
+       (modules '((guix build utils)))
+       (snippet '(begin (substitute* "Cargo.toml.orig"
+                          (("logos = \"0.12.0\"")
+                           "logos = \"0.13\""))
+                        (copy-file "Cargo.toml.orig" "Cargo.toml")))))))
+
 (define-public rust-yasna-0.5
   (package
     (name "rust-yasna")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 043/117] gnu: Add rust-ruma-server-util-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-server-util-0.2): Add variable.

Change-Id: Id7fa3882cb352bde17afa41d83f53fada912a3bf
---
 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 d0953744bb..6a82e031b5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64647,6 +64647,32 @@ (define-public rust-ruma-push-gateway-api-0.8
 Matrix push gateway API.")
     (license license:expat)))
 
+(define-public rust-ruma-server-util-0.2
+  (package
+    (name "rust-ruma-server-util")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-server-util" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0sr01j9qanlyz3nj8zvdk1blhhffhgk5p13x4jjimhii988fadh8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-headers" ,rust-headers-0.3)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-yap" ,rust-yap-0.11))
+       #:cargo-development-inputs
+       (("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Utilities for implementing Matrix server applications")
+    (description
+      "This package provides utilities for implementing Matrix server
+applications.")
+    (license license:expat)))
+
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 044/117] gnu: Add rust-curve25519-dalek-derive-0.1.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 1fbcf949a6..4280c867c2 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -1915,6 +1915,27 @@ (define-public rust-curve25519-dalek-derive-0.1
     (description "This package provides curve25519-dalek Derives.")
     (license (list license:expat license:asl2.0))))
 
+(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
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://doc.dalek.rs/curve25519_dalek")
+    (synopsis "curve25519-dalek Derives")
+    (description "This package provides 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#69257] [PATCH rust-team v2 045/117] gnu: Add rust-macro-attr-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-macro-attr-0.2): Add variable.

Change-Id: I4d012d4be818ac8e8576e8cce7270b65c0243e81
---
 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 6a82e031b5..8e30814805 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40592,6 +40592,34 @@ (define-public rust-macaddr-1
     (description "This pakcage provides MAC address types.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-macro-attr-0.2
+  (package
+    (name "rust-macro-attr")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "macro-attr" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0anc4valrldnn0gwaqlhlr4b5zh25g1lyy1x3fq65y1b1rpirr80"))
+       (modules '((guix build utils)))
+       (snippet '(substitute* "Cargo.toml"
+                   ;; Workspace members are not included.
+                   (("    \"tests/derive-name-(macro|proc|test)\",\r") "")
+                   (("    \"(enum|newtype)_derive\",\r") "")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-rustc-serialize" ,rust-rustc-serialize-0.3))))
+    (home-page "https://github.com/DanielKeep/rust-custom-derive")
+    (synopsis "macro_attr! macro for custom attributes and derivations")
+    (description
+     "This package provides the `macro_attr!` macro that enables the use
+of custom, macro-based attributes and derivations.  Supercedes the
+`custom_derive` crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-macrotest-1
   (package
     (name "rust-macrotest")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 046/117] gnu: Add rust-subslice-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-subslice-0.2): Add variable.

Change-Id: I9e9830efb9291b74e4cce30027cd5024eb9fdd06
---
 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 8e30814805..7f55cb98ec 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -75622,6 +75622,35 @@ (define-public rust-subprocess-0.2
 inspired by Python's subprocess module, with Rust-specific extensions.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-subslice-0.2
+  (package
+    (name "rust-subslice")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "subslice" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1bkasla3shbfvlqlvkdbisgaz0qsl0dsyzqz3zh2vc1vka0f9a70"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-galil-seiferas" ,rust-galil-seiferas-0.1)
+                       ("rust-jetscii" ,rust-jetscii-0.3)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-unchecked-index" ,rust-unchecked-index-0.2))
+       #:cargo-development-inputs
+       (("rust-itertools" ,rust-itertools-0.7)
+        ("rust-macro-attr" ,rust-macro-attr-0.2)
+        ("rust-newtype-derive" ,rust-newtype-derive-0.1)
+        ("rust-odds" ,rust-odds-0.2)
+        ("rust-quickcheck" ,rust-quickcheck-0.5)
+        ("rust-rand" ,rust-rand-0.3))))
+    (home-page "https://github.com/strake/subslice.rs")
+    (synopsis "Subslice search")
+    (description "This package provides fast subslice search.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-supercow-0.1
   (package
     (name "rust-supercow")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 047/117] gnu: Add rust-ruma-signatures-0.14.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-signatures-0.14): Add variable.

Change-Id: Id277d9f88df454d095ade9111c0afa56be769579
---
 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 7f55cb98ec..bde99c9bd9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64701,6 +64701,38 @@ (define-public rust-ruma-server-util-0.2
 applications.")
     (license license:expat)))
 
+(define-public rust-ruma-signatures-0.14
+  (package
+    (name "rust-ruma-signatures")
+    (version "0.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-signatures" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12f76winxclvwgylm5kqy3bqfj7x7x9g4xzkh4nhbfrf7nrkiarh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-base64" ,rust-base64-0.21)
+                       ("rust-ed25519-dalek" ,rust-ed25519-dalek-2)
+                       ("rust-pkcs8" ,rust-pkcs8-0.10)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-subslice" ,rust-subslice-0.2)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-insta" ,rust-insta-1))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Digital signatures according to the Matrix specification")
+    (description
+      "This package provides digital signatures according to the Matrix
+specification.")
+    (license license:expat)))
+
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 048/117] gnu: Add rust-ruma-client-api-0.17.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-client-api-0.17): Add variable.

Change-Id: I9c9029de0084f2adbf2990e37dbfdcf1c1824be1
---
 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 bde99c9bd9..2934bb46cf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64429,6 +64429,39 @@ (define-public rust-ruma-appservice-api-0.9
 application service API.")
     (license license:expat)))
 
+(define-public rust-ruma-client-api-0.17
+  (package
+    (name "rust-ruma-client-api")
+    (version "0.17.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-client-api" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "11ik20rnm1c1a3cdbqg8dayd7xgh9sai8xa74c4af552iwjkf634"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-assign" ,rust-assign-1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-js-option" ,rust-js-option-0.1)
+                       ("rust-maplit" ,rust-maplit-1)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-ruma-events" ,rust-ruma-events-0.27)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-html-form" ,rust-serde-html-form-0.2)
+                       ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-development-inputs
+       (("rust-assert-matches2" ,rust-assert-matches2-0.1))))
+    (home-page "https://ruma.io/")
+    (synopsis "Types for Matrix client-server API endpoints.")
+    (description
+      "This package provides types for the endpoints in the Matrix
+client-server API.")
+    (license license:expat)))
+
 (define-public rust-ruma-common-0.12
   (package
     (name "rust-ruma-common")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 049/117] gnu: Add rust-ruma-client-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-client-0.12): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2934bb46cf..1c64ac0f1a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64429,6 +64429,46 @@ (define-public rust-ruma-appservice-api-0.9
 application service API.")
     (license license:expat)))
 
+(define-public rust-ruma-client-0.12
+  (package
+    (name "rust-ruma-client")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-client" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "136dbzns8bs9xwr97gpnrz7cblwhpfrr85mnrclb34gm0snq2p3g"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--all-targets")
+       #:cargo-inputs (("rust-assign" ,rust-assign-1)
+                       ("rust-async-stream" ,rust-async-stream-0.3)
+                       ("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-lite" ,rust-futures-lite-1)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-hyper" ,rust-hyper-0.14)
+                       ("rust-hyper-rustls" ,rust-hyper-rustls-0.24)
+                       ("rust-hyper-tls" ,rust-hyper-tls-0.5)
+                       ("rust-isahc" ,rust-isahc-1)
+                       ("rust-reqwest" ,rust-reqwest-0.11)
+                       ("rust-ruma-client-api" ,rust-ruma-client-api-0.17)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-html-form" ,rust-serde-html-form-0.2)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-ruma-client-api" ,rust-ruma-client-api-0.17)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Matrix client library")
+    (description "This package provides a Matrix client library.")
+    (license license:expat)))
+
 (define-public rust-ruma-client-api-0.17
   (package
     (name "rust-ruma-client-api")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 050/117] gnu: Add rust-ruma-state-res-0.10.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-state-res-0.10): Add variable.

Change-Id: Id0b1b2f855746500fe24c4cf4c543370baea05e0
---
 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 1c64ac0f1a..5a77e83a43 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64806,6 +64806,39 @@ (define-public rust-ruma-signatures-0.14
 specification.")
     (license license:expat)))
 
+(define-public rust-ruma-state-res-0.10
+  (package
+    (name "rust-ruma-state-res")
+    (version "0.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma-state-res" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hhfd4ca73bpnrfyr02k675cdc82x2yw0fah8w1s7jsm0wrb2v3q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-criterion" ,rust-criterion-0.5)
+                       ("rust-itertools" ,rust-itertools-0.11)
+                       ("rust-js-int" ,rust-js-int-0.2)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-ruma-events" ,rust-ruma-events-0.27)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-maplit" ,rust-maplit-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-ruma-events" ,rust-ruma-events-0.27)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+    (home-page "https://www.ruma.io/")
+    (synopsis "Abstraction for Matrix state resolution")
+    (description "This package provides an abstraction for Matrix state
+resolution.")
+    (license license:expat)))
+
 (define-public rust-run-script-0.10
   (package
     (name "rust-run-script")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 051/117] gnu: Add rust-ruma-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ruma-0.9): Add variable.

Change-Id: I98145b8b8b711d0ef4c8abdd914f718da9c90609
---
 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 5a77e83a43..61a8b15983 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64401,6 +64401,44 @@ (define-public rust-rug-1
 floating-point, and complex numbers based on GMP, MPFR and MPC.")
     (license license:lgpl3+)))
 
+(define-public rust-ruma-0.9
+  (package
+    (name "rust-ruma")
+    (version "0.9.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ruma" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dksah6cwdini5ln930plz8x01zv1qqdjnb28xilr5kjy26w6y97"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-assign" ,rust-assign-1)
+        ("rust-js-int" ,rust-js-int-0.2)
+        ("rust-js-option" ,rust-js-option-0.1)
+        ("rust-ruma-appservice-api" ,rust-ruma-appservice-api-0.9)
+        ("rust-ruma-client" ,rust-ruma-client-0.12)
+        ("rust-ruma-client-api" ,rust-ruma-client-api-0.17)
+        ("rust-ruma-common" ,rust-ruma-common-0.12)
+        ("rust-ruma-events" ,rust-ruma-events-0.27)
+        ("rust-ruma-federation-api" ,rust-ruma-federation-api-0.8)
+        ("rust-ruma-html" ,rust-ruma-html-0.1)
+        ("rust-ruma-identity-service-api"
+         ,rust-ruma-identity-service-api-0.8)
+        ("rust-ruma-push-gateway-api" ,rust-ruma-push-gateway-api-0.8)
+        ("rust-ruma-server-util" ,rust-ruma-server-util-0.2)
+        ("rust-ruma-signatures" ,rust-ruma-signatures-0.14)
+        ("rust-ruma-state-res" ,rust-ruma-state-res-0.10))
+       #:cargo-development-inputs (("rust-serde" ,rust-serde-1))))
+    (home-page "https://ruma.io/")
+    (synopsis "Types and traits for working with the Matrix protocol")
+    (description
+      "This package provides types and traits for working with the Matrix
+protocol.")
+    (license license:expat)))
+
 (define-public rust-ruma-appservice-api-0.9
   (package
     (name "rust-ruma-appservice-api")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 052/117] gnu: Add rust-matrix-sdk-test-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-test-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 61a8b15983..16aacefa80 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41290,6 +41290,37 @@ (define-public rust-matchit-0.7
      "This package provides a high performance, zero-copy URL router.")
     (license (list license:expat license:bsd-3))))
 
+(define-public rust-matrix-sdk-test-0.7
+  (package
+    (name "rust-matrix-sdk-test")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-test" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "089qckyfzschdafa2w9vfzz1v980k4x908xfs17bdnmaw3pbkb7a"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ctor" ,rust-ctor-0.2)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-matrix-sdk-test-macros" ,rust-matrix-sdk-test-macros-0.7)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Helpers to write tests for the Matrix SDK")
+    (description
+      "This package provides helpers to write tests for the Matrix SDK.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-test-macros-0.7
   (package
     (name "rust-matrix-sdk-test-macros")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 053/117] gnu: Add rust-matrix-sdk-common-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-common-0.7): Add variable.

Change-Id: Ifda41c068b8a6539f4ce14424a8c28e65608eaab
---
 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 16aacefa80..dd90177190 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41290,6 +41290,48 @@ (define-public rust-matchit-0.7
      "This package provides a high performance, zero-copy URL router.")
     (license (list license:expat license:bsd-3))))
 
+(define-public rust-matrix-sdk-common-0.7
+  (package
+    (name "rust-matrix-sdk-common")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-common" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17wwy8fzgw58ph26sv3h0v5sq69ga9jjbzic8aicdxmnd9i5ldmv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-gloo-timers" ,rust-gloo-timers-0.3)
+        ("rust-instant" ,rust-instant-0.1)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
+        ("rust-web-sys" ,rust-web-sys-0.3))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Common types and imports used in @code{matrix-sdk}")
+    (description
+     "This package provides a collection of common types and imports
+used in the @code{matrix-sdk} crates.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-test-0.7
   (package
     (name "rust-matrix-sdk-test")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 054/117] gnu: Add rust-matrix-pickle-derive-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-pickle-derive-0.1): Add
variable.

Change-Id: Ib89cc91c6967ade2e336f7f3bdc3ed7cfabd77aa
---
 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 dd90177190..6845095ac0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41290,6 +41290,30 @@ (define-public rust-matchit-0.7
      "This package provides a high performance, zero-copy URL router.")
     (license (list license:expat license:bsd-3))))
 
+(define-public rust-matrix-pickle-derive-0.1
+  (package
+    (name "rust-matrix-pickle-derive")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-pickle-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xf0mjcl1mkbyzznf5xqy65cz4k1hq5b31v2fhsgxhirinkrlxwk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro-crate" ,rust-proc-macro-crate-2)
+                       ("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/matrix-org/matrix-pickle")
+    (synopsis "Derive support for matrix-pickle")
+    (description
+     "This package provides Derive support for @code{matrix-pickle}.")
+    (license license:expat)))
+
 (define-public rust-matrix-sdk-common-0.7
   (package
     (name "rust-matrix-sdk-common")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 055/117] gnu: Add rust-matrix-pickle-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-pickle-0.1): Add variable.

Change-Id: I63927e6670c9c0a603287546f8b66087b203ffa4
---
 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 6845095ac0..5753c78cad 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41290,6 +41290,31 @@ (define-public rust-matchit-0.7
      "This package provides a high performance, zero-copy URL router.")
     (license (list license:expat license:bsd-3))))
 
+(define-public rust-matrix-pickle-0.1
+  (package
+    (name "rust-matrix-pickle")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-pickle" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07c2kmlswi7ir79ldgcizcibm61i8lni9i5rkf6npn757i32dzfp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-matrix-pickle-derive" ,rust-matrix-pickle-derive-0.1)
+        ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)
+                                   ("rust-proptest" ,rust-proptest-1))))
+    (home-page "https://github.com/matrix-org/matrix-pickle")
+    (synopsis "Binary encoding format used in the Matrix world")
+    (description
+     "This package provides a simple binary encoding format used in the
+Matrix world.")
+    (license license:expat)))
+
 (define-public rust-matrix-pickle-derive-0.1
   (package
     (name "rust-matrix-pickle-derive")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 056/117] gnu: Add rust-olm-sys-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-olm-sys-1): Add variable.

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 4280c867c2..52a70a97df 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -3246,6 +3246,35 @@ (define-public rust-nettle-sys-2
     (license ;; licensed under either of these, at your option
      (list license:lgpl3 license:gpl2 license:gpl3))))
 
+(define-public rust-olm-sys-1
+  (package
+    (name "rust-olm-sys")
+    (version "1.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "olm-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ffk09h237vk962d0iclp13x2bqha9qpy58gkwgh52a9c8jwzzia"))
+       (modules '((guix build utils)))
+       ;; Remove included dependency.
+       (snippet '(begin (substitute* "build.rs"
+                                     (("fn main.*")
+                                      "fn main() {
+    println!(\"cargo:rustc-link-lib=olm\");
+    return;"))
+                        (delete-file-recursively "olm")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cmake" ,rust-cmake-0.1)
+                       ("rust-fs-extra" ,rust-fs-extra-1))))
+    (inputs (list olm))
+    (home-page "https://gitlab.gnome.org/BrainBlasted/olm-sys")
+    (synopsis "Low level binding for libolm")
+    (description "This package provides low level binding for libolm.")
+    (license license:asl2.0)))
+
 (define-public rust-orion-0.17
   (package
     (name "rust-orion")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 057/117] gnu: Add rust-olm-rs-2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-olm-rs-2): Add variable.

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 52a70a97df..cef5242d78 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -3246,6 +3246,32 @@ (define-public rust-nettle-sys-2
     (license ;; licensed under either of these, at your option
      (list license:lgpl3 license:gpl2 license:gpl3))))
 
+(define-public rust-olm-rs-2
+  (package
+    (name "rust-olm-rs")
+    (version "2.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "olm-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09f7mq2dahyhy7w0xbb8750skzh7wmzpnvbmnkby830iaiq2qv6x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-olm-sys" ,rust-olm-sys-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-base64" ,rust-base64-0.11)
+                                   ("rust-json" ,rust-json-0.12))))
+    (inputs (list olm))
+    (home-page "https://gitlab.gnome.org/jhaye/olm-rs")
+    (synopsis "A Rust wrapper for libolm.")
+    (description "This package provides a Rust wrapper for libolm.")
+    (license license:asl2.0)))
+
 (define-public rust-olm-sys-1
   (package
     (name "rust-olm-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 058/117] gnu: Add rust-vodozemac-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-vodozemac-0.5): Add variable.

Change-Id: Ib17beb63cd41531b56372a0ddab64055b328e4aa
---
 gnu/packages/crates-crypto.scm | 46 ++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index cef5242d78..879879d09d 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -6564,6 +6564,52 @@ (define-public rust-universal-hash-0.3
        (("rust-generic-array" ,rust-generic-array-0.12)
         ("rust-subtle" ,rust-subtle-2))))))
 
+(define-public rust-vodozemac-0.5
+  (package
+    (name "rust-vodozemac")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "vodozemac" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mm3nazg7zailrwjs4f13nx2636v7b25ba6rfafjj8n5xkzdz417"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ; 'calculate_mac_fixed_base64' not in olm-rs.
+       #:cargo-inputs (("rust-aes" ,rust-aes-0.8)
+                       ("rust-arrayvec" ,rust-arrayvec-0.7)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-cbc" ,rust-cbc-0.1)
+                       ("rust-curve25519-dalek" ,rust-curve25519-dalek-4)
+                       ("rust-ed25519-dalek" ,rust-ed25519-dalek-2)
+                       ("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-matrix-pickle" ,rust-matrix-pickle-0.1)
+                       ("rust-pkcs7" ,rust-pkcs7-0.4)
+                       ("rust-prost" ,rust-prost-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-x25519-dalek" ,rust-x25519-dalek-2)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-olm-rs" ,rust-olm-rs-2)
+        ("rust-proptest" ,rust-proptest-1))))
+    (home-page "https://github.com/matrix-org/vodozemac")
+    (synopsis "Rust implementation of Olm and Megolm")
+    (description
+     "This package provides a Rust implementation of Olm and Megolm.")
+    (license license:asl2.0)))
+
 (define-public rust-x25519-dalek-2
   (package
     (name "rust-x25519-dalek")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 059/117] gnu: rust-serde-bytes-0.11: Upgrade to 0.11.14.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-serde-bytes-0.11): Update to
0.11.14.

Change-Id: I654870524170bd7c39c1d8adad2cc099342ffd61
---
 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 5753c78cad..f19e8640b0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69351,7 +69351,7 @@ (define-public rust-serde-buf-0.1
 (define-public rust-serde-bytes-0.11
   (package
     (name "rust-serde-bytes")
-    (version "0.11.11")
+    (version "0.11.14")
     (source
      (origin
        (method url-fetch)
@@ -69359,7 +69359,7 @@ (define-public rust-serde-bytes-0.11
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0yj2kj2hcphabzrydpa4dndfm9clh8cy6iv4fc4dw2ijwm7vw5js"))))
+        (base32 "0d0pb7wsq2nszxvg2dmzbj9wsvrzchbq2m4742csnhzx2g1rg14b"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 060/117] gnu: Add rust-qrcode-0.13.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-qrcode-0.13): Add variable.

Change-Id: I99140aa4bbd8abc1548b00534351329275cdbf53
---
 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 f19e8640b0..ad26459060 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59395,6 +59395,26 @@ (define-public rust-python-pkginfo-0.5
         ("rust-zip" ,rust-zip-0.6))
        #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-qrcode-0.13
+  (package
+    (name "rust-qrcode")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrcode" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gyfc3xv94ml441a788p2jk38rakl3vrqr7khs0zk6dizmni6vqn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-image" ,rust-image-0.24))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.24))))
+    (home-page "https://github.com/kennytm/qrcode-rust")
+    (synopsis "QR code encoder in Rust")
+    (description "This package provides a QR code encoder in Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-quad-rand-0.2
   (package
     (name "rust-quad-rand")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 061/117] gnu: Add rust-matrix-sdk-qrcode-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-qrcode-0.7): Add variable.

Change-Id: I066ecadc74197eb7dfaf43dde738b27d6b582e70
---
 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 ad26459060..cd73f20fa6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41381,6 +41381,33 @@ (define-public rust-matrix-sdk-common-0.7
 used in the @code{matrix-sdk} crates.")
     (license license:asl2.0)))
 
+(define-public rust-matrix-sdk-qrcode-0.7
+  (package
+    (name "rust-matrix-sdk-qrcode")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-qrcode" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gjcvwy6ri5c2z960zmfzvdbdvkcblcysf1svy6l9rqa0zmn5ccb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-qrcode" ,rust-qrcode-0.13)
+                       ("rust-ruma-common" ,rust-ruma-common-0.12)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-vodozemac" ,rust-vodozemac-0.5))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.24)
+                                   ("rust-qrcode" ,rust-qrcode-0.13))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Encode and decode QR codes for Matrix verifications")
+    (description
+     "This package provides a library to encode and decode QR codes for
+interactive verifications in Matrix land.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-test-0.7
   (package
     (name "rust-matrix-sdk-test")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 062/117] gnu: Add rust-bitstring-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-bitstring-0.1): Add variable.

Change-Id: If6bd420416d4eefc11ce9d823f8b357faba31029
---
 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 cd73f20fa6..cdf25dd40d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8242,6 +8242,24 @@ (define-public rust-bitstream-io-0.8
          "00a6wy54s1dmadm5xz8k2cbsd7ixvm48mlc45bk0fdy0pbra6jk1"))))
     (arguments `(#:skip-build? #t))))
 
+(define-public rust-bitstring-0.1
+  (package
+    (name "rust-bitstring")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bitstring" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1k3fkd8q1lr6smlpk1r20wcwzp1v2xqymndny5zfgkq0nq6rr8r2"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/stbuehler/rust-bitstring")
+    (synopsis "Bitstring traits and implementations")
+    (description
+      "This package provides Bitstring traits and implementations.")
+    (license license:expat)))
+
 (define-public rust-bitvec-1
   (package
     (name "rust-bitvec")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 063/117] gnu: Add rust-cidr-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-cidr-0.2): Add variable.

Change-Id: Iff6ddc228076cb2544b3d5363f22ae1cc75b9202
---
 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 cdf25dd40d..9eebc32a2f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12466,6 +12466,31 @@ (define-public rust-ciborium-ll-0.2
      "This package provides low-level primitives for parsing the CBOR codec.")
     (license license:asl2.0)))
 
+(define-public rust-cidr-0.2
+  (package
+    (name "rust-cidr")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cidr" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1n78hgs3h8hk62l35afhyx699fmj3qvd911p3sm9lk55xf9v064d"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bitstring" ,rust-bitstring-0.1)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-serde-test" ,rust-serde-test-1)
+        ("rust-version-sync" ,rust-version-sync-0.9))))
+    (home-page "https://github.com/stbuehler/rust-cidr")
+    (synopsis "IP network and IP host within network types")
+    (description
+      "This package provides IP network and IP host within network types.")
+    (license license:expat)))
+
 (define-public rust-cint-0.3
   (package
     (name "rust-cint")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 064/117] gnu: rust-postgres-derive-0.4: Upgrade to 0.4.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-postgres-derive-0.4): Update to
0.4.5.
[cargo-inputs]: Add rust-heck-0.4.  Replace rust-syn-1 with 2.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9eebc32a2f..8adaa126ac 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55738,7 +55738,7 @@ (define-public rust-postgres-0.19
 (define-public rust-postgres-derive-0.4
   (package
     (name "rust-postgres-derive")
-    (version "0.4.0")
+    (version "0.4.5")
     (source
       (origin
         (method url-fetch)
@@ -55746,13 +55746,14 @@ (define-public rust-postgres-derive-0.4
         (file-name
          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "0xqlf1gffy3q8hra3fm0vm9x8i5fkvi0qjl99d0xirxh3hidsmy8"))))
+         (base32 "18l065qawh5lm1d350s32mg6d9rzhj6878d9h7whw18vfjx5w543"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
+       (("rust-heck" ,rust-heck-0.4)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
+        ("rust-syn" ,rust-syn-2))))
     (home-page "https://github.com/sfackler/rust-postgres")
     (synopsis "Internal crate used by postgres-types")
     (description
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 065/117] gnu: rust-postgres-protocol-0.6: Upgrade to 0.6.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-postgres-protocol-0.6): Update to
0.6.6.
[cargo-inputs]: Add rust-getrandom-0.2.  Replace rust-base64-0.13 with
0.21, rust-hmac-0.10 with 0.12, rust-md-5-0.9 with 0.10 and
rust-sha2-0.9 with 0.10.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8adaa126ac..71ca3aad4a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55763,7 +55763,7 @@ (define-public rust-postgres-derive-0.4
 (define-public rust-postgres-protocol-0.6
   (package
     (name "rust-postgres-protocol")
-    (version "0.6.1")
+    (version "0.6.6")
     (source
       (origin
         (method url-fetch)
@@ -55771,20 +55771,20 @@ (define-public rust-postgres-protocol-0.6
         (file-name
          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "1wxzs78zvz00bh3bhbbp9hnq9hg77f8h5pzjmcy9481fsdq0ygpz"))))
+         (base32 "0855ijaw98nrx2lzx739wiydk2qyq9jcmw85l15splrw33pwbdj9"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-base64" ,rust-base64-0.13)
+       (("rust-base64" ,rust-base64-0.21)
         ("rust-byteorder" ,rust-byteorder-1)
         ("rust-bytes" ,rust-bytes-1)
         ("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
-        ("rust-hmac" ,rust-hmac-0.10)
-        ("rust-md-5" ,rust-md-5-0.9)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-hmac" ,rust-hmac-0.12)
+        ("rust-md-5" ,rust-md-5-0.10)
         ("rust-memchr" ,rust-memchr-2)
         ("rust-rand" ,rust-rand-0.8)
-        ("rust-sha2" ,rust-sha2-0.9)
+        ("rust-sha2" ,rust-sha2-0.10)
         ("rust-stringprep" ,rust-stringprep-0.1))))
     (home-page "https://github.com/sfackler/rust-postgres")
     (synopsis "Low level Postgres protocol APIs")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 066/117] gnu: rust-postgres-types-0.2: Upgrade to 0.2.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-postgres-types-0.2): Update to
0.2.6.
[cargo-inputs]: Add rust-array-init-2, rust-cidr-0.2, rust-eui48-1,
rust-smol-str-0.1, rust-time-0.3 and rust-uuid-1.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 71ca3aad4a..43367fd7d5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55795,7 +55795,7 @@ (define-public rust-postgres-protocol-0.6
 (define-public rust-postgres-types-0.2
   (package
     (name "rust-postgres-types")
-    (version "0.2.1")
+    (version "0.2.6")
     (source
       (origin
         (method url-fetch)
@@ -55803,15 +55803,17 @@ (define-public rust-postgres-types-0.2
         (file-name
          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "0brsqkydz0grfy60nc1d0hxa9jbpim0c7c52v467nrdpw4ql23s3"))))
+         (base32 "0z5ngy6q5lfy0gf533ka9yrisg9pdcnnv6qaaciva24lxv6k88ld"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-bit-vec" ,rust-bit-vec-0.6)
+       (("rust-array-init" ,rust-array-init-2)
+        ("rust-bit-vec" ,rust-bit-vec-0.6)
         ("rust-bytes" ,rust-bytes-1)
         ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-cidr" ,rust-cidr-0.2)
         ("rust-eui48" ,rust-eui48-0.4)
+        ("rust-eui48" ,rust-eui48-1)
         ("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
         ("rust-geo-types" ,rust-geo-types-0.7)
         ("rust-geo-types" ,rust-geo-types-0.6)
@@ -55819,8 +55821,11 @@ (define-public rust-postgres-types-0.2
         ("rust-postgres-protocol" ,rust-postgres-protocol-0.6)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-smol-str" ,rust-smol-str-0.1)
+        ("rust-time" ,rust-time-0.3)
         ("rust-time" ,rust-time-0.2)
-        ("rust-uuid" ,rust-uuid-0.8))))
+        ("rust-uuid" ,rust-uuid-0.8)
+        ("rust-uuid" ,rust-uuid-1))))
     (home-page "https://github.com/sfackler/rust-postgres")
     (synopsis "Conversions between Rust and Postgres values")
     (description
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 067/117] gnu: Add rust-ulid-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ulid-1): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 43367fd7d5..bd568f6585 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -86194,6 +86194,37 @@ (define-public rust-uint-0.9
 arithmetic.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ulid-1
+  (package
+    (name "rust-ulid")
+    (version "1.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ulid" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0n8jj9gpkli0pxaqnxiivvsn6jlvvcs1yzmm2f4s18jsjqbqqxrl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-postgres-types" ,rust-postgres-types-0.2)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-uuid" ,rust-uuid-1)
+                       ("rust-web-time" ,rust-web-time-1))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher-0.1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/dylanhart/ulid-rs")
+    (synopsis "Universally Unique Lexicographically Sortable Identifier")
+    (description
+     "This package provides a Universally Unique Lexicographically
+Sortable Identifier implementation.")
+    (license license:expat)))
+
 (define-public rust-uluru-3
   (package
     (name "rust-uluru")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 068/117] gnu: Add rust-matrix-sdk-crypto-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-crypto-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bd568f6585..63c57eb989 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41424,6 +41424,69 @@ (define-public rust-matrix-sdk-common-0.7
 used in the @code{matrix-sdk} crates.")
     (license license:asl2.0)))
 
+(define-public rust-matrix-sdk-crypto-0.7
+  (package
+    (name "rust-matrix-sdk-crypto")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-crypto" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02fd03zl2x1dqyp2lk2r7an9x6s9pmq94s4crmiplf5ivsiyrakj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ; missing files
+       #:cargo-inputs (("rust-aes" ,rust-aes-0.8)
+                       ("rust-as-variant" ,rust-as-variant-1)
+                       ("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-bs58" ,rust-bs58-0.5)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-cbc" ,rust-cbc-0.1)
+                       ("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-ctr" ,rust-ctr-0.9)
+                       ("rust-eyeball" ,rust-eyeball-0.8)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-itertools" ,rust-itertools-0.12)
+                       ("rust-matrix-sdk-common" ,rust-matrix-sdk-common-0.7)
+                       ("rust-matrix-sdk-qrcode" ,rust-matrix-sdk-qrcode-0.7)
+                       ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rmp-serde" ,rust-rmp-serde-1)
+                       ("rust-ruma" ,rust-ruma-0.9)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-ulid" ,rust-ulid-1)
+                       ("rust-vodozemac" ,rust-vodozemac-0.5)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-indoc" ,rust-indoc-2)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-olm-rs" ,rust-olm-rs-2)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-stream-assert" ,rust-stream-assert-0.1)
+        ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Matrix encryption library")
+    (description "This package provides a matrix encryption library.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-qrcode-0.7
   (package
     (name "rust-matrix-sdk-qrcode")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 069/117] gnu: Add rust-matrix-sdk-store-encryption-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-store-encryption-0.7): Add
variable.

Change-Id: I1279d9c8e0ca58d07a771c74e9e258d15f97c335
---
 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 63c57eb989..2e808d9800 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41514,6 +41514,39 @@ (define-public rust-matrix-sdk-qrcode-0.7
 interactive verifications in Matrix land.")
     (license license:asl2.0)))
 
+(define-public rust-matrix-sdk-store-encryption-0.7
+  (package
+    (name "rust-matrix-sdk-store-encryption")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-store-encryption" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0756z9ippsfpcazki5w9r3g9gxkm8wdg0vdlgb2s90prx5i32zka"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-blake3" ,rust-blake3-1)
+                       ("rust-chacha20poly1305" ,rust-chacha20poly1305-0.10)
+                       ("rust-displaydoc" ,rust-displaydoc-0.2)
+                       ("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rmp-serde" ,rust-rmp-serde-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Helpers for encrypted storage keys for the Matrix SDK")
+    (description "This package provides helpers for encrypted storage
+keys for the Matrix SDK.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-test-0.7
   (package
     (name "rust-matrix-sdk-test")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 070/117] gnu: Add rust-matrix-sdk-base-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-base-0.7): Add variable.

Change-Id: I09bf97dcb3b7d40f43d007bb178dfd9548807622
---
 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 2e808d9800..3d61766b78 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41382,6 +41382,57 @@ (define-public rust-matrix-pickle-derive-0.1
      "This package provides Derive support for @code{matrix-pickle}.")
     (license license:expat)))
 
+(define-public rust-matrix-sdk-base-0.7
+  (package
+    (name "rust-matrix-sdk-base")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-base" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "11qcrwqhv5w2sbcya6sc4cx00xj1lsy6rx1hs7qr8sl2s1a1k280"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-as-variant" ,rust-as-variant-1)
+        ("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-bitflags" ,rust-bitflags-2)
+        ("rust-eyeball" ,rust-eyeball-0.8)
+        ("rust-eyeball-im" ,rust-eyeball-im-0.4)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-matrix-sdk-common" ,rust-matrix-sdk-common-0.7)
+        ("rust-matrix-sdk-crypto" ,rust-matrix-sdk-crypto-0.7)
+        ("rust-matrix-sdk-store-encryption" ,rust-matrix-sdk-store-encryption-0.7)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-assign" ,rust-assign-1)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-stream-assert" ,rust-stream-assert-0.1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Base component to build a Matrix client library")
+    (description
+      "This package provides the base component to build a Matrix client
+library.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-common-0.7
   (package
     (name "rust-matrix-sdk-common")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 071/117] gnu: Add rust-macroific-attr-parse-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-macroific-attr-parse-1): Add
variable.

Change-Id: Ica78be90e7a10262b25d037a24e5513fef746a32
---
 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 3d61766b78..867bcf32f2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40663,6 +40663,29 @@ (define-public rust-macro-attr-0.2
 `custom_derive` crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-macroific-attr-parse-1
+  (package
+    (name "rust-macroific-attr-parse")
+    (version "1.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "macroific_attr_parse" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0rrgdbj4a8xnyb0giwv12vcnld0914s05b910vhyc2mkjpddb57x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Alorel/macroific-rs")
+    (synopsis "Attribute parsing utilities for the macroific crate")
+    (description "This package provides attribute parsing utilities for
+the macroific crate.")
+    (license license:asl2.0)))
+
 (define-public rust-macrotest-1
   (package
     (name "rust-macrotest")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 072/117] gnu: Add rust-macroific-core-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-macroific-core-1): Add variable.

Change-Id: If66230c66db3b3fff3fb9a601b65c0b40400bd68
---
 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 867bcf32f2..9ac25b013e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40686,6 +40686,28 @@ (define-public rust-macroific-attr-parse-1
 the macroific crate.")
     (license license:asl2.0)))
 
+(define-public rust-macroific-core-1
+  (package
+    (name "rust-macroific-core")
+    (version "1.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "macroific_core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0may8c4ryb3khm0bsplpnwr9k5idcx3zjgybbib7l2b41098q68k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Alorel/macroific-rs")
+    (synopsis "Shared functionality for macroific & macroific_macro")
+    (description "This package provides shared functionality for
+macroific and macroific_macro.")
+    (license license:asl2.0)))
+
 (define-public rust-macrotest-1
   (package
     (name "rust-macrotest")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 073/117] gnu: Add rust-macroific-macro-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-macroific-macro-1): Add variable.

Change-Id: I27ed29c252a340c5580e486b437cc58bf79e785c
---
 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 9ac25b013e..07ab45f786 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40708,6 +40708,31 @@ (define-public rust-macroific-core-1
 macroific and macroific_macro.")
     (license license:asl2.0)))
 
+(define-public rust-macroific-macro-1
+  (package
+    (name "rust-macroific-macro")
+    (version "1.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "macroific_macro" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1bpmc4dy16v0pw0jmp68cpn1ndlvbzlzwffw84g7zvfb8cqqbjdh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-macroific-attr-parse" ,rust-macroific-attr-parse-1)
+        ("rust-macroific-core" ,rust-macroific-core-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Alorel/macroific-rs")
+    (synopsis "Proc macros for the macroific crate")
+    (description "This package provides proc macros for the macroific
+crate.")
+    (license license:asl2.0)))
+
 (define-public rust-macrotest-1
   (package
     (name "rust-macrotest")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 074/117] gnu: Add rust-macroific-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-macroific-1): Add variable.

Change-Id: I167467bdaacc9348b3034dd79883c0294db89d51
---
 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 07ab45f786..26d80a54c9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40663,6 +40663,35 @@ (define-public rust-macro-attr-0.2
 `custom_derive` crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-macroific-1
+  (package
+    (name "rust-macroific")
+    (version "1.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "macroific" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1pdr66v1q80w6ixihag432dg1mwp1ld44z0405fn48k0b6n00p7h"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-macroific-attr-parse" ,rust-macroific-attr-parse-1)
+        ("rust-macroific-core" ,rust-macroific-core-1)
+        ("rust-macroific-macro" ,rust-macroific-macro-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                                   ("rust-quote" ,rust-quote-1)
+                                   ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Alorel/macroific-rs")
+    (synopsis "Proc macro development utilities")
+    (description
+     "This package provides proc macro development utilities.")
+    (license license:asl2.0)))
+
 (define-public rust-macroific-attr-parse-1
   (package
     (name "rust-macroific-attr-parse")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 075/117] gnu: Add rust-accessory-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-accessory-1): Add variable.

Change-Id: Ia5b35724c32b0d3b9a93552e89ce58ccafef829f
---
 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 26d80a54c9..6a24c0d68d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -389,6 +389,29 @@ (define-public rust-abomonation-0.7
 library in Rust.")
     (license license:expat)))
 
+(define-public rust-accessory-1
+  (package
+    (name "rust-accessory")
+    (version "1.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "accessory" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02sfmgmr4fpgh4y24gn3dp7y99r5dnnk07dppd7p816wp4sba2w5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-macroific" ,rust-macroific-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Alorel/accessory-rs")
+    (synopsis "Configurable get/set/get_mut derive macro")
+    (description
+     "This package provides a configurable get/set/get_mut derive macro.")
+    (license license:asl2.0)))
+
 (define-public rust-adaptive-barrier-1
   (package
     (name "rust-adaptive-barrier")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 076/117] gnu: Add rust-delegate-display-2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-delegate-display-2): Add variable.

Change-Id: I68de143a396e2a30e1b5a60a4c49db17516b5c44
---
 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 6a24c0d68d..1001cb46bc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20262,6 +20262,32 @@ (define-public rust-dejavu-2
      "This package provides the @code{DejaVu} font family for embedding.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-delegate-display-2
+  (package
+    (name "rust-delegate-display")
+    (version "2.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "delegate-display" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0rndsj11q9kl8q42blvvlhly3dfh6rp25xmv3742l51ky80m5a4q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-macroific" ,rust-macroific-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs
+       (("rust-static-assertions" ,rust-static-assertions-1))))
+    (home-page "https://github.com/Alorel/delegate-display-rs")
+    (synopsis "derive(Display, Debug) for structs/enums with one member")
+    (description
+      "This package provides derive(Display, Debug) for structs/enums
+with one member.")
+    (license license:expat)))
+
 (define-public rust-demo-hack-0.0
   (package
     (name "rust-demo-hack")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 077/117] gnu: Add rust-fancy-constructor-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-fancy-constructor-1): Add variable.

Change-Id: I6e42e7ee6583cd9792bf6ad4bd036dba93a78edd
---
 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 1001cb46bc..4f2e3e7f06 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25562,6 +25562,30 @@ (define-public rust-fallible-streaming-iterator-0.1
     (description "Fallible streaming iteration")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-fancy-constructor-1
+  (package
+    (name "rust-fancy-constructor")
+    (version "1.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fancy_constructor" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dcllqf8hj7yn8fxyi91kn3v3i7aa861kb4gc27jyfzp99z327zp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-macroific" ,rust-macroific-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Alorel/fancy_constructor-rs.git")
+    (synopsis "Derive a highly configurable constructor for your struct")
+    (description
+      "This package lets you derive a highly configurable constructor for
+your struct.")
+    (license license:asl2.0)))
+
 (define-public rust-fancy-regex-0.13
   (package
     (name "rust-fancy-regex")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 078/117] gnu: Add rust-indexed-db-futures-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-indexed-db-futures-0.4): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4f2e3e7f06..0b4c0bfcb6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33524,6 +33524,37 @@ (define-public rust-indenter-0.3
 that efficiently appends and removes common indentation after every newline.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-indexed-db-futures-0.4
+  (package
+    (name "rust-indexed-db-futures")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "indexed_db_futures" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0lhiixh3i8iphxda58cp3zfx4989q817r2xbhliy0bjpc0vhihkc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-accessory" ,rust-accessory-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-delegate-display" ,rust-delegate-display-2)
+        ("rust-fancy-constructor" ,rust-fancy-constructor-1)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-uuid" ,rust-uuid-1)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
+        ("rust-web-sys" ,rust-web-sys-0.3))
+       #:cargo-development-inputs
+       (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/Alorel/rust-indexed-db")
+    (synopsis "Future bindings for IndexedDB via web_sys")
+    (description "This package provides future bindings for
+@code{IndexedDB} via web_sys.")
+    (license license:expat)))
+
 (define-public rust-indexmap-2
   (package
     (name "rust-indexmap")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 079/117] gnu: Add rust-serde-wasm-bindgen-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serde-wasm-bindgen-0.6): Add
variable.
(rust-serde-wasm-bindgen-0.3): Inherit from rust-serde-wasm-bindgen-0.6.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0b4c0bfcb6..3f300927cd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70590,8 +70590,40 @@ (define-public rust-serde-value-0.7
 for later processing.")
     (license license:expat)))
 
+(define-public rust-serde-wasm-bindgen-0.6
+  (package
+    (name "rust-serde-wasm-bindgen")
+    (version "0.6.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serde-wasm-bindgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cpik86f5vsyms0jhm553p7w55f2lnyvnnv6ja6izbhk0pvi7dxr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ; needs wasm target
+       #:cargo-inputs (("rust-js-sys" ,rust-js-sys-0.3)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-maplit" ,rust-maplit-1)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/RReverser/serde-wasm-bindgen")
+    (synopsis "Native Serde adapter for wasm-bindgen")
+    (description
+      "This package provides a native Serde adapter for wasm-bindgen.")
+    (license license:expat)))
+
 (define-public rust-serde-wasm-bindgen-0.3
   (package
+    (inherit rust-serde-wasm-bindgen-0.6)
     (name "rust-serde-wasm-bindgen")
     (version "0.3.1")
     (source
@@ -70601,7 +70633,6 @@ (define-public rust-serde-wasm-bindgen-0.3
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1xzh1a3rhapirlca4rbvh6bycphxg5yjmdwjsqij3hl6wpl6b0v1"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-fnv" ,rust-fnv-1)
@@ -70613,11 +70644,7 @@ (define-public rust-serde-wasm-bindgen-0.3
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-bytes" ,rust-serde-bytes-0.11)
         ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
-    (home-page "https://github.com/cloudflare/serde-wasm-bindgen")
-    (synopsis "Native Serde adapter for wasm-bindgen")
-    (description "Native Serde adapter for wasm-bindgen.")
-    (license license:expat)))
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))))
 
 (define-public rust-serde-with-3
   (package
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 080/117] gnu: Add rust-gloo-utils-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-gloo-utils-0.2): Add variable.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 940662b3ae..7903d85e12 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -2334,6 +2334,33 @@ (define-public rust-gemini-fetch-0.2
     (description "This package provides a library to fetch gemini pages.")
     (license license:expat)))
 
+(define-public rust-gloo-utils-0.2
+  (package
+    (name "rust-gloo-utils")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gloo-utils" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1am31cd6889shb7158bg9zzsjcpvyzxrhfhxgia8rc8k84smam8b"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-js-sys" ,rust-js-sys-0.3)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+                       ("rust-web-sys" ,rust-web-sys-0.3))
+       #:cargo-development-inputs
+       (("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/rustwasm/gloo")
+    (synopsis "Common `web_sys` features")
+    (description
+      "This package is a convenience crate for common `web_sys` features.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-h2-0.4
   (package
     (name "rust-h2")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 081/117] gnu: Add rust-matrix-sdk-indexeddb-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-indexeddb-0.7): Add
variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3f300927cd..ce60ac915a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33537,7 +33537,8 @@ (define-public rust-indexed-db-futures-0.4
         (base32 "0lhiixh3i8iphxda58cp3zfx4989q817r2xbhliy0bjpc0vhihkc"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:cargo-test-flags `("--release" "--all-targets")
+       #:cargo-inputs
        (("rust-accessory" ,rust-accessory-1)
         ("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-delegate-display" ,rust-delegate-display-2)
@@ -41741,6 +41742,55 @@ (define-public rust-matrix-sdk-crypto-0.7
     (description "This package provides a matrix encryption library.")
     (license license:asl2.0)))
 
+(define-public rust-matrix-sdk-indexeddb-0.7
+  (package
+    (name "rust-matrix-sdk-indexeddb")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-indexeddb" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12x5si7148a7a3rgbfjimghz81m6gym54pa0izrjzvflql2q0f5d"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-gloo-utils" ,rust-gloo-utils-0.2)
+        ("rust-indexed-db-futures" ,rust-indexed-db-futures-0.4)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-matrix-sdk-crypto" ,rust-matrix-sdk-crypto-0.7)
+        ("rust-matrix-sdk-store-encryption"
+         ,rust-matrix-sdk-store-encryption-0.7)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-wasm-bindgen" ,rust-serde-wasm-bindgen-0.6)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-web-sys" ,rust-web-sys-0.3))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-matrix-sdk-common" ,rust-matrix-sdk-common-0.7)
+        ("rust-matrix-sdk-crypto" ,rust-matrix-sdk-crypto-0.7)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-uuid" ,rust-uuid-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Web's IndexedDB Storage backend for matrix-sdk")
+    (description "Web's @code{IndexedDB} Storage backend for matrix-sdk")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-qrcode-0.7
   (package
     (name "rust-matrix-sdk-qrcode")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 082/117] gnu: rust-sqlite3-parser-0.12: Remove duplicate dependency.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-sqlite3-parser-0.12): Fix dependency
and line length.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ce60ac915a..ade50303c8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -74379,12 +74379,14 @@ (define-public rust-sqlite3-parser-0.12
                        ("rust-phf-codegen" ,rust-phf-codegen-0.11)
                        ("rust-phf-shared" ,rust-phf-shared-0.11)
                        ("rust-smallvec" ,rust-smallvec-1)
-                       ("rust-uncased" ,rust-uncased-0.9)
+                       ;; TODO: do not add normal+build dependency twice.
                        ("rust-uncased" ,rust-uncased-0.9))
-       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10))))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.10))))
     (home-page "https://github.com/gwenn/lemon-rs")
     (synopsis "SQL parser (as understood by SQLite)")
-    (description "This package provides an SQL parser (as understood by SQLite).")
+    (description
+      "This package provides an SQL parser (as understood by SQLite).")
     (license (list license:asl2.0 license:expat))))
 
 (define-public rust-sqlite3-src-0.5
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 083/117] gnu: Add rust-deadpool-0.10.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-deadpool-0.10): Add variable.
(rust-deadpool-0.9): Inherit from rust-deadpool-0.10.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ade50303c8..d9eef931c3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19738,22 +19738,23 @@ (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-deadpool-0.9
+(define-public rust-deadpool-0.10
   (package
     (name "rust-deadpool")
-    (version "0.9.5")
+    (version "0.10.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "deadpool" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0vl5qg5pfx0c9c41g299clfdgz9la6z8361aycb21cia1zwy07s2"))))
+        (base32 "145lq79dlc4jn7jvlcf4lb105bs3z3jy6g7d15zv7iy1g04i117v"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
                        ("rust-deadpool-runtime" ,rust-deadpool-runtime-0.1)
                        ("rust-num-cpus" ,rust-num-cpus-1)
+                       ;; Needed by rust-deadpool-0.9.
                        ("rust-retain-mut" ,rust-retain-mut-0.1)
                        ("rust-serde" ,rust-serde-1)
                        ("rust-tokio" ,rust-tokio-1))
@@ -19769,6 +19770,19 @@ (define-public rust-deadpool-0.9
 of any type.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-deadpool-0.9
+  (package
+    (inherit rust-deadpool-0.10)
+    (name "rust-deadpool")
+    (version "0.9.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "deadpool" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vl5qg5pfx0c9c41g299clfdgz9la6z8361aycb21cia1zwy07s2"))))))
+
 (define-public rust-deadpool-0.7
   (package
     (inherit rust-deadpool-0.9)
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 084/117] gnu: Add rust-deadpool-sqlite-0.7.

[Herman Rimm via Guix-patches via]

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

Change-Id: I7d7d34de137e36a7adefcd88e31adf2dad28154e
---
 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 d9eef931c3..ff417010cd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19826,6 +19826,34 @@ (define-public rust-deadpool-runtime-0.1
 for sync managers.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-deadpool-sqlite-0.7
+  (package
+    (name "rust-deadpool-sqlite")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "deadpool-sqlite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b621w3hl1ay39c6kp80lzcymbi0mys7ir558cjy4frgw4v0w0dq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags `("--release" "--all-targets")
+       #:cargo-inputs (("rust-deadpool" ,rust-deadpool-0.10)
+                       ("rust-deadpool-sync" ,rust-deadpool-sync-0.1)
+                       ("rust-rusqlite" ,rust-rusqlite-0.30)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-config" ,rust-config-0.13)
+                                   ("rust-dotenv" ,rust-dotenv-0.15)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (inputs (list sqlite))
+    (home-page "https://github.com/bikeshedder/deadpool")
+    (synopsis "Dead simple async pool for rusqlite")
+    (description
+      "This package provides dead simple async pool for rusqlite.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-deadpool-sync-0.1
   (package
     (name "rust-deadpool-sync")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 085/117] gnu: Add rust-matrix-sdk-sqlite-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-sqlite-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ff417010cd..19f6edcfbc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41860,6 +41860,52 @@ (define-public rust-matrix-sdk-qrcode-0.7
 interactive verifications in Matrix land.")
     (license license:asl2.0)))
 
+(define-public rust-matrix-sdk-sqlite-0.7
+  (package
+    (name "rust-matrix-sdk-sqlite")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-sqlite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1p0ivgb7p9l3v1fxhhw798mxb5k18qkvlhmj2qsxkv57byy3dg90"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-deadpool-sqlite" ,rust-deadpool-sqlite-0.7)
+        ("rust-itertools" ,rust-itertools-0.12)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-matrix-sdk-crypto" ,rust-matrix-sdk-crypto-0.7)
+        ("rust-matrix-sdk-store-encryption"
+         ,rust-matrix-sdk-store-encryption-0.7)
+        ("rust-rmp-serde" ,rust-rmp-serde-1)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-rusqlite" ,rust-rusqlite-0.30)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-vodozemac" ,rust-vodozemac-0.5))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-glob" ,rust-glob-0.3)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-matrix-sdk-crypto" ,rust-matrix-sdk-crypto-0.7)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-tokio" ,rust-tokio-1))))
+    (inputs (list sqlite))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "Sqlite storage backend for matrix-sdk")
+    (description
+     "This package provides an sqlite storage backend for matrix-sdk.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-store-encryption-0.7
   (package
     (name "rust-matrix-sdk-store-encryption")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 086/117] gnu: Add rust-mime2ext-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-mime2ext-0.1): Add variable.

Change-Id: Ib07eb54111ea5bf1f04b3283b0523efc53565e2f
---
 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 19f6edcfbc..59768ab01a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -43223,6 +43223,24 @@ (define-public rust-mime-guess-1
         ("rust-phf-codegen" ,rust-phf-codegen-0.7)
         ("rust-unicase" ,rust-unicase-1))))))
 
+(define-public rust-mime2ext-0.1
+  (package
+    (name "rust-mime2ext")
+    (version "0.1.52")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mime2ext" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0w2cb2nmfnj7npkn1kvy1pcyknxdh7676mwqn5j0xm7bd585ma51"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/blyxxyz/mime2ext")
+    (synopsis "Given a mimetype, suggest a file extension")
+    (description
+      "This package provides file extension suggestions for given mimetypes.")
+    (license license:expat)))
+
 (define-public rust-miniflux-api-0.3
   (package
     (name "rust-miniflux-api")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 087/117] gnu: Add rust-matrix-sdk-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 59768ab01a..f45191e953 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41628,6 +41628,95 @@ (define-public rust-matrix-pickle-derive-0.1
      "This package provides Derive support for @code{matrix-pickle}.")
     (license license:expat)))
 
+(define-public rust-matrix-sdk-0.7
+  (package
+    (name "rust-matrix-sdk")
+    (version "0.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1v22ssxamvkigwx35a5igw60k8z9cy59h7k864d6ccwbzkjqfrik"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-anymap2" ,rust-anymap2-0.13)
+        ("rust-aquamarine" ,rust-aquamarine-0.5)
+        ("rust-as-variant" ,rust-as-variant-1)
+        ("rust-async-channel" ,rust-async-channel-2)
+        ("rust-async-stream" ,rust-async-stream-0.3)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-backoff" ,rust-backoff-0.4)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-bytesize" ,rust-bytesize-1)
+        ("rust-cfg-vis" ,rust-cfg-vis-0.3)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-event-listener" ,rust-event-listener-4)
+        ("rust-eyeball" ,rust-eyeball-0.8)
+        ("rust-eyeball-im" ,rust-eyeball-im-0.4)
+        ("rust-eyeball-im-util" ,rust-eyeball-im-util-0.5)
+        ("rust-eyre" ,rust-eyre-0.6)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-gloo-timers" ,rust-gloo-timers-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-image" ,rust-image-0.24)
+        ("rust-imbl" ,rust-imbl-2)
+        ("rust-indexmap" ,rust-indexmap-2)
+        ("rust-language-tags" ,rust-language-tags-0.3)
+        ("rust-mas-oidc-client" ,rust-mas-oidc-client-0.7)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-matrix-sdk-common" ,rust-matrix-sdk-common-0.7)
+        ("rust-matrix-sdk-indexeddb" ,rust-matrix-sdk-indexeddb-0.7)
+        ("rust-matrix-sdk-sqlite" ,rust-matrix-sdk-sqlite-0.7)
+        ("rust-mime" ,rust-mime-0.3)
+        ("rust-mime2ext" ,rust-mime2ext-0.1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-html-form" ,rust-serde-html-form-0.2)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+        ("rust-tokio-util" ,rust-tokio-util-0.7)
+        ("rust-tower" ,rust-tower-0.4)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-url" ,rust-url-2)
+        ("rust-urlencoding" ,rust-urlencoding-2)
+        ("rust-uuid" ,rust-uuid-1)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-assert-json-diff" ,rust-assert-json-diff-2)
+        ("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-dirs" ,rust-dirs-5)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
+        ("rust-stream-assert" ,rust-stream-assert-0.1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
+        ("rust-wiremock" ,rust-wiremock-0.5))))
+    (inputs (list openssl sqlite))
+    (native-inputs (list pkg-config))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "High level Matrix client-server library")
+    (description
+     "This package provides a high level Matrix client-server library.")
+    (license license:asl2.0)))
+
 (define-public rust-matrix-sdk-base-0.7
   (package
     (name "rust-matrix-sdk-base")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 088/117] gnu: Add rust-oneshot-uniffi-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-oneshot-uniffi-0.1): Add variable.

Change-Id: I4396a88b687af2ef9e546f4d073cf4a1be0f8f36
---
 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 f45191e953..1abf4f7bd0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49561,6 +49561,35 @@ (define-public rust-once-cell-1
 contents.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-oneshot-uniffi-0.1
+  (package
+    (name "rust-oneshot-uniffi")
+    (version "0.1.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "oneshot-uniffi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "175j04f7rpgy552h5m51ywq7184cqhcfs31dsxanjvwpg1f8sm3c"))
+       (modules '((guix build utils)))
+       (snippet '(substitute* (find-files ".")
+                   (("oneshot::")
+                    "oneshot_uniffi::")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-async-std" ,rust-async-std-1)
+                                   ("rust-criterion" ,rust-criterion-0.3)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/faern/oneshot")
+    (synopsis
+     "Patched version of oneshot specifically for the UniFFI project.")
+    (description
+     "This package provides a patched version of oneshot specifically for
+the @code{UniFFI} project.  This removes the `loom` target and dependency
+which helps with @code{UniFFI's} downstream consumers.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-onig-6
   (package
     (name "rust-onig")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 089/117] gnu: Add rust-uniffi-core-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-core-0.25): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1abf4f7bd0..a6c35f7cd2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -87657,6 +87657,37 @@ (define-public rust-unidecode-0.3
      "This package provides pure ASCII transliterations of Unicode strings.")
     (license license:bsd-3)))
 
+(define-public rust-uniffi-core-0.25
+  (package
+    (name "rust-uniffi-core")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nxd3z5290w3spzd109j232l69iwd2rx4bfij36na5mglcks28b1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-async-compat" ,rust-async-compat-0.2)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-camino" ,rust-camino-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-oneshot-uniffi" ,rust-oneshot-uniffi-0.1)
+        ("rust-paste" ,rust-paste-1)
+        ("rust-static-assertions" ,rust-static-assertions-1))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis
+      "Runtime support code for uniffi, a language bindings generator")
+    (description
+     "This package provides runtime support code for uniffi: a multi-
+language bindings generator for Rust.")
+    (license license:mpl2.0)))
+
 (define-public rust-unindent-0.2
   (package
     (name "rust-unindent")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 090/117] gnu: Add rust-uniffi-checksum-derive-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-checksum-derive-0.25): Add
variable.

Change-Id: I85834ff0f83bf71bb35f8a7df7d18eb35395d15d
---
 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 a6c35f7cd2..b4160e392d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -87657,6 +87657,28 @@ (define-public rust-unidecode-0.3
      "This package provides pure ASCII transliterations of Unicode strings.")
     (license license:bsd-3)))
 
+(define-public rust-uniffi-checksum-derive-0.25
+  (package
+    (name "rust-uniffi-checksum-derive")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_checksum_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b00ld4k1riwq445ghw95rsq3hxxc7x6cpcqzlq96bbi5w97q4sm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "Checksum custom derive for uniffi")
+    (description
+     "This package provides a checksum custom derive for uniffi: a multi-
+language bindings generator for Rust.")
+    (license license:mpl2.0)))
+
 (define-public rust-uniffi-core-0.25
   (package
     (name "rust-uniffi-core")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 091/117] gnu: Add rust-uniffi-meta-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-meta-0.25): Add variable.

Change-Id: Ib787259564adec446321d5cecf0e0ca41414b45b
---
 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 b4160e392d..290ace9fbd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -87710,6 +87710,29 @@ (define-public rust-uniffi-core-0.25
 language bindings generator for Rust.")
     (license license:mpl2.0)))
 
+(define-public rust-uniffi-meta-0.25
+  (package
+    (name "rust-uniffi-meta")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_meta" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18hp6jnk8dhv3w92bia06k0bygi7i14a6v9xciqlpb5ilxrqbp3i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-siphasher" ,rust-siphasher-0.3)
+        ("rust-uniffi-checksum-derive" ,rust-uniffi-checksum-derive-0.25))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "Metadata for uniffi")
+    (description "This package provides metadata for uniffi.")
+    (license license:mpl2.0)))
+
 (define-public rust-unindent-0.2
   (package
     (name "rust-unindent")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 092/117] gnu: Add rust-uniffi-testing-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-testing-0.25): Add variable.

Change-Id: Iac02d49084be4e185cacf527e4c23e8e0d82deb5
---
 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 290ace9fbd..afc75a0bc4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -87733,6 +87733,30 @@ (define-public rust-uniffi-meta-0.25
     (description "This package provides metadata for uniffi.")
     (license license:mpl2.0)))
 
+(define-public rust-uniffi-testing-0.25
+  (package
+    (name "rust-uniffi-testing")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_testing" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0g7jv7w979n43nkmkrjk6w9f1drsjgxhalwcpvfpddpwpzg4i10i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-camino" ,rust-camino-1)
+                       ("rust-cargo-metadata" ,rust-cargo-metadata-0.15)
+                       ("rust-fs-err" ,rust-fs-err-2)
+                       ("rust-once-cell" ,rust-once-cell-1))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "Testing helpers for uniffi")
+    (description
+     "This package provides testing helpers for uniffi.")
+    (license license:mpl2.0)))
+
 (define-public rust-unindent-0.2
   (package
     (name "rust-unindent")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 093/117] gnu: Add rust-weedle2-4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-weedle2-4): Add variable.

Change-Id: I5fa4769fd2b986c555e1d2441612e631bb87b645
---
 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 afc75a0bc4..4d43256e77 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -90705,6 +90705,26 @@ (define-public rust-wee-alloc-0.4
     (description "wee_alloc: The Wasm-Enabled, Elfin Allocator.")
     (license license:mpl2.0)))
 
+(define-public rust-weedle2-4
+  (package
+    (name "rust-weedle2")
+    (version "4.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "weedle2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hbph2pwmwvkn6lcbrpjc24j5r2y0aaxnjyndwqa4hqzdqhcay9f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-nom" ,rust-nom-7))
+       #:cargo-development-inputs (("rust-fs-err" ,rust-fs-err-2))))
+    (home-page "https://github.com/mozilla/uniffi-rs/tree/main/weedle2")
+    (synopsis "WebIDL parser")
+    (description "This package provides a @code{WebIDL} parser.")
+    (license license:expat)))
+
 (define-public rust-weezl-0.1
   (package
     (name "rust-weezl")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 094/117] gnu: Add rust-uniffi-udl-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-udl-0.25): Add variable.

Change-Id: Ifc7822e7b07fc57c71a01c8da7c5dc7e17a40807
---
 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 4d43256e77..97955f5d6e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -87757,6 +87757,29 @@ (define-public rust-uniffi-testing-0.25
      "This package provides testing helpers for uniffi.")
     (license license:mpl2.0)))
 
+(define-public rust-uniffi-udl-0.25
+  (package
+    (name "rust-uniffi-udl")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_udl" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hx14kfd3m0vxzsvshfid0s6njpp1h3v9sak1sz8l1y615qxp7l8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-uniffi-meta" ,rust-uniffi-meta-0.25)
+                       ("rust-uniffi-testing" ,rust-uniffi-testing-0.25)
+                       ("rust-weedle2" ,rust-weedle2-4))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "UDL parsing for the uniffi project")
+    (description
+      "This package provides UDL parsing for the uniffi project.")
+    (license license:mpl2.0)))
+
 (define-public rust-unindent-0.2
   (package
     (name "rust-unindent")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 095/117] gnu: Add rust-uniffi-bindgen-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-bindgen-0.25): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 97955f5d6e..d96518c128 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -87657,6 +87657,45 @@ (define-public rust-unidecode-0.3
      "This package provides pure ASCII transliterations of Unicode strings.")
     (license license:bsd-3)))
 
+(define-public rust-uniffi-bindgen-0.25
+  (package
+    (name "rust-uniffi-bindgen")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_bindgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0h39vsp2qpw9qxna9fdk3h0agmz35vzixbvmb2fq4lx054ljz6gx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--" ; missing file
+         "--skip=test::test_guessing_of_crate_root_directory_from_udl_file")
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-askama" ,rust-askama-0.12)
+                       ("rust-camino" ,rust-camino-1)
+                       ("rust-cargo-metadata" ,rust-cargo-metadata-0.15)
+                       ("rust-clap" ,rust-clap-4)
+                       ("rust-fs-err" ,rust-fs-err-2)
+                       ("rust-glob" ,rust-glob-0.3)
+                       ("rust-goblin" ,rust-goblin-0.6)
+                       ("rust-heck" ,rust-heck-0.4)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-paste" ,rust-paste-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-toml" ,rust-toml-0.5)
+                       ("rust-uniffi-meta" ,rust-uniffi-meta-0.25)
+                       ("rust-uniffi-testing" ,rust-uniffi-testing-0.25)
+                       ("rust-uniffi-udl" ,rust-uniffi-udl-0.25))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "Codegen and CLI tooling for uniffi")
+    (description
+     "This package provides code generation and CLI tooling for uniffi:
+a multi-language bindings generator for Rust.")
+    (license license:mpl2.0)))
+
 (define-public rust-uniffi-checksum-derive-0.25
   (package
     (name "rust-uniffi-checksum-derive")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 096/117] gnu: Add rust-uniffi-build-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-build-0.25): Add variable.

Change-Id: I3870708c9bc9ba991adb0d4655146b229eb2bc93
---
 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 d96518c128..b396f0d0e3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -87696,6 +87696,27 @@ (define-public rust-uniffi-bindgen-0.25
 a multi-language bindings generator for Rust.")
     (license license:mpl2.0)))
 
+(define-public rust-uniffi-build-0.25
+  (package
+    (name "rust-uniffi-build")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_build" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1sbl3jipbl9jpfb5xdi7pjcnchn3z6n7bbrs9c401ml26vfn8680"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-camino" ,rust-camino-1)
+                       ("rust-uniffi-bindgen" ,rust-uniffi-bindgen-0.25))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "Build script helpers for uniffi")
+    (description "This package provides build script helpers for uniffi.")
+    (license license:mpl2.0)))
+
 (define-public rust-uniffi-checksum-derive-0.25
   (package
     (name "rust-uniffi-checksum-derive")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 097/117] gnu: Add rust-uniffi-macros-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-macros-0.25): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b396f0d0e3..79d2c4fe38 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -87770,6 +87770,37 @@ (define-public rust-uniffi-core-0.25
 language bindings generator for Rust.")
     (license license:mpl2.0)))
 
+(define-public rust-uniffi-macros-0.25
+  (package
+    (name "rust-uniffi-macros")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1r4j5qwwbvx0x8rkmvzh0y37924vk4vs0zmplnpyvz01y5c7mkqi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bincode" ,rust-bincode-1)
+                       ("rust-camino" ,rust-camino-1)
+                       ("rust-fs-err" ,rust-fs-err-2)
+                       ("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-syn" ,rust-syn-2)
+                       ("rust-toml" ,rust-toml-0.5)
+                       ("rust-uniffi-build" ,rust-uniffi-build-0.25)
+                       ("rust-uniffi-meta" ,rust-uniffi-meta-0.25))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "UniFFI convenience macros")
+    (description
+     "This package provides convenience macros for UniFFI: a
+multi-language bindings generator for Rust.")
+    (license license:mpl2.0)))
+
 (define-public rust-uniffi-meta-0.25
   (package
     (name "rust-uniffi-meta")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 098/117] gnu: Add rust-uniffi-0.25.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniffi-0.25): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 79d2c4fe38..31d7619de5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -87657,6 +87657,40 @@ (define-public rust-unidecode-0.3
      "This package provides pure ASCII transliterations of Unicode strings.")
     (license license:bsd-3)))
 
+(define-public rust-uniffi-0.25
+  (package
+    (name "rust-uniffi")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uniffi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17wizn2iday1726gnngmn72437mfsi9nrmbzqi4gv4hhsdr52d11"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-camino" ,rust-camino-1)
+                       ("rust-clap" ,rust-clap-4)
+                       ("rust-uniffi-bindgen" ,rust-uniffi-bindgen-0.25)
+                       ("rust-uniffi-build" ,rust-uniffi-build-0.25)
+                       ("rust-uniffi-core" ,rust-uniffi-core-0.25)
+                       ("rust-uniffi-macros" ,rust-uniffi-macros-0.25))
+       #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1))
+       #:phases
+       (modify-phases %standard-phases
+         ;; Actual output has two additional trait bounds.
+         (add-before 'check 'ignore-test
+           (lambda _
+             (setenv "TRYBUILD" "overwrite"))))))
+    (home-page "https://mozilla.github.io/uniffi-rs")
+    (synopsis "Multi-language bindings generator for Rust")
+    (description
+      "This package provides a multi-language bindings generator for
+Rust.")
+    (license license:mpl2.0)))
+
 (define-public rust-uniffi-bindgen-0.25
   (package
     (name "rust-uniffi-bindgen")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 099/117] gnu: Add rust-async-cell-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-async-cell-0.2): Add variable.

Change-Id: I3853fb732bd70f51cb5378b99914c06444a68c78
---
 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 31d7619de5..52ca6df7c3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4769,6 +4769,27 @@ (define-public rust-async-broadcast-0.5
         ("rust-futures-lite" ,rust-futures-lite-1)
         ("rust-futures-util" ,rust-futures-util-0.3))))))
 
+(define-public rust-async-cell-0.2
+  (package
+    (name "rust-async-cell")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async_cell" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1g32g9ybgmnxl4kz44v6wxzbbmp98g69xw2s9lxhl4qqwnffwkl3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-parking-lot" ,rust-parking-lot-0.12))
+       #:cargo-development-inputs (("rust-loom" ,rust-loom-0.5))))
+    (home-page "https://gitlab.com/samsartor/async_cell")
+    (synopsis "Cell<Option<T>> you can await on")
+    (description
+     "This package provides a Cell<Option<T>> that you can await on.")
+    (license license:expat)))
+
 (define-public rust-async-channel-2
   (package
     (name "rust-async-channel")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 100/117] gnu: Add rust-async-rx-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-async-rx-0.1): Add variable.

Change-Id: I7988733ce92750a0062cd8a81437b454f24cf548
---
 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 52ca6df7c3..4fca940845 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5552,6 +5552,33 @@ (define-public rust-async-recursion-1
     (description "This package provides recursion for async functions in Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-async-rx-0.1
+  (package
+    (name "rust-async-rx")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async-rx" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18k88ihl7qkjgnpaxfmpbkm8z4qb1p5acf7pi7ilf2cs6bjy83d3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2))
+       #:cargo-development-inputs
+       (("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-stream-assert" ,rust-stream-assert-0.1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1))))
+    (home-page "https://github.com/jplatte/async-rx")
+    (synopsis "Utility functions for async reactive programming")
+    (description
+      "This package provides utility functions for async reactive
+programming.")
+    (license license:mpl2.0)))
+
 (define-public rust-async-session-3
   (package
     (name "rust-async-session")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 101/117] gnu: Add rust-matrix-sdk-ui-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrix-sdk-ui-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4fca940845..b6621926f9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42128,6 +42128,70 @@ (define-public rust-matrix-sdk-test-macros-0.7
 the Matrix SDK.")
     (license license:asl2.0)))
 
+(define-public rust-matrix-sdk-ui-0.7
+  (package
+    (name "rust-matrix-sdk-ui")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrix-sdk-ui" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16wbz5qianr7awfv4x78ppva7pwwi7rvhvvsci1163gkijygkspp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-as-variant" ,rust-as-variant-1)
+        ("rust-async-once-cell" ,rust-async-once-cell-0.5)
+        ("rust-async-rx" ,rust-async-rx-0.1)
+        ("rust-async-stream" ,rust-async-stream-0.3)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-async-cell" ,rust-async-cell-0.2)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-eyeball" ,rust-eyeball-0.8)
+        ("rust-eyeball-im" ,rust-eyeball-im-0.4)
+        ("rust-eyeball-im-util" ,rust-eyeball-im-util-0.5)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3)
+        ("rust-imbl" ,rust-imbl-2)
+        ("rust-indexmap" ,rust-indexmap-2)
+        ("rust-itertools" ,rust-itertools-0.12)
+        ("rust-matrix-sdk" ,rust-matrix-sdk-0.7)
+        ("rust-matrix-sdk-base" ,rust-matrix-sdk-base-0.7)
+        ("rust-mime" ,rust-mime-0.3)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)
+        ("rust-uniffi" ,rust-uniffi-0.25)
+        ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-assert-json-diff" ,rust-assert-json-diff-2)
+        ("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-assert-matches2" ,rust-assert-matches2-0.1)
+        ("rust-eyeball-im-util" ,rust-eyeball-im-util-0.5)
+        ("rust-matrix-sdk" ,rust-matrix-sdk-0.7)
+        ("rust-matrix-sdk-test" ,rust-matrix-sdk-test-0.7)
+        ("rust-stream-assert" ,rust-stream-assert-0.1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-wiremock" ,rust-wiremock-0.5))))
+    (inputs (list openssl))
+    (native-inputs (list pkg-config))
+    (home-page "https://github.com/matrix-org/matrix-rust-sdk")
+    (synopsis "GUI-centric utilities on top of matrix-rust-sdk.")
+    (description
+     "This package provides experimental GUI-centric utilities on top of
+matrix-rust-sdk.")
+    (license license:asl2.0)))
+
 (define-public rust-matrixcompare-0.3
   (package
     (name "rust-matrixcompare")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 102/117] WIP: gnu: Add rust-sourceview5-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-sourceview5-0.7): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 9c01ce3142..caab0398ac 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3243,6 +3243,35 @@ (define-public rust-soup-sys-0.10
     (description "This crate provides Soup FFI for Rust.")
     (license license:expat)))
 
+(define-public rust-sourceview5-0.7
+  (package
+    (name "rust-sourceview5")
+    (version "0.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sourceview5" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1rcydm2wv1ndsw8b83zqfv5b838cjsr5hxy6bsy4gs8kl5vgkic8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.18)
+                       ("rust-gdk4" ,rust-gdk4-0.7)
+                       ("rust-gio" ,rust-gio-0.18)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-gtk4" ,rust-gtk4-0.7)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango" ,rust-pango-0.18)
+                       ("rust-sourceview5-sys" ,rust-sourceview5-sys-0.7))))
+    (home-page "https://world.pages.gitlab.gnome.org/Rust/sourceview5-rs/")
+    (synopsis "Rust bindings for GtkSourceView 5")
+    (description
+      "This package provides Rust bindings for @code{GtkSourceView} 5.")
+    (license license:expat)))
+
 (define-public rust-webkit2gtk-sys-0.12
   (package
     (name "rust-webkit2gtk-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 103/117] WIP: gnu: Add rust-async-fs-2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-async-fs-2): Add variable.
(rust-async-fs-1): Inherit.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b6621926f9..391815ce34 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5028,8 +5028,33 @@ (define-public rust-async-executor-1
     (description "This library provides async executors.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-async-fs-2
+  (package
+    (name "rust-async-fs")
+    (version "2.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async-fs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jp0p7lg9zqy2djgdmivbzx0yqmfn9sm2s9dkhaws3zlharhkkgb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-lock" ,rust-async-lock-3)
+                       ("rust-blocking" ,rust-blocking-1)
+                       ("rust-futures-lite" ,rust-futures-lite-2))
+       #:cargo-development-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-windows-sys" ,rust-windows-sys-0.52))))
+    (home-page "https://github.com/smol-rs/async-fs")
+    (synopsis "Async filesystem primitives")
+    (description "This package provides async filesystem primitives.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-async-fs-1
   (package
+    (inherit rust-async-fs-2)
     (name "rust-async-fs")
     (version "1.6.0")
     (source
@@ -5039,18 +5064,13 @@ (define-public rust-async-fs-1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "01if2h77mry9cnm91ql2md595108i2c1bfy9gaivzvjfcl2gk717"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-async-lock" ,rust-async-lock-2)
                        ("rust-autocfg" ,rust-autocfg-1)
                        ("rust-blocking" ,rust-blocking-1)
                        ("rust-futures-lite" ,rust-futures-lite-1))
        #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2)
-                                   ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/smol-rs/async-fs")
-    (synopsis "Async filesystem primitives")
-    (description "This package provides async filesystem primitives.")
-    (license (list license:asl2.0 license:expat))))
+                                   ("rust-winapi" ,rust-winapi-0.3))))))
 
 (define-public rust-async-global-executor-2
   (package
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 104/117] WIP: gnu: Add rust-gdk4-wayland-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk4-wayland-0.7): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index caab0398ac..549828b578 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1008,6 +1008,36 @@ (define-public rust-gdk4-sys-0.7
     (description "This package provides FFI bindings of GDK 4.")
     (license license:expat)))
 
+(define-public rust-gdk4-wayland-0.7
+  (package
+    (name "rust-gdk4-wayland")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk4-wayland" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04zkspjs1r6l4gj241p9xm2zmp91phm1khakw5jvsm8yy4pi1f8d"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gdk4" ,rust-gdk4-0.7)
+                       ("rust-gdk4-wayland-sys" ,rust-gdk4-wayland-sys-0.7)
+                       ("rust-gio" ,rust-gio-0.18)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-khronos-egl" ,rust-khronos-egl-5)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-wayland-backend" ,rust-wayland-backend-0.1)
+                       ("rust-wayland-client" ,rust-wayland-client-0.30)
+                       ("rust-xkb" ,rust-xkb-0.3))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+    (home-page "https://gtk-rs.org/gtk4-rs")
+    (synopsis "Rust bindings of the GDK 4 Wayland library")
+    (description
+      "This package provides Rust bindings of the GDK 4 Wayland library.")
+    (license license:expat)))
+
 (define-public rust-gio-0.18
   (package
     (name "rust-gio")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 105/117] WIP: gnu: Add rust-gdk4-x11-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk4-x11-0.7): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 549828b578..b7f311bc53 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1038,6 +1038,34 @@ (define-public rust-gdk4-wayland-0.7
       "This package provides Rust bindings of the GDK 4 Wayland library.")
     (license license:expat)))
 
+(define-public rust-gdk4-x11-0.7
+  (package
+    (name "rust-gdk4-x11")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk4-x11" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0l54c1m0gsdm07drvy171a0i97ic2kygmzf3fjg4da0yxbwbpj98"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gdk4" ,rust-gdk4-0.7)
+                       ("rust-gdk4-x11-sys" ,rust-gdk4-x11-sys-0.7)
+                       ("rust-gio" ,rust-gio-0.18)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-khronos-egl" ,rust-khronos-egl-5)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-x11" ,rust-x11-2))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+    (home-page "https://gtk-rs.org/gtk4-rs")
+    (synopsis "Rust bindings of the GDK4 X11 library")
+    (description
+      "This package provides Rust bindings of the GDK4 X11 library.")
+    (license license:expat)))
+
 (define-public rust-gio-0.18
   (package
     (name "rust-gio")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 106/117] WIP: gnu: Add rust-pipewire-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pipewire-0.7): Add variable.

Change-Id: Iff2f134351ac21f54b13fb737370299449635e00
---
 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 391815ce34..3d0c3448c1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54836,6 +54836,35 @@ (define-public rust-piper-0.1
        #:cargo-development-inputs
        (("rust-futures" ,rust-futures-0.3))))))
 
+(define-public rust-pipewire-0.7
+  (package
+    (name "rust-pipewire")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pipewire" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1sg9cbvhp0s07a337zwli0xm40f8wkvm06d72nsr1s35vp40kl52"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libspa" ,rust-libspa-0.8)
+                       ("rust-libspa-sys" ,rust-libspa-sys-0.8)
+                       ("rust-nix" ,rust-nix-0.26)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-pipewire-sys" ,rust-pipewire-sys-0.8)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs (("rust-clap" ,rust-clap-4)
+                                   ("rust-once-cell" ,rust-once-cell-1))))
+    (home-page "https://pipewire.org")
+    (synopsis "Rust bindings for PipeWire")
+    (description "This package provides Rust bindings for @code{PipeWire}.")
+    (license license:expat)))
+
 (define-public rust-pkg-config-0.3
   (package
     (name "rust-pkg-config")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 107/117] WIP: gnu: Add rust-ashpd-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ashpd-0.6): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3d0c3448c1..a49cd66dff 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4135,6 +4135,49 @@ (define-public rust-ascii-utils-0.9
      "This library provides utilities to handle ASCII characters.")
     (license license:mpl2.0)))
 
+(define-public rust-ashpd-0.6
+  (package
+    (name "rust-ashpd")
+    (version "0.6.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ashpd" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "109d7w6v0rnpy9lv4kmhwgh0sff0440s2vybj1k0ik4ib3d2xhja"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-fs" ,rust-async-fs-2)
+                       ("rust-async-net" ,rust-async-net-2)
+                       ("rust-enumflags2" ,rust-enumflags2-0.7)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gdk4-wayland" ,rust-gdk4-wayland-0.7)
+                       ("rust-gdk4-x11" ,rust-gdk4-x11-0.7)
+                       ("rust-gtk4" ,rust-gtk4-0.7)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-pipewire" ,rust-pipewire-0.7)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-raw-window-handle" ,rust-raw-window-handle-0.5)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-repr" ,rust-serde-repr-0.1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-wayland-backend" ,rust-wayland-backend-0.1)
+                       ("rust-wayland-client" ,rust-wayland-client-0.30)
+                       ("rust-wayland-protocols" ,rust-wayland-protocols-0.30)
+                       ("rust-zbus" ,rust-zbus-3))
+       #:cargo-development-inputs (("rust-byteorder" ,rust-byteorder-1)
+                                   ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/bilelmoussaoui/ashpd")
+    (synopsis "XDG portals wrapper in Rust using zbus")
+    (description
+      "This package provides a XDG portals wrapper in Rust using zbus.")
+    (license license:expat)))
+
 (define-public rust-asio-sys-0.2
   (package
     (name "rust-asio-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 108/117] WIP: gnu: Add rust-djb-hash-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-djb-hash-0.1): Add variable.

Change-Id: I86601bfc37f8803442a6744194c327a7c2c5f478
---
 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 a49cd66dff..2f90e299ac 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22215,6 +22215,25 @@ (define-public rust-divan-macros-0.1
 benchmarking library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-djb-hash-0.1
+  (package
+    (name "rust-djb-hash")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "djb_hash" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0y45y23xlnnskzbprwg4l3bwv21pgzjlfkzjz2db98r7wrhpvkz8"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/Dragonrun1/djb_hash")
+    (synopsis "Commonly used Daniel J. Bernstein style hash functions.")
+    (description
+     "This package provides a Rust library of commonly used Daniel J. Bernstein style
+hash functions.")
+    (license license:bsd-3)))
+
 (define-public rust-dlib-0.5
   (package
     (name "rust-dlib")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 109/117] WIP: gnu: Add rust-geo-uri-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-geo-uri-0.2): Add variable.

Change-Id: I95508240132da18d37dc4ff47acd804491efd455
---
 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 2f90e299ac..587350b36b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29521,6 +29521,31 @@ (define-public rust-geo-types-0.6
        #:cargo-development-inputs
        (("rust-approx" ,rust-approx-0.3))))))
 
+(define-public rust-geo-uri-0.2
+  (package
+    (name "rust-geo-uri")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "geo-uri" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1klragbx8xqx9cairhgcc97ypyf62v41rhaq83zfxmvjrrvyndds"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-derive-builder" ,rust-derive-builder-0.20)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://git.luon.net/paul/geo-uri-rs")
+    (synopsis "Parse and generate URIs for geographic locations")
+    (description
+     "This package provides a crate for parsing and generating Uniform
+Resource Identifiers for geographic locations (geo URIs).")
+    (license license:expat)))
+
 (define-public rust-gethostname-0.4
   (package
     (name "rust-gethostname")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 110/117] WIP: gnu: Add rust-html2pango-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-html2pango-0.6): Add variable.

Change-Id: Ic0f7cd33874cc960fd1afb5fcca7d3cf8b6ceea0
---
 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 587350b36b..efcae7b8de 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32459,6 +32459,35 @@ (define-public rust-html-escape-0.2
 characters in HTML, decoding and unescaping HTML entities as well.")
     (license license:expat)))
 
+(define-public rust-html2pango-0.6
+  (package
+    (name "rust-html2pango")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "html2pango" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06q9r04n2knq0nr8g2xb7n791cg217r1fi59h4zh6f057k663w55"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-ammonia" ,rust-ammonia-3)
+                       ("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-html5ever" ,rust-html5ever-0.26)
+                       ("rust-linkify" ,rust-linkify-0.9)
+                       ("rust-maplit" ,rust-maplit-1)
+                       ("rust-markup5ever-rcdom" ,rust-markup5ever-rcdom-0.2)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-regex" ,rust-regex-1))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://gitlab.gnome.org/World/html2pango")
+    (synopsis "Library to convert html to pango.")
+    (description
+      "This package provides a library to convert html to pango.")
+    (license license:gpl3+)))
+
 (define-public rust-html5ever-0.26
   (package
     (name "rust-html5ever")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 111/117] WIP: gnu: Add rust-html5gum-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-html5gum-0.5): Add variable.

Change-Id: Ib6469bed18f3816d35da293660e680fda3f50d92
---
 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 efcae7b8de..e5b3675e81 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32595,6 +32595,36 @@ (define-public rust-html5ever-0.23
         ("rust-rustc-test" ,rust-rustc-test-0.3)
         ("rust-typed-arena" ,rust-typed-arena-1))))))
 
+(define-public rust-html5gum-0.5
+  (package
+    (name "rust-html5gum")
+    (version "0.5.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "html5gum" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "057zrfis7p567s8d41z04f82idipzdcv125ygc8vln50f5hmakjc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-jetscii" ,rust-jetscii-0.5))
+       #:cargo-development-inputs
+       (("rust-glob" ,rust-glob-0.3)
+        ("rust-iai" ,rust-iai-0.1)
+        ("rust-libtest-mimic" ,rust-libtest-mimic-0.6)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-test-generator" ,rust-test-generator-0.3))))
+    (home-page "https://github.com/untitaker/html5gum")
+    (synopsis "WHATWG-compliant HTML5 tokenizer and tag soup parser.")
+    (description
+     "This package provides a WHATWG-compliant HTML5 tokenizer and tag
+soup parser.")
+    (license license:expat)))
+
 (define-public rust-htmlescape-0.3
   (package
     (name "rust-htmlescape")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 112/117] WIP: gnu: Add rust-libshumate-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-libshumate-0.4): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index b7f311bc53..5c06922856 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2824,6 +2824,31 @@ (define-public rust-libadwaita-sys-0.5
     (description "FFI bindings for libadwaita.")
     (license license:expat)))
 
+(define-public rust-libshumate-0.4
+  (package
+    (name "rust-libshumate")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libshumate" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b8vxpbanfdxgry772rza202w3kgf3x73rr9fzli1gavyxzx4hxp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.18)
+                       ("rust-gdk4" ,rust-gdk4-0.7)
+                       ("rust-gio" ,rust-gio-0.18)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-gtk4" ,rust-gtk4-0.7)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libshumate-sys" ,rust-libshumate-sys-0.4))))
+    (home-page "https://world.pages.gitlab.gnome.org/Rust/libshumate-rs/")
+    (synopsis "Rust bindings for libshumate")
+    (description "This package provides Rust bindings for libshumate.")
+    (license license:expat)))
+
 (define-public rust-pango-0.18
   (package
     (name "rust-pango")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 113/117] WIP: gnu: Add rust-oo7-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-oo7-0.2): Add variable.

Change-Id: I21fdb1cbebbefa00e89b311ae112b473813c8a80
---
 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 e5b3675e81..d8513286fb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49921,6 +49921,53 @@ (define-public rust-onig-sys-69.6
 other crates to create safe wrappers around Oniguruma.")
     (license license:expat)))
 
+(define-public rust-oo7-0.2
+  (package
+    (name "rust-oo7")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "oo7" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13cpaq7f51gqcspd4097vjr7r2cjpxpn6c02x67dsdizk0xaiv5c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-aes" ,rust-aes-0.8)
+                       ("rust-async-fs" ,rust-async-fs-2)
+                       ("rust-async-io" ,rust-async-io-2)
+                       ("rust-async-lock" ,rust-async-lock-3)
+                       ("rust-blocking" ,rust-blocking-1)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-cbc" ,rust-cbc-0.1)
+                       ("rust-cipher" ,rust-cipher-0.4)
+                       ("rust-digest" ,rust-digest-0.10)
+                       ("rust-futures-lite" ,rust-futures-lite-2)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-num" ,rust-num-0.4)
+                       ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.8)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-openssl" ,rust-openssl-0.10)
+                       ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-zbus" ,rust-zbus-3)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/bilelmoussaoui/oo7")
+    (synopsis "Secret Service provider")
+    (description
+     "James Bond went on a new mission and this time as a Secret Service
+provider.")
+    (license license:expat)))
+
 (define-public rust-oorandom-11
   (package
     (name "rust-oorandom")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 114/117] WIP: gnu: Add rust-qrcode-0.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-qrcode-0.12): Add variable.

Change-Id: I2f22d342c37262a8a83fd048f141f2f204a95056
---
 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 d8513286fb..b609ce4985 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60469,6 +60469,27 @@ (define-public rust-qrcode-0.13
     (description "This package provides a QR code encoder in Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-qrcode-0.12
+  (package
+    (name "rust-qrcode")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrcode" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zzmrwb44r17zn0hkpin0yldwxjdwya2nkvv23jwcc1nbx2z3lhn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-checked-int-cast" ,rust-checked-int-cast-1)
+                       ("rust-image" ,rust-image-0.23))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.23))))
+    (home-page "https://github.com/kennytm/qrcode-rust")
+    (synopsis "QR code encoder in Rust")
+    (description "This package provides a QR code encoder in Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-quad-rand-0.2
   (package
     (name "rust-quad-rand")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 115/117] WIP: gnu: Add rust-rqrr-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rqrr-0.6): Add variable.

Change-Id: Idd16cc3e475243fab534674dafa58b186778f62f
---
 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 b609ce4985..5738ea51b2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64818,6 +64818,30 @@ (define-public rust-rpds-1
 structures with structural sharing.")
     (license license:mpl2.0)))
 
+(define-public rust-rqrr-0.6
+  (package
+    (name "rust-rqrr")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rqrr" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02wa9gnjrzxzpkcpry6ginvb45wn7wqgs83yqykb36znz78qg2sa"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-g2p" ,rust-g2p-1)
+                       ("rust-image" ,rust-image-0.24)
+                       ("rust-lru" ,rust-lru-0.9))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4)
+                                   ("rust-image" ,rust-image-0.24))))
+    (home-page "https://github.com/WanzenBug/rqrr")
+    (synopsis "Detect and read QR codes from any image source")
+    (description
+      "This package lets you detect and read QR codes from any image source.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rspec-1
   (package
     (name "rust-rspec")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 116/117] WIP: gnu: Add rust-secular-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-secular-1): Add variable.

Change-Id: Ib49ca74f9f4e3c73b7554bbc7dc4b30bad103dd9
---
 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 5738ea51b2..e5a2fb09e9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69795,6 +69795,27 @@ (define-public rust-section-testing-0.0
      "This package provides a library for section-style testing.")
     (license license:expat)))
 
+(define-public rust-secular-1
+  (package
+    (name "rust-secular")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "secular" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1davw8k29sycm7f4674d4m44jfa7pn812jm3m3mm76srvz63xp63"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-unicode-normalization" ,rust-unicode-normalization-0.1))))
+    (home-page "")
+    (synopsis "No Diacritics!")
+    (description
+      "This package provides diacritics removal on (ascii) chars.")
+    (license license:expat)))
+
 (define-public rust-selectors-0.24
   (package
     (name "rust-selectors")
-- 
2.41.0

[bug#69257] [PATCH rust-team v2 117/117] WIP: gnu: Add fractal.

[Herman Rimm via Guix-patches via]

* gnu/packages/rust-apps.scm (fractal): Add variable.

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

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 8da7b827e7..ae0ce69659 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -66,6 +66,7 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages crates-crypto)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-graphics)
+  #:use-module (gnu packages crates-gtk)
   #:use-module (gnu packages crates-tls)
   #:use-module (gnu packages crates-vcs)
   #:use-module (gnu packages crates-web)
@@ -732,6 +733,70 @@ (define-public fd
 defaults for 80% of the use cases.")
      (license (list license:expat license:asl2.0))))
 
+(define-public fractal
+  (package
+    (name "fractal")
+    (version "6.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/World/fractal")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "11n32kkfwlv38mj9018hp5rbg4w3d1vq9f6x8rhqahs19mm5amqa"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-ashpd" ,rust-ashpd-0.6)
+                       ("rust-djb-hash" ,rust-djb-hash-0.1)
+                       ("rust-eyeball-im" ,rust-eyeball-im-0.4)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-geo-uri" ,rust-geo-uri-0.2)
+                       ;("rust-gstreamer" ,rust-gstreamer-0.21)
+                       ;("rust-gstreamer-base" ,rust-gstreamer-base-0.21)
+                       ;("rust-gstreamer-pbutils" ,rust-gstreamer-pbutils-0.21)
+                       ;("rust-gstreamer-play" ,rust-gstreamer-play-0.21)
+                       ;("rust-gstreamer-video" ,rust-gstreamer-video-0.21)
+                       ("rust-gtk" ,rust-gtk4-0.7)
+                       ("rust-html-escape" ,rust-html-escape-0.2)
+                       ("rust-html2pango" ,rust-html2pango-0.6)
+                       ("rust-html5gum" ,rust-html5gum-0.5)
+                       ("rust-image" ,rust-image-0.24)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-libadwaita" ,rust-libadwaita-0.5)
+                       ("rust-libshumate" ,rust-libshumate-0.4)
+                       ("rust-matrix-sdk" ,rust-matrix-sdk-0.7)
+                       ("rust-matrix-sdk-ui" ,rust-matrix-sdk-ui-0.7)
+                       ("rust-mime" ,rust-mime-0.3)
+                       ("rust-mime-guess" ,rust-mime-guess-2)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-oo7" ,rust-oo7-0.2)
+                       ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9)
+                       ("rust-qrcode" ,rust-qrcode-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-rmp-serde" ,rust-rmp-serde-1)
+                       ("rust-rqrr" ,rust-rqrr-0.6)
+                       ("rust-ruma" ,rust-ruma-0.9)
+                       ("rust-secular" ,rust-secular-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-sourceview5" ,rust-sourceview5-0.7)
+                       ("rust-strum" ,rust-strum-0.25)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+                       ("rust-url" ,rust-url-2))))
+    (home-page "https://gitlab.gnome.org/World/fractal")
+    (synopsis "Matrix messaging app for GNOME written in Rust")
+    (description "Fractal is a Matrix messaging app for GNOME written in
+Rust. Its interface is optimized for collaboration in large groups, such
+as free software projects, and will fit all screens, big or small.")
+    (license license:gpl3+)))
+
 (define-public gitui
   (package
     (name "gitui")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 00/75] Finish packages.

[Herman Rimm via Guix-patches via]

Hello,

Note that the v2 patch series should be applied before this patch
series. I did not want to send the same 100 patches again.

I moved fractal to gnome.scm. It still uses cargo-build-system but with
some meson-build-system %standard-phases. It would be nice to just use
meson-build-system, but I could not manage to pass the cargo-inputs to
the cargo-build-system configure phase.

I got Fractal 6 working just in time for Fractal 7 to release. All the
crates in crates-gtk.scm would need a version increment, along with four
or five crates in crates-io.scm. I have done enough for now though.

Apparently there is a patch series for Fractal 4 in [bug#44492] too.

Cheers,
Herman

Herman Rimm (75):
  gnu: Add rust-sourceview-5-sys-0.7.
  gnu: Add rust-sourceview5-0.7.
  gnu: Add rust-async-fs-2.
  gnu: Add rust-khronos-egl-5.
  gnu: Add rust-xkbcommon-sys-1.
  gnu: Add rust-xkb-0.3.
  gnu: Add rust-gdk4-wayland-sys-0.7.
  gnu: Add rust-gdk4-wayland-0.7.
  gnu: Add rust-gdk4-x11-sys-0.7.
  gnu: Add rust-gdk4-x11-0.7.
  gnu: Add rust-libspa-sys-0.8.
  gnu: Add rust-libspa-sys-0.7.
  gnu: Add rust-libspa-0.8.
  gnu: Add rust-libspa-0.7.
  gnu: Add rust-pipewire-sys-0.8.
  gnu: Add rust-pipewire-sys-0.7.
  gnu: Add rust-pipewire-0.8.
  gnu: Add rust-pipewire-0.7.
  gnu: Add rust-ashpd-0.6.
  gnu: Add rust-djb-hash-0.1.
  gnu: rust-darling-core-0.20: Update to 0.20.8.
  gnu: rust-darling-macro-0.20: Update to 0.20.8.
  gnu: rust-darling-0.20: Update to 0.20.8.
  gnu: Add rust-derive-builder-core-0.20.
  gnu: Add rust-derive-builder-macro-0.20.
  gnu: Add rust-derive-builder-0.20.
  gnu: Add rust-geo-uri-0.2.
  gnu: Add rust-ammonia-3.
  gnu: Add rust-linkify-0.9.
  gnu: Add rust-html2pango-0.6.
  gnu: rust-jetscii-0.5: Upgrade to 0.5.3.
  gnu: Add rust-html5gum-0.5.
  gnu: Add rust-libshumate-sys-0.4.
  gnu: Add rust-libshumate-0.4.
  gnu: rust-blocking-1: Upgrade to 1.6.0.
  gnu: Add rust-oo7-0.2.
  gnu: Add rust-checked-int-cast-1.
  gnu: Add rust-proptest-0.8.
  gnu: Add rust-galois-2p8-0.1.
  gnu: Add rust-reed-solomon-erasure-6.
  gnu: Add rust-g2poly-1.
  gnu: Add rust-g2gen-1.
  gnu: Add rust-g2p-1.
  gnu: Add rust-rqrr-0.6.
  gnu: Add rust-secular-1.
  gnu: Add rust-gstreamer-sys-0.21.
  gnu: Add rust-option-operations-0.5.
  gnu: Add rust-pretty-hex-0.4.
  gnu: Add rust-gstreamer-0.21.
  gnu: Add rust-gstreamer-base-sys-0.21.
  gnu: Add rust-atomic-refcell-0.1.
  gnu: Add rust-gstreamer-base-0.21.
  gnu: Add rust-gstreamer-video-sys-0.21.
  gnu: Add rust-gstreamer-video-0.21.
  gnu: Add rust-gstreamer-play-sys-0.21.
  gnu: Add rust-gstreamer-play-0.21.
  gnu: Add rust-gstreamer-audio-sys-0.21.
  gnu: Add rust-gstreamer-audio-0.21.
  gnu: Add rust-gstreamer-pbutils-sys-0.21.
  gnu: Add rust-gstreamer-pbutils-0.21.
  gnu: Add rust-gstreamer-gl-sys-0.21.
  gnu: Add rust-gstreamer-gl-0.21.
  gnu: Add rust-gstreamer-gl-egl-sys-0.21.
  gnu: Add rust-gstreamer-gl-egl-0.21.
  gnu: Add rust-gstreamer-gl-wayland-sys-0.21.
  gnu: Add rust-gstreamer-gl-wayland-0.21.
  gnu: Add rust-gstreamer-gl-x11-sys-0.21.
  gnu: Add rust-gstreamer-gl-x11-0.21.
  gnu: rust-serde-json-1: Upgrade to 1.0.116.
  gnu: Add rust-toml-edit-0.22.
  gnu: Add rust-gst-plugin-version-helper-0.8.
  gnu: Add rust-gdk4-win32-sys-0.7.
  gnu: Add rust-gdk4-win32-0.7.
  gnu: Add rust-gst-plugin-gtk4-0.11.
  gnu: Add fractal.

 gnu/packages/crates-graphics.scm |   83 +++
 gnu/packages/crates-gtk.scm      | 1140 +++++++++++++++++++++++++++---
 gnu/packages/crates-io.scm       | 1021 +++++++++++++++++++++++---
 gnu/packages/gnome.scm           |  144 ++++
 4 files changed, 2222 insertions(+), 166 deletions(-)


base-commit: 2c90e7aa2f078da27d517b2b77b61810f4513809
prerequisite-patch-id: cd71b7377bd70db92d29473f032b619956874a92
prerequisite-patch-id: d009cb761bd9afb01edad7446256b4be4d38d4d6
prerequisite-patch-id: 8dfb9608a341d531d5980d338841b2b16cb17ed6
prerequisite-patch-id: fca6a67797441ffde49725c5adc1cab210fe76df
prerequisite-patch-id: ee2886f77f4286987e260b9c8062faba94a28dd5
prerequisite-patch-id: 76f775d8722ba3d580791375513a6a80648772f3
prerequisite-patch-id: 4a9f556a809ff30908fa6ea8666538429274793f
prerequisite-patch-id: 8aa6409ae3d342d8899be0d3c5fcacc599ce31b2
prerequisite-patch-id: 6fb37200241c8ad689ab7f2ff92eb6d40a8f1025
prerequisite-patch-id: a4dab76261ba18ab0cef2b2d98e5356398608955
prerequisite-patch-id: 460b099a1223fb1e6074632ddd61dffe5b9023da
prerequisite-patch-id: 095939d0a8a4812dc2e7e3ef63c52699cccf3cd8
prerequisite-patch-id: 9f10b04ca72f29f142b63f6d612179e65ffd2c88
prerequisite-patch-id: 6a0c24348779ff232cce2ee6e5ccf28b3621dfbe
prerequisite-patch-id: fe1f20396641e4967d16b1d0835c72f52770e8fc
prerequisite-patch-id: 4f59345c48236c7bb801976c538ca5437bae1aa3
prerequisite-patch-id: 4fea48abffc31386616e6d5f2cb5a158479e2ec0
prerequisite-patch-id: 11354bd1fdc76640783112e8c369f7186b8d30ac
prerequisite-patch-id: fcb4e290b4f3822c4895964a4011352d8be813c3
prerequisite-patch-id: 34a3928dac5edc64edf52e04ac88fcab7c6c6db3
prerequisite-patch-id: d5e88d0957d1cd6a9307678b176121f8e76d34e2
prerequisite-patch-id: da258e798de3b6cecd7594d5c229733b82102668
prerequisite-patch-id: 6f0b549249771f2ce793c68405cab15973fb7b42
prerequisite-patch-id: f73d4e83bd170c7f81438598751c3a77e7403063
prerequisite-patch-id: 739c2f6b54912138d193d0399aa33df2b5e631ca
prerequisite-patch-id: 631cf49d3bf1aa23775af492628319c550f516ed
prerequisite-patch-id: 3dc3a33d02075b265a8ae051dafe5412e999b3f0
prerequisite-patch-id: a37fa1afd02cda158b8c0cf5fa70bd49b3e6a483
prerequisite-patch-id: cbfeff1ebbb19a8ecd16588c3b811f74b8c3069e
prerequisite-patch-id: 7514bcd7b4f56a2de7f4f1b9c8c57deb5a6feb7f
prerequisite-patch-id: 794a60284f05f00b8eb0c9107e3ec1aea7756a13
prerequisite-patch-id: a5a06c9b5bbe7b509369de7400dfd470220f41d1
prerequisite-patch-id: 835059407a0849871438defab5953fafb4358ee6
prerequisite-patch-id: b18a90512bd18c47bf89231186e95a6a4f9e361f
prerequisite-patch-id: 1d2a4a79d15f9c8a10391ae1952f846beefa3b3a
prerequisite-patch-id: 1ff9aacdb2d01b2c7ae25f5732792efef5374a3d
prerequisite-patch-id: 26e93d3982908e7bc073799e02bc5eed13452c1c
prerequisite-patch-id: 848291a22398afb9ead5a93bd317f67cc34cd9cb
prerequisite-patch-id: 8e43fa9ba2da77f3626df067cef4f6a96238c16b
prerequisite-patch-id: 0403ecd8e935dfc55f506480cfe8b12027198bcb
prerequisite-patch-id: 4bedb2d7052eba220071dda2a6c9b79f52ff1365
prerequisite-patch-id: e9a64f7b613fb6417da0e757017d80566d5a0bdd
prerequisite-patch-id: 81dbb47ac8b9c12f6e0f82e359698915d14f13f6
prerequisite-patch-id: 06fe2d0d7d6a7bbe47eb633c5b13cb97f8d32b34
prerequisite-patch-id: 78d962eb0d6ac5d53b0cc2dabc830f66e211dbc1
prerequisite-patch-id: 661d7c4631e790b3db2fc2b7a7d59d2dccc5b2fe
prerequisite-patch-id: 35b43c527b1a8294da3d144b53e3a9921fba2725
prerequisite-patch-id: b5020990a3a638d923b86be31fb42db7426e92dc
prerequisite-patch-id: c76c3e06ea5a19d44fd05a54a8d06a0cc27ab3a0
prerequisite-patch-id: 9491ad4f3d5efab12d8b23285ad04dab809ca636
prerequisite-patch-id: 38c20dfa8e98adbf8fc1a7179c5671773d97d6ad
prerequisite-patch-id: aa4f0c870ddbd6f053447c30e17f3bb48afe5c56
prerequisite-patch-id: a475f5914cf5091af4073583880c9b74105bfe9a
prerequisite-patch-id: d13f40544b5cd662eb3f82a29075549ee482d257
prerequisite-patch-id: 0d72cd5db9cf402adf486e4d5d50ab3d20092f6f
prerequisite-patch-id: 7de5ac497f662c1f95d294d0d43d0bfdd99674a4
prerequisite-patch-id: 53b1409d9195029ee18bbfebdabb875669af9af0
prerequisite-patch-id: 15afd0bc9a83a174b74a4a7fb4753694769fc12d
prerequisite-patch-id: 16c8b7888fcb7632b08d852283721243edf93c8d
prerequisite-patch-id: 5bc6d8177da10b12c06886a0c81fb3b1dd33578b
prerequisite-patch-id: e3200f75ff3a8860c345415ae5f5e9fbed0267c8
prerequisite-patch-id: 797d7cdf1c89fa1136cba882d593f6396dd447f6
prerequisite-patch-id: 9b67785bfc19464a17b49a6f68e1cdf42b5c4537
prerequisite-patch-id: 707ed40206af216a17eba8677b392795ef867601
prerequisite-patch-id: e24edfb9e8f3e1f800e407e06db013ec659a1057
prerequisite-patch-id: 9c8529bc7a3a69d6458f52de51fc170468711ffb
prerequisite-patch-id: a4b13f2ffb78a11f68022f96943266fc3f03674e
prerequisite-patch-id: b36ca86618725fb7de54909722bded1ac83c7a1a
prerequisite-patch-id: 43bfa5ede7d07097deb14fd7307c94cb55841ec4
prerequisite-patch-id: c1b7ecb3b49e3a6ca1dd6caa96d733bff2b5c40a
prerequisite-patch-id: ab8a1b186a80e47ad4221af15457c4def5403698
prerequisite-patch-id: b82e5bb771cb6eaa5f3a18699a5ec20439e20e5d
prerequisite-patch-id: d3ad744fdf32139b1ca5ded2b58092ec64393709
prerequisite-patch-id: 028ff2480c018154fd123e6dc8785cb15b36a63a
prerequisite-patch-id: e09cef3ae3a3a2b5f0829c90dd2e9ef5a326ee3c
prerequisite-patch-id: 2158ae57a62465d9081ef87a3c02e226e0a33dff
prerequisite-patch-id: 5d2d52dcc645ba21f24ef3e109a33b822f53c6fc
prerequisite-patch-id: 5190fe7ff9bbfaceb71e304f478d8ec74a21ce53
prerequisite-patch-id: 47715f4e0dc2c8b313d0cb71a8e298a45de7fae4
prerequisite-patch-id: 23ada03e9575fac1251a6554ca0c29d3cb5f97e9
prerequisite-patch-id: 10ac7049eda06335f4128aa7e561e9d7299c21ab
prerequisite-patch-id: 8a98e886391f7bb8eb8a316d283187ca8a0285b7
prerequisite-patch-id: b796fc09e90754b9c716d7f9a788f664895682a0
prerequisite-patch-id: fc6d2121cf4adef41f27fb13e79a53c6b123f52c
prerequisite-patch-id: 0841f9f7e2b7c245cb55284a0bf73d31c5fcb8ec
prerequisite-patch-id: fdf778a1d72801627d8f5a460869199f2ce79c6e
prerequisite-patch-id: 843a882b7a9c80f5b338e444fd7f1b862c260368
prerequisite-patch-id: fa972ec23b3b6a01df259c5d2b2f097921ccf1d0
prerequisite-patch-id: ab234f56a9e7bb7b7b222a4a95af350e365f38a9
prerequisite-patch-id: 441329738bb48bd01ace73117a8d4a093c809440
prerequisite-patch-id: ed44a95e5989c45f332151d817a06fb0805351a7
prerequisite-patch-id: deb663e6a647838374941ae8f48c57a4b6a32bba
prerequisite-patch-id: 3383e3a08c293f40b50fcc010cd8e8bda1b989e0
prerequisite-patch-id: 57e9fa33771513041c3a6299b23ac05687b746f4
prerequisite-patch-id: 5f018d2ae955375941cbee4f14de51c58743413c
prerequisite-patch-id: c2b6aabb267b9856b84025c14423a5c614543007
prerequisite-patch-id: 0bf3a396ff4e39a5506c8a53a616b49405d453ac
prerequisite-patch-id: 59827f09b6bef901e4d6f09e7f9696ef88bc8e07
prerequisite-patch-id: 525362f46ab77730756e1a2937d69caaae5363c6
prerequisite-patch-id: 05ef6414c423c2ac2a1ea6e42e12aa202aa9111f
prerequisite-patch-id: 428bb8195d76aa712c8fa1adbac9c5d2535eaf47
prerequisite-patch-id: 56269387760018843f6c823886f96defcf333d92
prerequisite-patch-id: 577fb6248ded4bcae0aff51900eb598d723bf86a
prerequisite-patch-id: 081dbf9a649a051991896676f3c6b0672514b3fc
prerequisite-patch-id: 71c4540f2c58f3fed6a7ad28f6141dce4b2a5446
prerequisite-patch-id: 4ddff224f9c0d42669b58ce31876cd4fe9d19800
prerequisite-patch-id: b2ea79632afd73b0d7c74f71c93aee59a8b7ead0
prerequisite-patch-id: 94617edd63682167da71d7470852d571b14b99cd
prerequisite-patch-id: fb3dd05ad6c4aec220e6785392da45c748e0eb02
prerequisite-patch-id: 1a4ce9c00fde8503fac01fff50c8f2917e0ccaa8
prerequisite-patch-id: 7755dc2ab4918c0e716aa7d09230b9faabb11041
prerequisite-patch-id: bd013307bba93e7a6c47f1a9348402465bba68fe
prerequisite-patch-id: 9687ef05d911a19a88bf742fe101d91811799182
prerequisite-patch-id: 80a75a4bd5a9feedb6695c8624c724b2c4edcadf
prerequisite-patch-id: 02a7c52675f0af5ae75c929e15570d881f158875
prerequisite-patch-id: f4b5b138d7c58f74665dfcfa0824a57a5077847b
prerequisite-patch-id: 3ec5eb6962560ef102d6de6e91d0a2067f4d8a4a
prerequisite-patch-id: dcd71345fd9c3d19472bd805f2b5cc87195bc41e
prerequisite-patch-id: cb4f5e72d7208e8ef4790def46c46d95dfcfd41f
prerequisite-patch-id: 0e2f219f6c93bfd673ad4a60775e8c82b94bd98d
prerequisite-patch-id: f3cbae064d689b3969cf2bb1f06b1552376e0539
prerequisite-patch-id: 0587a04743e29a6d959ae3d8e634daf9a6e6caff
prerequisite-patch-id: 45e37f5b4a7585b029ca18ec8e8abc83b768ba72
prerequisite-patch-id: 830e174c6495caf764e020b8946baba2113537e0
prerequisite-patch-id: f92dbae13128e8d2229dc0cccdc521d9057d7535
prerequisite-patch-id: 37547fbab74cbc2c3ec3ee352c71e0c8adc9d6d5
prerequisite-patch-id: ea7892289d85fc63ab0a1cc28c1880f08c9fdbe7
prerequisite-patch-id: 3be8420484afd127864dd8cd54fe01b9c13cbbed
prerequisite-patch-id: f22cc2e6e8cc6dd7ef5b6f5ef13b77c5069c2b2a
prerequisite-patch-id: 6acbbebec9831a68334616bc89bf252c9e1112b3
prerequisite-patch-id: 0c0cfe656aaa4f469533a6ea78e8287021610cd0
prerequisite-patch-id: d9861a2fba274c2283bf6a26beb50bb0d176cdb2
prerequisite-patch-id: bae5246916a9dd5bc528d0efb96483c0aaa382c3
prerequisite-patch-id: ae8b53730b985a97e289de8b91f8da8c9889b312
prerequisite-patch-id: 694354adbd46806bbb09639130b73028509af6eb
prerequisite-patch-id: 36a2963d7f387fea1d2fa17e6d1d79a5842b983e
prerequisite-patch-id: 51b81ae804661d9db60c0b7c1987a87302b16eac
prerequisite-patch-id: b73e56f60771821c3b30374f524858043d0754d1
prerequisite-patch-id: 1f9bbfa31dcce601a7d7369188b00dbcd0434e16
prerequisite-patch-id: aa8fc0935a62d5c67920882e2592ee1569c384df
prerequisite-patch-id: f6bb206377586bf01b35f12ab81b60e8012e9b93
prerequisite-patch-id: 4fdf425b19ea5a83ce43b7d2f1095690a42bb1ec
prerequisite-patch-id: b54d12cf7b3ec7fecf59063bf1d7f507b3e65f8e
prerequisite-patch-id: 18d3272c692647cdea4a7e989bfb8963acac66b1
prerequisite-patch-id: f66060c1591c09025e415087fcedce4c00f9fb3b
prerequisite-patch-id: 8693aeb2e5b92eb051ebb9934048fb0dd1fbc800
prerequisite-patch-id: c45c31f51645443f7e8acb8a4750e559ff4b7320
prerequisite-patch-id: 93ccbc484073cb2f390492470da8fae2670a3d11
prerequisite-patch-id: dabebcca0fbddfc4368e90041eac29b3aa3e2766
prerequisite-patch-id: 8608d90a505257825596783214a96504879da49a
prerequisite-patch-id: 85fa073ccb5709f7a41650671e73e259b71ac98d
prerequisite-patch-id: a2dbcb1116f47dc690eb015cb13606464329a67c
prerequisite-patch-id: d9c7a81c627e8340afd1287c4f96830f74d4984f
prerequisite-patch-id: 8872930eb925ecece80232c24b2fff16909add04
prerequisite-patch-id: 5673476b70fe4b52bb616334815e73699a9263c5
prerequisite-patch-id: 0650f112cf055b15312718acf9645839a7d4681c
prerequisite-patch-id: 17995d0df3e07c1e7ed5cbb0e1f0ed1949c1ad01
prerequisite-patch-id: d0b57a9060d4188889d1605a8c9f70fd990b5db5
prerequisite-patch-id: 63e23f72fcb47504fdd1abc75919bb8bca90636c
prerequisite-patch-id: 7a10642a7ce3fde56349af090730a3837a94427b
prerequisite-patch-id: 86163653de9261e14fc9bfd50c85da9ebb38c781
prerequisite-patch-id: a74d73d77104bb0a7ddfa85741baffa0e3387bd8
prerequisite-patch-id: db7795bed0f2439e14260f8150a7012a2cee7236
prerequisite-patch-id: 6ac1026a298d090bd1eaa82018f67faf04a86778
prerequisite-patch-id: 7fabf75ef68d9ffe4409d26bd50e8867797c4c4c
prerequisite-patch-id: b74242a07d13319adc9a361db8b3155e2c20e262
prerequisite-patch-id: a6380c647039c3aeb9acada3c1cd81ea35e59aa7
prerequisite-patch-id: f80f3a91449770dd5972a3f37c461bf784308d3f
prerequisite-patch-id: cfb30e9e2720c85d55d0c77a4ba166eb5e13195a
prerequisite-patch-id: 6118279579cba5d608e812ee91db01fba644bf73
prerequisite-patch-id: 2305e82c531a4119df7a3c36c7a8a32676f92727
prerequisite-patch-id: 6f8ad6bef57f5e090452edbb2207ec664268182e
prerequisite-patch-id: f3cab0fcab5044fa3c76ad24fea15131ab74e6f7
prerequisite-patch-id: d545d7adc931bd4ef071de1cf723d31c2a803789
prerequisite-patch-id: 40009c0a9215fda3cde5583516975e61d5f3a039
prerequisite-patch-id: 88dc2f9f882443a901a69f0660eb574bba6607db
prerequisite-patch-id: 85e9c7e142e53faa12ff0e635a457e2f9f31172f
prerequisite-patch-id: ca38173c20faa22965086f9398f01576e0a41cbf
prerequisite-patch-id: e02109c2f5bb761298acc47a4817e970022243ad
prerequisite-patch-id: e71efb28361cbe75fa33dcc47a7522ebab845d66
prerequisite-patch-id: 30d2ae6b2f885784019a6cacfeff6e75476a27cd
prerequisite-patch-id: 8e2c73230824d2d266318149c9076dce24d0f210
prerequisite-patch-id: d7ee6980adcdc58d59094b2eb8053f844200641e
prerequisite-patch-id: ad1110a557a64021b725fca1616644c253f1ecc5
prerequisite-patch-id: ecebb2df30c1fc1205011b53974977a388f874cb
prerequisite-patch-id: ebbd8e327884c98022de5ecb3b15cdfaced76418
prerequisite-patch-id: 893bbb4ff88804f8536f615fd4e60d28bb425b8f
prerequisite-patch-id: 24f7dff356091efbe879ccd8b1ba7af1d281995f
prerequisite-patch-id: 9060a97828006a85d4922191c907638c5ff6ec66
prerequisite-patch-id: 160b8c94685ea63bdf99a3c8453a172c69e77e8b
prerequisite-patch-id: e49aebc58a449c1007bb5a0f15a0018534eb21ac
prerequisite-patch-id: 73b25bd514e0f43cb04577219ecb4f57b86f065d
prerequisite-patch-id: a45dc9e33c3c131ff3687bf4236384b6a44c4a65
prerequisite-patch-id: e69476787c0b098b5555bd1ead1499ad41f5c1a2
prerequisite-patch-id: 9b32907fdee084c95054b808b2a7012b876030b8
prerequisite-patch-id: 9e7f1f2128aa040507ac97882eb0f5fe9ed9d0d8
prerequisite-patch-id: 763dedc4df7929d0cf230d164f73bff48c9f19d1
prerequisite-patch-id: 17a196d5fd264ad1d66feacea26e81e58088221d
prerequisite-patch-id: 991ff3ebc41563aab4c67e4df8e292265666bb35
prerequisite-patch-id: c3cc750d02940ba64a01c26f6ab267562cac54a4
prerequisite-patch-id: 6bab93761eabc9ddbdbee81f370e81b85106bccb
prerequisite-patch-id: c0922126246ced23dda5f18356587aeb1aff2208
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 01/75] gnu: Add rust-sourceview-5-sys-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-sourceview-5-sys-0.7): Add variable.
---
 gnu/packages/crates-gtk.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 9c01ce3142..b6027780af 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3243,6 +3243,39 @@ (define-public rust-soup-sys-0.10
     (description "This crate provides Soup FFI for Rust.")
     (license license:expat)))
 
+(define-public rust-sourceview5-sys-0.7
+  (package
+    (name "rust-sourceview5-sys")
+    (version "0.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sourceview5-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ipxnwlvrb7ajzmas3g3azcc3nwrsnwch31clxxs6xb0sp67qqr9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs (("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.18)
+                       ("rust-gdk4-sys" ,rust-gdk4-sys-0.7)
+                       ("rust-gio-sys" ,rust-gio-sys-0.18)
+                       ("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+                       ("rust-gtk4-sys" ,rust-gtk4-sys-0.7)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango-sys" ,rust-pango-sys-0.18)
+                       ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list cairo glib gtk gtksourceview))
+    (home-page "https://world.pages.gitlab.gnome.org/Rust/sourceview5-rs/")
+    (synopsis "FFI bindings for GtkSourceView 5")
+    (description
+     "This package provides FFI bindings for @code{GtkSourceView} 5.")
+    (license license:expat)))
+
 (define-public rust-webkit2gtk-sys-0.12
   (package
     (name "rust-webkit2gtk-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 02/75] gnu: Add rust-sourceview5-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-sourceview5-0.7): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index b6027780af..94f6b3b913 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3243,6 +3243,37 @@ (define-public rust-soup-sys-0.10
     (description "This crate provides Soup FFI for Rust.")
     (license license:expat)))
 
+(define-public rust-sourceview5-0.7
+  (package
+    (name "rust-sourceview5")
+    (version "0.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sourceview5" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1rcydm2wv1ndsw8b83zqfv5b838cjsr5hxy6bsy4gs8kl5vgkic8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.18)
+                       ("rust-gdk4" ,rust-gdk4-0.7)
+                       ("rust-gio" ,rust-gio-0.18)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-gtk4" ,rust-gtk4-0.7)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango" ,rust-pango-0.18)
+                       ("rust-sourceview5-sys" ,rust-sourceview5-sys-0.7))))
+    (native-inputs (list pkg-config))
+    (inputs (list gtk gtksourceview))
+    (home-page "https://world.pages.gitlab.gnome.org/Rust/sourceview5-rs/")
+    (synopsis "Rust bindings for GtkSourceView 5")
+    (description
+      "This package provides Rust bindings for @code{GtkSourceView} 5.")
+    (license license:expat)))
+
 (define-public rust-sourceview5-sys-0.7
   (package
     (name "rust-sourceview5-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 03/75] gnu: Add rust-async-fs-2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-async-fs-2): Add variable.
(rust-async-fs-1): Inherit from rust-async-fs-2.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b6621926f9..391815ce34 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5028,8 +5028,33 @@ (define-public rust-async-executor-1
     (description "This library provides async executors.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-async-fs-2
+  (package
+    (name "rust-async-fs")
+    (version "2.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async-fs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jp0p7lg9zqy2djgdmivbzx0yqmfn9sm2s9dkhaws3zlharhkkgb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-lock" ,rust-async-lock-3)
+                       ("rust-blocking" ,rust-blocking-1)
+                       ("rust-futures-lite" ,rust-futures-lite-2))
+       #:cargo-development-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-windows-sys" ,rust-windows-sys-0.52))))
+    (home-page "https://github.com/smol-rs/async-fs")
+    (synopsis "Async filesystem primitives")
+    (description "This package provides async filesystem primitives.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-async-fs-1
   (package
+    (inherit rust-async-fs-2)
     (name "rust-async-fs")
     (version "1.6.0")
     (source
@@ -5039,18 +5064,13 @@ (define-public rust-async-fs-1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "01if2h77mry9cnm91ql2md595108i2c1bfy9gaivzvjfcl2gk717"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-async-lock" ,rust-async-lock-2)
                        ("rust-autocfg" ,rust-autocfg-1)
                        ("rust-blocking" ,rust-blocking-1)
                        ("rust-futures-lite" ,rust-futures-lite-1))
        #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2)
-                                   ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/smol-rs/async-fs")
-    (synopsis "Async filesystem primitives")
-    (description "This package provides async filesystem primitives.")
-    (license (list license:asl2.0 license:expat))))
+                                   ("rust-winapi" ,rust-winapi-0.3))))))
 
 (define-public rust-async-global-executor-2
   (package
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 04/75] gnu: Add rust-khronos-egl-5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-khronos-egl-5): Add variable.

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

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 7cf86e877c..5705fb1af0 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2371,6 +2371,35 @@ (define-public rust-keyframe-1
 @end enumerate")
     (license license:expat)))
 
+(define-public rust-khronos-egl-5
+  (package
+    (name "rust-khronos-egl")
+    (version "5.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "khronos-egl" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qw31jzaly1kcn2smicmcm6g4y5sh0y5l8fnaca85ssaq0b2nf6i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-development-inputs
+       (("rust-gl" ,rust-gl-0.14)
+        ("rust-wayland-client" ,rust-wayland-client-0.28)
+        ("rust-wayland-egl" ,rust-wayland-egl-0.28)
+        ("rust-wayland-protocols" ,rust-wayland-protocols-0.28))
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-libloading" ,rust-libloading-0.8)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))
+    (native-inputs (list pkg-config))
+    (inputs (list mesa wayland))
+    (home-page "https://github.com/timothee-haudebourg/khronos-egl")
+    (synopsis "Rust bindings for EGL")
+    (description "This package provides Rust bindings for EGL.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-libdav1d-sys-0.6
   (package
     (name "rust-libdav1d-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 05/75] gnu: Add rust-xkbcommon-sys-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-xkbcommon-sys-1): Add variable.

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

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 5705fb1af0..07d00550a9 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -5889,6 +5889,35 @@ (define-public rust-xkbcommon-dl-0.4
      "Dynamically loaded xkbcommon and xkbcommon-x11 Rust bindings.")
     (license license:expat)))
 
+(define-public rust-xkbcommon-sys-1
+  (package
+    (name "rust-xkbcommon-sys")
+    (version "1.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "xkbcommon-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "142ww452qq0q47fmc4khzsd0fbwmb71fjl7pci573zf83fvdpxsn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.63)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'add-absolute-library-references
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "XKBCOMMON_LIB_DIR"
+                     (assoc-ref inputs "libxkbcommon")))))))
+    (native-inputs (list pkg-config))
+    (inputs (list clang libxkbcommon-1.5))
+    (home-page "https://github.com/meh/rust-xkbcommon-sys")
+    (synopsis "Bindings to libxkbcommon")
+    (description "This package provides bindings to libxkbcommon.")
+    (license license:wtfpl2)))
+
 (define-public rust-xkeysym-0.2
   (package
     (name "rust-xkeysym")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 06/75] gnu: Add rust-xkb-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-xkb-0.3): Add variable.

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

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 07d00550a9..6187000022 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -5811,6 +5811,31 @@ (define-public rust-x11-dl-2
     (description "This package provides X11 library bindings for Rust.")
     (license license:expat)))
 
+(define-public rust-xkb-0.3
+  (package
+    (name "rust-xkb")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "xkb" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03rfx8n3pajc95riksnshh3aqm8dqij2iis5icl88pa6ylk9x0gj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-xcb" ,rust-xcb-1)
+                       ("rust-xkbcommon-sys" ,rust-xkbcommon-sys-1))))
+    (native-inputs (list pkg-config))
+    (inputs (list clang libxkbcommon-1.5))
+    (home-page "https://github.com/meh/rust-xkb")
+    (synopsis "Rusty wrapper around libxkbcommon")
+    (description
+      "This package provides a Rusty wrapper around libxkbcommon.")
+    (license license:wtfpl2)))
+
 (define-public rust-xkbcommon-0.7
   (package
     (name "rust-xkbcommon")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 07/75] gnu: Add rust-gdk4-wayland-sys-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk4-wayland-sys-0.7): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 94f6b3b913..fb26e00da9 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1008,6 +1008,32 @@ (define-public rust-gdk4-sys-0.7
     (description "This package provides FFI bindings of GDK 4.")
     (license license:expat)))
 
+(define-public rust-gdk4-wayland-sys-0.7
+  (package
+    (name "rust-gdk4-wayland-sys")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk4-wayland-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "092nbn4gk82kbdvji2qnqy181l4pf5i8961bb8nj3q3a4nz5k0fl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list glib gtk))
+    (home-page "https://gtk-rs.org/gtk4-rs")
+    (synopsis "FFI bindings of GDK4 Wayland")
+    (description "This package provides FFI bindings of GDK4 Wayland.")
+    (license license:expat)))
+
 (define-public rust-gio-0.18
   (package
     (name "rust-gio")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 08/75] gnu: Add rust-gdk4-wayland-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk4-wayland-0.7): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index fb26e00da9..bf96cdcb04 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1008,6 +1008,38 @@ (define-public rust-gdk4-sys-0.7
     (description "This package provides FFI bindings of GDK 4.")
     (license license:expat)))
 
+(define-public rust-gdk4-wayland-0.7
+  (package
+    (name "rust-gdk4-wayland")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk4-wayland" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04zkspjs1r6l4gj241p9xm2zmp91phm1khakw5jvsm8yy4pi1f8d"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gdk4" ,rust-gdk4-0.7)
+                       ("rust-gdk4-wayland-sys" ,rust-gdk4-wayland-sys-0.7)
+                       ("rust-gio" ,rust-gio-0.18)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-khronos-egl" ,rust-khronos-egl-5)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-wayland-backend" ,rust-wayland-backend-0.1)
+                       ("rust-wayland-client" ,rust-wayland-client-0.30)
+                       ("rust-xkb" ,rust-xkb-0.3))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+    (native-inputs (list pkg-config))
+    (inputs (list gtk))
+    (home-page "https://gtk-rs.org/gtk4-rs")
+    (synopsis "Rust bindings of the GDK 4 Wayland library")
+    (description
+      "This package provides Rust bindings of the GDK 4 Wayland library.")
+    (license license:expat)))
+
 (define-public rust-gdk4-wayland-sys-0.7
   (package
     (name "rust-gdk4-wayland-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 09/75] gnu: Add rust-gdk4-x11-sys-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-gdk4-x11-sys-0.7): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index bf96cdcb04..d69dbfe4df 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1066,6 +1066,34 @@ (define-public rust-gdk4-wayland-sys-0.7
     (description "This package provides FFI bindings of GDK4 Wayland.")
     (license license:expat)))
 
+(define-public rust-gdk4-x11-sys-0.7
+  (package
+    (name "rust-gdk4-x11-sys")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk4-x11-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09gill32x6qy4s55xjckqvqrfxw4jfjrlcpmd4iijn076w4igpm3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs (("rust-gdk4-sys" ,rust-gdk4-sys-0.7)
+                       ("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list gdk-pixbuf glib gtk pango))
+    (home-page "https://gtk-rs.org/gtk4-rs")
+    (synopsis "FFI bindings of GDK4 X11")
+    (description "This package provides FFI bindings of GDK4 X11.")
+    (license license:expat)))
+
 (define-public rust-gio-0.18
   (package
     (name "rust-gio")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 10/75] gnu: Add rust-gdk4-x11-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk4-x11-0.7): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index d69dbfe4df..223805273b 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1066,6 +1066,36 @@ (define-public rust-gdk4-wayland-sys-0.7
     (description "This package provides FFI bindings of GDK4 Wayland.")
     (license license:expat)))
 
+(define-public rust-gdk4-x11-0.7
+  (package
+    (name "rust-gdk4-x11")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk4-x11" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0l54c1m0gsdm07drvy171a0i97ic2kygmzf3fjg4da0yxbwbpj98"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gdk4" ,rust-gdk4-0.7)
+                       ("rust-gdk4-x11-sys" ,rust-gdk4-x11-sys-0.7)
+                       ("rust-gio" ,rust-gio-0.18)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-khronos-egl" ,rust-khronos-egl-5)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-x11" ,rust-x11-2))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+    (native-inputs (list pkg-config))
+    (inputs (list gtk))
+    (home-page "https://gtk-rs.org/gtk4-rs")
+    (synopsis "Rust bindings of the GDK4 X11 library")
+    (description
+      "This package provides Rust bindings of the GDK4 X11 library.")
+    (license license:expat)))
+
 (define-public rust-gdk4-x11-sys-0.7
   (package
     (name "rust-gdk4-x11-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 11/75] gnu: Add rust-libspa-sys-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-libspa-sys-0.8): Add variable.
---
 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 391815ce34..28c0681908 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38890,6 +38890,29 @@ (define-public rust-libsensors-sys-0.2
     (description "This package provides Rust bindings to libsensors.")
     (license license:miros)))
 
+(define-public rust-libspa-sys-0.8
+  (package
+    (name "rust-libspa-sys")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libspa-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07yh4i5grzbxkchg6dnxlwbdw2wm5jnd7ffbhl77jr0388b9f3dz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.69)
+                       ("rust-cc" ,rust-cc-1)
+                       ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list clang pipewire))
+    (home-page "https://pipewire.org")
+    (synopsis "Rust FFI bindings for libspa")
+    (description "This package provides Rust FFI bindings for libspa.")
+    (license license:expat)))
+
 (define-public rust-libsqlite3-sys-0.28
   (package
     (name "rust-libsqlite3-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 12/75] gnu: Add rust-libspa-sys-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-libspa-sys-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 28c0681908..ac355b5a41 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38913,6 +38913,23 @@ (define-public rust-libspa-sys-0.8
     (description "This package provides Rust FFI bindings for libspa.")
     (license license:expat)))
 
+(define-public rust-libspa-sys-0.7
+  (package
+    (inherit rust-libspa-sys-0.8)
+    (name "rust-libspa-sys")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libspa-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ifkg4k7azfqbz4i1lk31d77nhlc2w36s133yf78a3z7yfihrrxk"))))
+    (arguments
+     `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.66)
+                       ("rust-cc" ,rust-cc-1)
+                       ("rust-system-deps" ,rust-system-deps-6))))))
+
 (define-public rust-libsqlite3-sys-0.28
   (package
     (name "rust-libsqlite3-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 13/75] gnu: Add rust-libspa-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-libspa-0.8): Add variable.
---
 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 ac355b5a41..48eefc7ee6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38890,6 +38890,42 @@ (define-public rust-libsensors-sys-0.2
     (description "This package provides Rust bindings to libsensors.")
     (license license:miros)))
 
+(define-public rust-libspa-0.8
+  (package
+    (name "rust-libspa")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libspa" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "044qs48yl0llp2dmrgwxj9y1pgfy09i6fhq661zqqb9a3fwa9wv5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=utils::result::tests::async_seq_panic")
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-2)
+        ("rust-cc" ,rust-cc-1)
+        ("rust-convert-case" ,rust-convert-case-0.6)
+        ("rust-cookie-factory" ,rust-cookie-factory-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-libspa-sys" ,rust-libspa-sys-0.8)
+        ("rust-nix" ,rust-nix-0.27)
+        ("rust-nom" ,rust-nom-7)
+        ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs
+       (("rust-pipewire" ,rust-pipewire-0.8)
+        ("rust-pipewire-sys" ,rust-pipewire-sys-0.8))))
+    (native-inputs (list pkg-config))
+    (inputs (list clang pipewire))
+    (home-page "https://pipewire.org")
+    (synopsis "Rust bindings for libspa")
+    (description "This package provides Rust bindings for libspa.")
+    (license license:expat)))
+
 (define-public rust-libspa-sys-0.8
   (package
     (name "rust-libspa-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 14/75] gnu: Add rust-libspa-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-libspa-0.7): Add variable.

Change-Id: I5610fd650c0d7cb0f4f31707f8b1db245850d7b4
---
 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 48eefc7ee6..53f0ea21bc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38926,6 +38926,34 @@ (define-public rust-libspa-0.8
     (description "This package provides Rust bindings for libspa.")
     (license license:expat)))
 
+(define-public rust-libspa-0.7
+  (package
+    (inherit rust-libspa-0.8)
+    (name "rust-libspa")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libspa" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1i58ayw50brjh1a7gzfs9ijwl42lqmq2k4b7c2w1ijnx41q62d04"))))
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--" "--skip=result::tests::async_seq_panic")
+       #:cargo-development-inputs
+       (("rust-pipewire" ,rust-pipewire-0.7)
+        ("rust-pipewire-sys" ,rust-pipewire-sys-0.7))
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-cc" ,rust-cc-1)
+                       ("rust-convert-case" ,rust-convert-case-0.6)
+                       ("rust-cookie-factory" ,rust-cookie-factory-0.3)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libspa-sys" ,rust-libspa-sys-0.7)
+                       ("rust-nix" ,rust-nix-0.26)
+                       ("rust-nom" ,rust-nom-7)
+                       ("rust-system-deps" ,rust-system-deps-6))))))
+
 (define-public rust-libspa-sys-0.8
   (package
     (name "rust-libspa-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 15/75] gnu: Add rust-pipewire-sys-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pipewire-sys-0.8): Add variable.
---
 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 53f0ea21bc..f1c273bf46 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54940,6 +54940,31 @@ (define-public rust-piper-0.1
        #:cargo-development-inputs
        (("rust-futures" ,rust-futures-0.3))))))
 
+(define-public rust-pipewire-sys-0.8
+  (package
+    (name "rust-pipewire-sys")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pipewire-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04hiy3rl8v3j2dfzp04gr7r8l5azzqqsvqdzwa7sipdij27ii7l4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bindgen" ,rust-bindgen-0.69)
+        ("rust-libspa-sys" ,rust-libspa-sys-0.8)
+        ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list clang pipewire))
+    (home-page "https://pipewire.org")
+    (synopsis "Rust FFI bindings for PipeWire")
+    (description
+      "This package provides Rust FFI bindings for @code{PipeWire}.")
+    (license license:expat)))
+
 (define-public rust-pkg-config-0.3
   (package
     (name "rust-pkg-config")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 16/75] gnu: Add rust-pipewire-sys-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pipewire-sys-0.7): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f1c273bf46..afb6226936 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54965,6 +54965,23 @@ (define-public rust-pipewire-sys-0.8
       "This package provides Rust FFI bindings for @code{PipeWire}.")
     (license license:expat)))
 
+(define-public rust-pipewire-sys-0.7
+  (package
+    (inherit rust-pipewire-sys-0.8)
+    (name "rust-pipewire-sys")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pipewire-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0r4z0farzflycgfp6x7z65h57np4l1qnpj4r8z5lcwkkgd70h349"))))
+    (arguments
+     `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.66)
+                       ("rust-libspa-sys" ,rust-libspa-sys-0.7)
+                       ("rust-system-deps" ,rust-system-deps-6))))))
+
 (define-public rust-pkg-config-0.3
   (package
     (name "rust-pkg-config")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 17/75] gnu: Add rust-pipewire-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pipewire-0.8): Add variable.
---
 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 afb6226936..f1f7bbff05 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54940,6 +54940,38 @@ (define-public rust-piper-0.1
        #:cargo-development-inputs
        (("rust-futures" ,rust-futures-0.3))))))
 
+(define-public rust-pipewire-0.8
+  (package
+    (name "rust-pipewire")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pipewire" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1nldg1hz4v0qr26lzdxqpvrac4zbc3pb6436sl392425bjx4brh8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-clap" ,rust-clap-4)
+                                   ("rust-once-cell" ,rust-once-cell-1))
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libspa" ,rust-libspa-0.8)
+                       ("rust-libspa-sys" ,rust-libspa-sys-0.8)
+                       ("rust-nix" ,rust-nix-0.27)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-pipewire-sys" ,rust-pipewire-sys-0.8)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (native-inputs (list pkg-config))
+    (inputs (list clang pipewire))
+    (home-page "https://pipewire.org")
+    (synopsis "Rust bindings for PipeWire")
+    (description
+      "This package provides Rust bindings for @code{PipeWire}.")
+    (license license:expat)))
+
 (define-public rust-pipewire-sys-0.8
   (package
     (name "rust-pipewire-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 18/75] gnu: Add rust-pipewire-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pipewire-0.7): Add variable.
---
 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 f1f7bbff05..eff1a59a82 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54972,6 +54972,31 @@ (define-public rust-pipewire-0.8
       "This package provides Rust bindings for @code{PipeWire}.")
     (license license:expat)))
 
+(define-public rust-pipewire-0.7
+  (package
+    (inherit rust-pipewire-0.8)
+    (name "rust-pipewire")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pipewire" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1sg9cbvhp0s07a337zwli0xm40f8wkvm06d72nsr1s35vp40kl52"))))
+    (arguments
+     `(#:cargo-development-inputs (("rust-clap" ,rust-clap-4)
+                                   ("rust-once-cell" ,rust-once-cell-1))
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libspa" ,rust-libspa-0.7)
+                       ("rust-libspa-sys" ,rust-libspa-sys-0.7)
+                       ("rust-nix" ,rust-nix-0.26)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-pipewire-sys" ,rust-pipewire-sys-0.7)
+                       ("rust-thiserror" ,rust-thiserror-1))))))
+
 (define-public rust-pipewire-sys-0.8
   (package
     (name "rust-pipewire-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 19/75] gnu: Add rust-ashpd-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ashpd-0.6): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index eff1a59a82..4abf66147a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4135,6 +4135,55 @@ (define-public rust-ascii-utils-0.9
      "This library provides utilities to handle ASCII characters.")
     (license license:mpl2.0)))
 
+(define-public rust-ashpd-0.6
+  (package
+    (name "rust-ashpd")
+    (version "0.6.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ashpd" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "109d7w6v0rnpy9lv4kmhwgh0sff0440s2vybj1k0ik4ib3d2xhja"))
+       (modules '((guix build utils)))
+       (snippet '(substitute* "README.md"
+                   (("desktop::Color")
+                    "desktop::screenshot::Color")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-fs" ,rust-async-fs-2)
+        ("rust-async-net" ,rust-async-net-2)
+        ("rust-enumflags2" ,rust-enumflags2-0.7)
+        ("rust-futures-channel" ,rust-futures-channel-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-gdk4-wayland" ,rust-gdk4-wayland-0.7)
+        ("rust-gdk4-x11" ,rust-gdk4-x11-0.7)
+        ("rust-gtk4" ,rust-gtk4-0.7)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-pipewire" ,rust-pipewire-0.7)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-raw-window-handle" ,rust-raw-window-handle-0.5)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-repr" ,rust-serde-repr-0.1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-url" ,rust-url-2)
+        ("rust-wayland-backend" ,rust-wayland-backend-0.1)
+        ("rust-wayland-client" ,rust-wayland-client-0.30)
+        ("rust-wayland-protocols" ,rust-wayland-protocols-0.30)
+        ("rust-zbus" ,rust-zbus-3))
+       #:cargo-development-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/bilelmoussaoui/ashpd")
+    (synopsis "XDG portals wrapper in Rust using zbus")
+    (description
+      "This package provides an XDG portals wrapper in Rust using zbus.")
+    (license license:expat)))
+
 (define-public rust-asio-sys-0.2
   (package
     (name "rust-asio-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 20/75] gnu: Add rust-djb-hash-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-djb-hash-0.1): Add variable.

Change-Id: I86601bfc37f8803442a6744194c327a7c2c5f478
---
 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 4abf66147a..a49f1e6c28 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22221,6 +22221,25 @@ (define-public rust-divan-macros-0.1
 benchmarking library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-djb-hash-0.1
+  (package
+    (name "rust-djb-hash")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "djb_hash" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0y45y23xlnnskzbprwg4l3bwv21pgzjlfkzjz2db98r7wrhpvkz8"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/Dragonrun1/djb_hash")
+    (synopsis "Commonly used Daniel J. Bernstein style hash functions.")
+    (description
+     "This package provides a Rust library of commonly used Daniel J. Bernstein style
+hash functions.")
+    (license license:bsd-3)))
+
 (define-public rust-dlib-0.5
   (package
     (name "rust-dlib")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 21/75] gnu: rust-darling-core-0.20: Update to 0.20.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-darling-core-0.20): Update to 0.20.8.
[arguments]: Don't skip the build.
[description]: Start with 'This package is'.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a49f1e6c28..e34028c503 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19264,19 +19264,17 @@ (define-public rust-darling-0.9
 (define-public rust-darling-core-0.20
   (package
     (name "rust-darling-core")
-    (version "0.20.3")
+    (version "0.20.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "darling_core" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "08g6afi3z9jgcqx7g41s1mzr6q3dj2z56vz7v1bv6941h51k8zhp"))))
+        (base32 "03x7s149p06xfwcq0lgkk4yxh6jf7jckny18nzp1yyk87b1g2b4w"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-fnv" ,rust-fnv-1)
         ("rust-ident-case" ,rust-ident-case-1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
@@ -19286,8 +19284,9 @@ (define-public rust-darling-core-0.20
     (home-page "https://github.com/TedDriggs/darling")
     (synopsis "Helper crate for @code{rust-darling}")
     (description
-     "Helper crate for @code{rust-darling}, a proc-macro library for
-reading attributes into structs when implementing custom derives.")
+     "This package is a helper crate for @code{rust-darling}: a proc-
+macro library for reading attributes into structs when implementing
+custom derives.")
     (license license:expat)))
 
 (define-public rust-darling-core-0.14
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 22/75] gnu: rust-darling-macro-0.20: Update to 0.20.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-darling-macro-0.20): Update to
0.20.8.
[arguments]: Don't skip the build.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e34028c503..cb3e1ae131 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19394,19 +19394,18 @@ (define-public rust-darling-core-0.9
 (define-public rust-darling-macro-0.20
   (package
     (name "rust-darling-macro")
-    (version "0.20.3")
+    (version "0.20.8")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "darling-macro" version))
+       (uri (crate-uri "darling_macro" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1mg2k1f0v33s271lpn4m5mxcfjqnmg61bf77svb44cyngay9nsl3"))))
+         "0gwkz0cjfy3fgcc1zmm7azzhj5qpja34s0cklcria4l38sjyss56"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-darling-core" ,rust-darling-core-0.20)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-2))))
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 23/75] gnu: rust-darling-0.20: Update to 0.20.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-darling-0.20): Update to 0.20.8.
[arguments]: Don't skip the build and add cargo-development-inputs.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cb3e1ae131..008f73fc42 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19127,7 +19127,7 @@ (define-public rust-daemonize-0.4
 (define-public rust-darling-0.20
   (package
     (name "rust-darling")
-    (version "0.20.3")
+    (version "0.20.8")
     (source
      (origin
        (method url-fetch)
@@ -19135,10 +19135,15 @@ (define-public rust-darling-0.20
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0pjwwadwgnvvgn5qm3glpv7hjl7siaqqpw6cvh2mdar7lr6xj282"))))
+         "14a38qsi9104kvk1z11rqj0bnz1866dyhnvgvbgzz17d2g6nzqsl"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:cargo-development-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-syn" ,rust-syn-2)
+        ("rust-trybuild" ,rust-trybuild-1))
        #:cargo-inputs
        (("rust-darling-core" ,rust-darling-core-0.20)
         ("rust-darling-macro" ,rust-darling-macro-0.20))))
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 24/75] gnu: Add rust-derive-builder-core-0.20.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-derive-builder-core-0.20): Add
variable.
(rust-derive-builder-core-0.13): Inherit from
rust-derive-builder-core-0.20.
---
 gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 008f73fc42..36b8fe5a8e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20727,8 +20727,35 @@ (define-public rust-derive-builder-0.7
          ("rust-skeptic" ,rust-skeptic-0.13)
          ("rust-syn" ,rust-syn-0.15))))))
 
+(define-public rust-derive-builder-core-0.20
+  (package
+    (name "rust-derive-builder-core")
+    (version "0.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "derive_builder_core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "078bralcmzwy3vi0w1rc65a3v4kk6jgccsir5mrm34c3gxwdm36l"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))
+       #:cargo-inputs (("rust-darling" ,rust-darling-0.20)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/colin-kiegel/rust-derive-builder")
+    (synopsis "Internal helper library for @code{rust-derive-builder}")
+    (description
+     "This package provides an internal helper library for the
+@code{rust-derive-builder} crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-derive-builder-core-0.13
   (package
+    (inherit rust-derive-builder-core-0.20)
     (name "rust-derive-builder-core")
     (version "0.13.1")
     (source (origin
@@ -20738,19 +20765,13 @@ (define-public rust-derive-builder-core-0.13
               (sha256
                (base32
                 "1381dgjq6jhirww088dff8b00v2d99illvnan0l0kvz7qdy33v54"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-darling" ,rust-darling-0.14)
                        ("rust-proc-macro2" ,rust-proc-macro2-1)
                        ("rust-quote" ,rust-quote-1)
                        ("rust-syn" ,rust-syn-1))
        #:cargo-development-inputs
-       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
-    (home-page "https://github.com/colin-kiegel/rust-derive-builder")
-    (synopsis "Internal helper library for @code{rust-derive-builder}")
-    (description
-     "Internal helper library for @code{rust-derive-builder}.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
 
 (define-public rust-derive-builder-core-0.12
   (package
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 25/75] gnu: Add rust-derive-builder-macro-0.20.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-derive-builder-macro-0.20): Add
variable.
* gnu/packages/crates-io.scm (rust-derive-builder-macro-0.13): Inherit
from rust-derive-builder-macro-0.20.
---
 gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 36b8fe5a8e..0e25deab9a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20881,8 +20881,32 @@ (define-public rust-derive-builder-core-0.5
          ("rust-quote" ,rust-quote-0.6)
          ("rust-syn" ,rust-syn-0.15))))))
 
+(define-public rust-derive-builder-macro-0.20
+  (package
+    (name "rust-derive-builder-macro")
+    (version "0.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "derive_builder_macro" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0yq9hnyayys16rzmiwjd6gfx1ysph7c9zh94w76cw9rg4jw6hs10"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-derive-builder-core" ,rust-derive-builder-core-0.20)
+        ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/colin-kiegel/rust-derive-builder")
+    (synopsis "Macro to implement the builder pattern for arbitrary structs")
+    (description
+     "This package provides a Rust macro to automatically implement the
+builder pattern for arbitrary structs.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-derive-builder-macro-0.13
   (package
+    (inherit rust-derive-builder-macro-0.20)
     (name "rust-derive-builder-macro")
     (version "0.13.1")
     (source (origin
@@ -20892,16 +20916,10 @@ (define-public rust-derive-builder-macro-0.13
               (sha256
                (base32
                 "09q17rzgf8bsj8n1bhlf4f93nmqg8va6321ppcd07f1mzg1nh0w7"))))
-    (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-derive-builder-core" ,rust-derive-builder-core-0.13)
-                       ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/colin-kiegel/rust-derive-builder")
-    (synopsis "Automatically implement the builder pattern for arbitrary structs")
-    (description
-     "This crate provides a Rust macro to automatically implement the builder
-pattern for arbitrary structs.")
-    (license (list license:expat license:asl2.0))))
+     `(#:cargo-inputs
+       (("rust-derive-builder-core" ,rust-derive-builder-core-0.13)
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-derive-builder-macro-0.12
   (package
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 26/75] gnu: Add rust-derive-builder-0.20.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-derive-builder-0.20): Add variable.
(rust-derive-builder-0.13): Inherit from rust-derive-builder-0.20.
---
 gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0e25deab9a..f7ae9f410f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20591,8 +20591,37 @@ (define-public rust-derive-arbitrary-0.4
        (sha256
         (base32 "1rp0z4k0j5ip0bx6dssg97l4q6bakhf6lm5h1lpr3p3kwjsi585i"))))))
 
+(define-public rust-derive-builder-0.20
+  (package
+    (name "rust-derive-builder")
+    (version "0.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "derive_builder" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mzz0njgbrzlhj97md03df5knfcp5svw1ifn2rcqlqii0g5val03"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-trybuild" ,rust-trybuild-1))
+       #:cargo-inputs
+       (("rust-derive-builder-macro" ,rust-derive-builder-macro-0.20))))
+    (home-page "https://github.com/colin-kiegel/rust-derive-builder")
+    (synopsis "Builder pattern for arbitrary structs")
+    (description
+     "This package provides a Rust macro to automatically implement the
+builder pattern for arbitrary structs.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-derive-builder-0.13
   (package
+    (inherit rust-derive-builder-0.20)
     (name "rust-derive-builder")
     (version "0.13.1")
     (source (origin
@@ -20602,7 +20631,6 @@ (define-public rust-derive-builder-0.13
               (sha256
                (base32
                 "1irqx6bz74kx48ivdwqp2xl1ibr8dbdwgh6573r8g00d82gicncg"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-derive-builder-macro" ,rust-derive-builder-macro-0.13))
@@ -20611,12 +20639,7 @@ (define-public rust-derive-builder-0.13
         ("rust-rustversion" ,rust-rustversion-1)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-trybuild" ,rust-trybuild-1))))
-    (home-page "https://github.com/colin-kiegel/rust-derive-builder")
-    (synopsis "Builder pattern for arbitrary structs")
-    (description "Rust macro to automatically implement the builder pattern
-for arbitrary structs.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-trybuild" ,rust-trybuild-1))))))
 
 (define-public rust-derive-builder-0.12
   (package
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 27/75] gnu: Add rust-geo-uri-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-geo-uri-0.2): Add variable.

Change-Id: I95508240132da18d37dc4ff47acd804491efd455
---
 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 f7ae9f410f..32de493d6d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29592,6 +29592,32 @@ (define-public rust-geo-types-0.6
        #:cargo-development-inputs
        (("rust-approx" ,rust-approx-0.3))))))
 
+(define-public rust-geo-uri-0.2
+  (package
+    (name "rust-geo-uri")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "geo-uri" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1klragbx8xqx9cairhgcc97ypyf62v41rhaq83zfxmvjrrvyndds"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--features" "url")
+       #:cargo-inputs (("rust-derive-builder" ,rust-derive-builder-0.20)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://git.luon.net/paul/geo-uri-rs")
+    (synopsis "Parse and generate URIs for geographic locations")
+    (description
+     "This package provides a crate for parsing and generating Uniform
+Resource Identifiers for geographic locations (geo URIs).")
+    (license license:expat)))
+
 (define-public rust-gethostname-0.4
   (package
     (name "rust-gethostname")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 28/75] gnu: Add rust-ammonia-3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ammonia-3): Add variable.

Change-Id: I49c3c414e91c550be3f121857410a0441186070e
---
 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 32de493d6d..1d7931e875 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1432,6 +1432,32 @@ (define-public rust-alto-3
      "Rust bindings for OpenAL 1.1 and extensions (including EFX).")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ammonia-3
+  (package
+    (name "rust-ammonia")
+    (version "3.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ammonia" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0w01hk3b2k3q53jny6n5l6ayck1qgki7wmannz4hbdwdhg3x3rk4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-version-sync" ,rust-version-sync-0.9))
+       #:cargo-inputs (("rust-html5ever" ,rust-html5ever-0.26)
+                       ("rust-maplit" ,rust-maplit-1)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-tendril" ,rust-tendril-0.4)
+                       ("rust-url" ,rust-url-2))))
+    (home-page "https://github.com/rust-ammonia/ammonia")
+    (synopsis "HTML Sanitization")
+    (description "This package provides HTML Sanitization.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-android-activity-0.5
   (package
     (name "rust-android-activity")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 29/75] gnu: Add rust-linkify-0.9.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-linkify-0.9): Add variable.
(rust-linkify-0.4): Inherit from rust-linkify-0.9.
---
 gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1d7931e875..2d1fb01dc3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39757,23 +39757,28 @@ (define-public rust-linked-hash-map-0.3
         ("rust-serde" ,rust-serde-0.8)
         ("rust-serde-test" ,rust-serde-test-0.8))))))
 
-(define-public rust-linkify-0.4
+(define-public rust-linkify-0.9
   (package
     (name "rust-linkify")
-    (version "0.4.0")
+    (version "0.9.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "linkify" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "15i0q81vrhm4asskacy2z83fyj09ivcff0km82gwbli4vlkib583"))))
+        (base32 "1xfgz0lh1rbirzi28rnl0378w967jwhkd4v0qqmi2n430225ipcn"))
+       (modules '((guix build utils)))
+       (snippet '(substitute* "Cargo.toml"
+                   (("= 0.3.2")
+                    "0.3.2")))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-memchr" ,rust-memchr-2))
-       #:cargo-development-inputs
-       (("rust-version-sync" ,rust-version-sync-0.8))))
+     `(#:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-plotters-backend" ,rust-plotters-backend-0.3))
+       #:cargo-inputs (("rust-memchr" ,rust-memchr-2))))
     (home-page "https://github.com/robinst/linkify")
     (synopsis "Find URLs and email addresses in plain text")
     (description
@@ -39782,6 +39787,24 @@ (define-public rust-linkify-0.4
 punctuation.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-linkify-0.4
+  (package
+    (inherit rust-linkify-0.9)
+    (name "rust-linkify")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "linkify" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15i0q81vrhm4asskacy2z83fyj09ivcff0km82gwbli4vlkib583"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-memchr" ,rust-memchr-2))
+       #:cargo-development-inputs
+       (("rust-version-sync" ,rust-version-sync-0.8))))))
+
 (define-public rust-linux-keyutils-0.2
   (package
     (name "rust-linux-keyutils")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 30/75] gnu: Add rust-html2pango-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-html2pango-0.6): Add variable.

Change-Id: Ic0f7cd33874cc960fd1afb5fcca7d3cf8b6ceea0
---
 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 2d1fb01dc3..72cd4a323b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32557,6 +32557,35 @@ (define-public rust-html-escape-0.2
 characters in HTML, decoding and unescaping HTML entities as well.")
     (license license:expat)))
 
+(define-public rust-html2pango-0.6
+  (package
+    (name "rust-html2pango")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "html2pango" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06q9r04n2knq0nr8g2xb7n791cg217r1fi59h4zh6f057k663w55"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-ammonia" ,rust-ammonia-3)
+                       ("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-html5ever" ,rust-html5ever-0.26)
+                       ("rust-linkify" ,rust-linkify-0.9)
+                       ("rust-maplit" ,rust-maplit-1)
+                       ("rust-markup5ever-rcdom" ,rust-markup5ever-rcdom-0.2)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-regex" ,rust-regex-1))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://gitlab.gnome.org/World/html2pango")
+    (synopsis "Library to convert html to pango")
+    (description
+      "This package provides a library to convert html to pango.")
+    (license license:gpl3+)))
+
 (define-public rust-html5ever-0.26
   (package
     (name "rust-html5ever")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 31/75] gnu: rust-jetscii-0.5: Upgrade to 0.5.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-jetscii-0.5): Update to 0.5.3.
[cargo-development-inputs]: Replace rust-region-2 with 3.

Change-Id: I27ab1317cd4893fddcf42bc207a35abf0b7ee772
---
 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 72cd4a323b..54e5be7f94 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36169,21 +36169,21 @@ (define-public rust-jemallocator-0.1
 (define-public rust-jetscii-0.5
   (package
     (name "rust-jetscii")
-    (version "0.5.0")
+    (version "0.5.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "jetscii" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1x4z5ixlxv1wa70d3d6ad3n8qxz6z00i13zwnv219v45qcwybbnb"))))
+        (base32 "0pppbawc1v6lshz6zi3d4bkz7xbalph9sd78a5299jd94kz45wa7"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
        (("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-memmap" ,rust-memmap-0.7)
         ("rust-proptest" ,rust-proptest-1)
-        ("rust-region" ,rust-region-2))))
+        ("rust-region" ,rust-region-3))))
     (home-page "https://github.com/shepmaster/jetscii")
     (synopsis
      "Search strings and byte slices for sets of ASCII characters or bytes")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 32/75] gnu: Add rust-html5gum-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-html5gum-0.5): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 54e5be7f94..6b290ecc2a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32693,6 +32693,37 @@ (define-public rust-html5ever-0.23
         ("rust-rustc-test" ,rust-rustc-test-0.3)
         ("rust-typed-arena" ,rust-typed-arena-1))))))
 
+(define-public rust-html5gum-0.5
+  (package
+    (name "rust-html5gum")
+    (version "0.5.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "html5gum" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "057zrfis7p567s8d41z04f82idipzdcv125ygc8vln50f5hmakjc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ; missing file
+       #:cargo-inputs (("rust-jetscii" ,rust-jetscii-0.5))
+       #:cargo-development-inputs
+       (("rust-glob" ,rust-glob-0.3)
+        ("rust-iai" ,rust-iai-0.1)
+        ("rust-libtest-mimic" ,rust-libtest-mimic-0.6)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-test-generator" ,rust-test-generator-0.3))))
+    (home-page "https://github.com/untitaker/html5gum")
+    (synopsis "WHATWG-compliant HTML5 tokenizer and tag soup parser.")
+    (description
+     "This package provides a WHATWG-compliant HTML5 tokenizer and tag
+soup parser.")
+    (license license:expat)))
+
 (define-public rust-htmlescape-0.3
   (package
     (name "rust-htmlescape")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 33/75] gnu: Add rust-libshumate-sys-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-libshumate-sys-0.4): Add variable.
---
 gnu/packages/crates-gtk.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 223805273b..94fbe4fb2c 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2882,6 +2882,38 @@ (define-public rust-libadwaita-sys-0.5
     (description "FFI bindings for libadwaita.")
     (license license:expat)))
 
+(define-public rust-libshumate-sys-0.4
+  (package
+    (name "rust-libshumate-sys")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libshumate-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "00six90yvni8233kzcr7j8qqrvyndssy7gc677akm0i5snl6gln2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs (("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.18)
+                       ("rust-gdk4-sys" ,rust-gdk4-sys-0.7)
+                       ("rust-gio-sys" ,rust-gio-sys-0.18)
+                       ("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+                       ("rust-gtk4-sys" ,rust-gtk4-sys-0.7)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list gdk-pixbuf glib gtk libshumate))
+    (home-page "https://world.pages.gitlab.gnome.org/Rust/libshumate-rs/")
+    (synopsis "FFI bindings for libshumate")
+    (description "This package provides FFI bindings for libshumate.")
+    (license license:expat)))
+
 (define-public rust-pango-0.18
   (package
     (name "rust-pango")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 34/75] gnu: Add rust-libshumate-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-libshumate-0.4): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 94fbe4fb2c..fb5dc6040a 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2882,6 +2882,33 @@ (define-public rust-libadwaita-sys-0.5
     (description "FFI bindings for libadwaita.")
     (license license:expat)))
 
+(define-public rust-libshumate-0.4
+  (package
+    (name "rust-libshumate")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libshumate" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b8vxpbanfdxgry772rza202w3kgf3x73rr9fzli1gavyxzx4hxp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.18)
+                       ("rust-gdk4" ,rust-gdk4-0.7)
+                       ("rust-gio" ,rust-gio-0.18)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-gtk4" ,rust-gtk4-0.7)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libshumate-sys" ,rust-libshumate-sys-0.4))))
+    (native-inputs (list pkg-config))
+    (inputs (list gtk libshumate))
+    (home-page "https://world.pages.gitlab.gnome.org/Rust/libshumate-rs/")
+    (synopsis "Rust bindings for libshumate")
+    (description "This package provides Rust bindings for libshumate.")
+    (license license:expat)))
+
 (define-public rust-libshumate-sys-0.4
   (package
     (name "rust-libshumate-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 35/75] gnu: rust-blocking-1: Upgrade to 1.6.0.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-blocking-1): Update to 1.6.0.
[cargo-development-inputs]: Replace rust-futures-lite-1 with 2.
[cargo-inputs]: Replace rust-async-channel-1 with 2, rust-async-lock-2
with 3, rust-futures-lite-1 with 2.  Remove rust-fastrand-2.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6b290ecc2a..2d31ff85e4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8738,27 +8738,25 @@ (define-public rust-block-padding-0.1
 (define-public rust-blocking-1
   (package
     (name "rust-blocking")
-    (version "1.4.1")
+    (version "1.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "blocking" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0aiy8y524jvxl942hh5naxjjn7b5rjapsjqb6vfv6x45sk8a8dlc"))))
+        (base32 "123yf6slr47jnwnmhimkhgkx5rqzr9x28d7b19pkbdv2x4272ps9"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-async-channel" ,rust-async-channel-1)
-        ("rust-async-lock" ,rust-async-lock-2)
-        ("rust-async-task" ,rust-async-task-4)
-        ("rust-fastrand" ,rust-fastrand-2)
-        ("rust-futures-io" ,rust-futures-io-0.3)
-        ("rust-futures-lite" ,rust-futures-lite-1)
-        ("rust-piper" ,rust-piper-0.2)
-        ("rust-tracing" ,rust-tracing-0.1))
-       #:cargo-development-inputs
-       (("rust-futures-lite" ,rust-futures-lite-1))))
+     `(#:cargo-development-inputs
+       (("rust-futures-lite" ,rust-futures-lite-2))
+       #:cargo-inputs (("rust-async-channel" ,rust-async-channel-2)
+                       ("rust-async-lock" ,rust-async-lock-3)
+                       ("rust-async-task" ,rust-async-task-4)
+                       ("rust-futures-io" ,rust-futures-io-0.3)
+                       ("rust-futures-lite" ,rust-futures-lite-2)
+                       ("rust-piper" ,rust-piper-0.2)
+                       ("rust-tracing" ,rust-tracing-0.1))))
     (home-page "https://github.com/smol-rs/blocking")
     (synopsis "Thread pool for isolating blocking I/O in async programs")
     (description
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 36/75] gnu: Add rust-oo7-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-oo7-0.2): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2d31ff85e4..e5e4eda1a3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50145,6 +50145,58 @@ (define-public rust-onig-sys-69.6
 other crates to create safe wrappers around Oniguruma.")
     (license license:expat)))
 
+(define-public rust-oo7-0.2
+  (package
+    (name "rust-oo7")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "oo7" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13cpaq7f51gqcspd4097vjr7r2cjpxpn6c02x67dsdizk0xaiv5c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--" ; missing files
+         "--skip=dbus::collection::tests::create_encrypted_item"
+         "--skip=dbus::collection::tests::create_plain_item"
+         "--skip=dbus::service::tests::create_collection")
+       #:cargo-inputs (("rust-aes" ,rust-aes-0.8)
+                       ("rust-async-fs" ,rust-async-fs-2)
+                       ("rust-async-io" ,rust-async-io-2)
+                       ("rust-async-lock" ,rust-async-lock-3)
+                       ("rust-blocking" ,rust-blocking-1)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-cbc" ,rust-cbc-0.1)
+                       ("rust-cipher" ,rust-cipher-0.4)
+                       ("rust-digest" ,rust-digest-0.10)
+                       ("rust-futures-lite" ,rust-futures-lite-2)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-num" ,rust-num-0.4)
+                       ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.8)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-openssl" ,rust-openssl-0.10)
+                       ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-zbus" ,rust-zbus-3)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/bilelmoussaoui/oo7")
+    (synopsis "Secret Service provider")
+    (description
+     "James Bond went on a new mission and this time as a Secret Service
+provider.")
+    (license license:expat)))
+
 (define-public rust-oorandom-11
   (package
     (name "rust-oorandom")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 37/75] gnu: Add rust-checked-int-cast-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-checked-int-cast-1): Add variable.
---
 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 e5e4eda1a3..52077a9946 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12328,6 +12328,26 @@ (define-public rust-charset-0.1
 Encoding Standard.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-checked-int-cast-1
+  (package
+    (name "rust-checked-int-cast")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "checked_int_cast" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06brva5agm6g12q15f8fidz17akb85q211496p1k2qxhb9mmxk0p"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/PeterReid/checked_int_cast")
+    (synopsis
+     "Primitive integer conversions with over- and underflow checks")
+    (description
+     "This package provides conversions between primitive integers with
+overflow and underflow checking.")
+    (license license:expat)))
+
 (define-public rust-chrono-0.4
   (package
     (name "rust-chrono")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 38/75] gnu: Add rust-proptest-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-proptest-0.8): Add variable.
---
 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 52077a9946..637d798c92 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58857,6 +58857,44 @@ (define-public rust-proptest-0.9
        #:cargo-development-inputs
        (("rust-regex" ,rust-regex-1))))))
 
+(define-public rust-proptest-0.8
+  (package
+    (inherit rust-proptest-0.9)
+    (name "rust-proptest")
+    (version "0.8.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "proptest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07qrxwsd72wr1cqs0b5b159lnagjffp0l4s4zriz8jak8w20cvcj"))))
+    (arguments
+     `(#:cargo-test-flags
+       ;; Doc-test fails with error[E0720]: cannot resolve opaque type.
+       '("--release" "--all-targets" "--"
+         "--skip=string::test::askalono_0"
+         "--skip=string::test::askalono_9"
+         "--skip=string::test::comrak_0"
+         "--skip=string::test::fblog_0"
+         "--skip=string::test::fblog_1"
+         "--skip=string::test::linky_0"
+         "--skip=string::test::phone_number_0"
+         "--skip=string::test::spaceslugs_2"
+         "--skip=string::test::stache_0")
+       #:cargo-development-inputs
+       (("rust-regex" ,rust-regex-1))
+       #:cargo-inputs (("rust-bit-set" ,rust-bit-set-0.5)
+                       ("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-num-traits" ,rust-num-traits-0.2)
+                       ("rust-quick-error" ,rust-quick-error-1)
+                       ("rust-rand" ,rust-rand-0.5)
+                       ("rust-regex-syntax" ,rust-regex-syntax-0.6)
+                       ("rust-rusty-fork" ,rust-rusty-fork-0.2)
+                       ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-proptest-0.3
   (package
     (inherit rust-proptest-0.9)
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 39/75] gnu: Add rust-galois-2p8-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-galois-2p8-0.1): Add variable.
---
 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 637d798c92..486215291b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29290,6 +29290,28 @@ (define-public rust-galil-seiferas-0.1
 time, for nonorderable alphabets.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-galois-2p8-0.1
+  (package
+    (name "rust-galois-2p8")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "galois_2p8" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "143l2xmdxsqqj966722nv1zfncdm7yssixs07f3mc2qa18xskfml"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-proptest" ,rust-proptest-0.8))))
+    (home-page "https://github.com/djsweet/galois_2p8")
+    (synopsis "Basic arithmetic over all GF(2^8) fields")
+    (description
+     "This package provides basic arithmetic over all GF(2^8) fields.")
+    (license license:expat)))
+
 (define-public rust-gat-std-0.1
   (package
     (name "rust-gat-std")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 40/75] gnu: Add rust-reed-solomon-erasure-6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-reed-solomon-erasure-6): Add
variable.
---
 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 486215291b..e20a5a36b6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63502,6 +63502,36 @@ (define-public rust-reduce-0.1
 initial value.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-reed-solomon-erasure-6
+  (package
+    (name "rust-reed-solomon-erasure")
+    (version "6.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "reed-solomon-erasure" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0kqdjvrvb24iivi1wfjhjjm99a3msiiad8j3bm84yk8da0ykfqvj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-quickcheck" ,rust-quickcheck-0.9)
+        ("rust-rand" ,rust-rand-0.7))
+       #:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libm" ,rust-libm-0.2)
+                       ("rust-lru" ,rust-lru-0.7)
+                       ("rust-parking-lot" ,rust-parking-lot-0.11)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-spin" ,rust-spin-0.9))))
+    (home-page "https://github.com/darrenldl/reed-solomon-erasure")
+    (synopsis "Rust implementation of Reed-Solomon erasure coding")
+    (description
+     "This package provides a Rust implementation of Reed-Solomon
+erasure coding.")
+    (license license:expat)))
+
 (define-public rust-reedline-0.30
   (package
     (name "rust-reedline")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 41/75] gnu: Add rust-g2poly-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-g2poly-1): Add variable.
---
 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 e20a5a36b6..d518241d13 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29243,6 +29243,25 @@ (define-public rust-fxhash-0.2
 derived from an internal hasher used in FireFox and Rustc.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-g2poly-1
+  (package
+    (name "rust-g2poly")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "g2poly" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04lfc0j6169ljcfh5837ra3izmlcwnzw1c8l5km071ika3kqcsmg"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/WanzenBug/g2p")
+    (synopsis "Polynomials over the field GF(2)")
+    (description
+     "This package provides a primitive implementation of polynomials over
+the field GF(2).")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gag-0.1
   (package
     (name "rust-gag")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 42/75] gnu: Add rust-g2gen-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-g2gen-1): Add variable.
---
 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 d518241d13..fc071ecbb6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29243,6 +29243,30 @@ (define-public rust-fxhash-0.2
 derived from an internal hasher used in FireFox and Rustc.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-g2gen-1
+  (package
+    (name "rust-g2gen")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "g2gen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03l243pnj9pabd0pi0jcf4fyrxxhddx8ixv31gchs9gwn8jpcb7w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-g2poly" ,rust-g2poly-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/WanzenBug/g2p")
+    (synopsis "Macro to create finite field arithmetic types")
+    (description
+     "This package provides a macro to create types that implement fast
+finite field arithmetic.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-g2poly-1
   (package
     (name "rust-g2poly")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 43/75] gnu: Add rust-g2p-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-g2p-1): Add variable.
---
 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 fc071ecbb6..5085cd699f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29267,6 +29267,34 @@ (define-public rust-g2gen-1
 finite field arithmetic.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-g2p-1
+  (package
+    (name "rust-g2p")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "g2p" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17jip1izln1k6p694yns1qzapv89gdyzmx59fmvhbnnjqfyxjdpw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-galois-2p8" ,rust-galois-2p8-0.1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-reed-solomon-erasure" ,rust-reed-solomon-erasure-6)
+        ("rust-static-assertions" ,rust-static-assertions-1))
+       #:cargo-inputs (("rust-g2gen" ,rust-g2gen-1)
+                       ("rust-g2poly" ,rust-g2poly-1))))
+    (home-page "https://github.com/WanzenBug/g2p")
+    (synopsis "Create types that implement finite field arithmetic")
+    (description
+     "This package provides a way to generate types that implement fast
+finite field arithmetic.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-g2poly-1
   (package
     (name "rust-g2poly")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 44/75] gnu: Add rust-rqrr-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rqrr-0.6): Add variable.

Change-Id: Idd16cc3e475243fab534674dafa58b186778f62f
---
 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 5085cd699f..8731452fb3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65277,6 +65277,30 @@ (define-public rust-rpds-1
 structures with structural sharing.")
     (license license:mpl2.0)))
 
+(define-public rust-rqrr-0.6
+  (package
+    (name "rust-rqrr")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rqrr" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02wa9gnjrzxzpkcpry6ginvb45wn7wqgs83yqykb36znz78qg2sa"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-g2p" ,rust-g2p-1)
+                       ("rust-image" ,rust-image-0.24)
+                       ("rust-lru" ,rust-lru-0.9))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4)
+                                   ("rust-image" ,rust-image-0.24))))
+    (home-page "https://github.com/WanzenBug/rqrr")
+    (synopsis "Detect and read QR codes from any image source")
+    (description
+      "This package lets you detect and read QR codes from any image source.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rspec-1
   (package
     (name "rust-rspec")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 45/75] gnu: Add rust-secular-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-secular-1): Add variable.

Change-Id: Ib49ca74f9f4e3c73b7554bbc7dc4b30bad103dd9
---
 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 8731452fb3..39486a2ec5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70254,6 +70254,28 @@ (define-public rust-section-testing-0.0
      "This package provides a library for section-style testing.")
     (license license:expat)))
 
+(define-public rust-secular-1
+  (package
+    (name "rust-secular")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "secular" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1davw8k29sycm7f4674d4m44jfa7pn812jm3m3mm76srvz63xp63"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--all-targets")
+       #:cargo-inputs
+       (("rust-unicode-normalization" ,rust-unicode-normalization-0.1))))
+    (home-page "")
+    (synopsis "No Diacritics!")
+    (description
+      "This package provides diacritics removal on (ascii) chars.")
+    (license license:expat)))
+
 (define-public rust-selectors-0.24
   (package
     (name "rust-selectors")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 46/75] gnu: Add rust-gstreamer-sys-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-sys-0.21): Add variable.
(rust-gstreamer-sys-0.18): Inherit from rust-gstreamer-sys-0.21.
---
 gnu/packages/crates-gtk.scm | 47 +++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index fb5dc6040a..443f48f762 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2466,8 +2466,42 @@ (define-public rust-gstreamer-base-sys-0.18
     (description "FFI bindings to libgstbase-1.0, part of GStreamer.")
     (license license:expat)))
 
+(define-public rust-gstreamer-sys-0.21
+  (package
+    (name "rust-gstreamer-sys")
+    (version "0.21.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1i1vrqs9ys5y0ljl4nxh1x25dnwlcyh9hiybh4dysviy5dwdlk2n"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             ;; ABI tests fail with undeclared constants.
+             "--skip=cross_validate_constants_with_c"
+             "--skip=cross_validate_layout_with_c")
+       #:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list glib gstreamer))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "FFI bindings to libgstreamer-1.0")
+    (description
+      "This package provides FFI bindings to libgstreamer-1.0.")
+    (license license:expat)))
+
 (define-public rust-gstreamer-sys-0.18
   (package
+    (inherit rust-gstreamer-sys-0.21)
     (name "rust-gstreamer-sys")
     (version "0.18.0")
     (source (origin
@@ -2477,21 +2511,14 @@ (define-public rust-gstreamer-sys-0.18
               (sha256
                (base32
                 "1qikgp5m3xj41fbfyfl6ckb5i8dxadfvlvj5bf8girn2sdjpllg3"))))
-    (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs `(("rust-glib-sys" ,rust-glib-sys-0.15)
                             ("rust-gobject-sys" ,rust-gobject-sys-0.15)
                             ("rust-libc" ,rust-libc-0.2)
                             ("rust-system-deps" ,rust-system-deps-6))
-           #:cargo-development-inputs `(("rust-shell-words" ,rust-shell-words-1)
-                                        ("rust-tempfile" ,rust-tempfile-3))))
-    (native-inputs (list pkg-config))
-    (inputs (list glib gstreamer))
-    (home-page "https://gstreamer.freedesktop.org")
-    (synopsis "FFI bindings to libgstreamer-1.0")
-    (description
-     "Foreign Function Interface (FFI) bindings to libgstreamer-1.0.")
-    (license license:expat)))
+           #:cargo-development-inputs
+           `(("rust-shell-words" ,rust-shell-words-1)
+             ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gtk-0.14
   (package
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 47/75] gnu: Add rust-option-operations-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-option-operations-0.5): Add variable.
---
 gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 39486a2ec5..e2f64d7001 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51091,8 +51091,31 @@ (define-public rust-option-ext-0.2
     (description "Extends `Option` with additional operations")
     (license license:mpl2.0)))
 
+(define-public rust-option-operations-0.5
+  (package
+    (name "rust-option-operations")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "option-operations" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1l13n9487gk6063zzjdwzqbig78n8mh6dxsbiq9nbaxfn5xx49kw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-paste" ,rust-paste-1))))
+    (home-page "https://github.com/fengalin/option-operations")
+    (synopsis
+      "Improve arithmetic operations usability when dealing with Options")
+    (description
+     "This package provides traits and auto-implementations to improve
+arithmetic operations usability when dealing with Rust Options.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-option-operations-0.4
   (package
+    (inherit rust-option-operations-0.5)
     (name "rust-option-operations")
     (version "0.4.1")
     (source (origin
@@ -51101,16 +51124,7 @@ (define-public rust-option-operations-0.4
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "18jhy5sc56gwdvqc3asr6az685zc9zkgv8p8n69s94bcj6bibc22"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:cargo-inputs `(("rust-paste" ,rust-paste-1))))
-    (home-page "https://github.com/fengalin/option-operations")
-    (synopsis "Improved arithmetic operations when dealing with Rust Options")
-    (description
-     "Traits and auto-implementations to improve arithmetic operations
-usability when dealing with Rust Options.")
-    (license (list license:expat license:asl2.0))))
+                "18jhy5sc56gwdvqc3asr6az685zc9zkgv8p8n69s94bcj6bibc22"))))))
 
 (define-public rust-option-set-0.2
   (package
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 48/75] gnu: Add rust-pretty-hex-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pretty-hex-0.4): Add variable.
(rust-pretty-hex-0.3): Inherit from rust-pretty-hex-0.4.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e2f64d7001..b01becbbf1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57795,25 +57795,44 @@ (define-public rust-pretty-env-logger-0.3
         ("rust-chrono" ,rust-chrono-0.4)
         ("rust-env-logger" ,rust-env-logger-0.6))))))
 
-(define-public rust-pretty-hex-0.3
+(define-public rust-pretty-hex-0.4
   (package
     (name "rust-pretty-hex")
-    (version "0.3.0")
+    (version "0.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pretty-hex" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1mf8xvlfri4impj2paj4azx7hxh7l0i38cjyib1hiikwvlqhiyn6"))))
+        (base32 "0m0j8pqmh6gq1mq7yzp12z0ix159fw0di5lhiwv2y1j0m3j3xj5v"))))
     (build-system cargo-build-system)
     (arguments
-     (list #:cargo-development-inputs `(("rust-heapless" ,rust-heapless-0.5))))
+     `(#:cargo-development-inputs
+       (("rust-heapless" ,rust-heapless-0.8))))
     (home-page "https://github.com/wolandr/pretty-hex")
     (synopsis "Prettified output of hexadecimal byte slices")
-    (description "Pretty hex dump of byte slices in the common style.")
+    (description
+     "This package provides pretty hex dumps of bytes slice in the
+common style.")
     (license license:expat)))
 
+(define-public rust-pretty-hex-0.3
+  (package
+    (inherit rust-pretty-hex-0.4)
+    (name "rust-pretty-hex")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pretty-hex" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mf8xvlfri4impj2paj4azx7hxh7l0i38cjyib1hiikwvlqhiyn6"))))
+    (arguments
+     (list #:cargo-development-inputs
+           `(("rust-heapless" ,rust-heapless-0.5))))))
+
 (define-public rust-prettyplease-0.2
   (package
     (name "rust-prettyplease")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 49/75] gnu: Add rust-gstreamer-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-0.21): Add variable.
(rust-gstreamer-0.18): Inherit from rust-gstreamer-0.21.

Change-Id: Ic42818a07c31e62f25750909e23c43ec8338a7f4
---
 gnu/packages/crates-gtk.scm | 94 +++++++++++++++++++++++++++----------
 1 file changed, 68 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 443f48f762..75f332a9f4 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2244,8 +2244,56 @@ (define-public rust-gsk4-sys-0.7
     (description "This package provides FFI bindings of GSK 4.")
     (license license:expat)))
 
+(define-public rust-gstreamer-0.21
+  (package
+    (name "rust-gstreamer")
+    (version "0.21.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mchpvvll5i4ck8zr7aarrz6p975n0dcyy92wksg8ycf9hzp15fy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             "--skip=typefind::tests::test_typefind_call_function")
+       #:cargo-development-inputs
+       (("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-gir-format-check" ,rust-gir-format-check-0.1)
+        ("rust-ron" ,rust-ron-0.8)
+        ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.21)
+                       ("rust-itertools" ,rust-itertools-0.12)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-muldiv" ,rust-muldiv-1)
+                       ("rust-num-integer" ,rust-num-integer-0.1)
+                       ("rust-num-rational" ,rust-num-rational-0.4)
+                       ("rust-option-operations" ,rust-option-operations-0.5)
+                       ("rust-paste" ,rust-paste-1)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-pretty-hex" ,rust-pretty-hex-0.4)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (native-inputs (list pkg-config))
+    (inputs (list glib gstreamer))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "Rust bindings for GStreamer")
+    (description "This package provides Rust bindings for GStreamer.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gstreamer-0.18
   (package
+    (inherit rust-gstreamer-0.21)
     (name "rust-gstreamer")
     (version "0.18.8")
     (source (origin
@@ -2255,38 +2303,32 @@ (define-public rust-gstreamer-0.18
               (sha256
                (base32
                 "0mjlnw9917j3wwij8225bjp54k7408lxqjjnh6r6wksyryx66qyn"))))
-    (build-system cargo-build-system)
     (arguments
      (list #:tests? #f  ; https://github.com/gtk-rs/gtk3-rs/issues/768
-           #:cargo-inputs `(("rust-bitflags" ,rust-bitflags-1)
-                            ("rust-cfg-if" ,rust-cfg-if-1)
-                            ("rust-futures-channel" ,rust-futures-channel-0.3)
-                            ("rust-futures-core" ,rust-futures-core-0.3)
-                            ("rust-futures-util" ,rust-futures-util-0.3)
-                            ("rust-glib" ,rust-glib-0.15)
-                            ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.18)
-                            ("rust-libc" ,rust-libc-0.2)
-                            ("rust-muldiv" ,rust-muldiv-1)
-                            ("rust-num-integer" ,rust-num-integer-0.1)
-                            ("rust-num-rational" ,rust-num-rational-0.4)
-                            ("rust-once-cell" ,rust-once-cell-1)
-                            ("rust-option-operations" ,rust-option-operations-0.4)
-                            ("rust-paste" ,rust-paste-1)
-                            ("rust-pretty-hex" ,rust-pretty-hex-0.3)
-                            ("rust-serde" ,rust-serde-1)
-                            ("rust-serde-bytes" ,rust-serde-bytes-0.11)
-                            ("rust-thiserror" ,rust-thiserror-1))
+           #:cargo-inputs
+           `(("rust-bitflags" ,rust-bitflags-1)
+             ("rust-cfg-if" ,rust-cfg-if-1)
+             ("rust-futures-channel" ,rust-futures-channel-0.3)
+             ("rust-futures-core" ,rust-futures-core-0.3)
+             ("rust-futures-util" ,rust-futures-util-0.3)
+             ("rust-glib" ,rust-glib-0.15)
+             ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.18)
+             ("rust-libc" ,rust-libc-0.2)
+             ("rust-muldiv" ,rust-muldiv-1)
+             ("rust-num-integer" ,rust-num-integer-0.1)
+             ("rust-num-rational" ,rust-num-rational-0.4)
+             ("rust-once-cell" ,rust-once-cell-1)
+             ("rust-option-operations" ,rust-option-operations-0.4)
+             ("rust-paste" ,rust-paste-1)
+             ("rust-pretty-hex" ,rust-pretty-hex-0.3)
+             ("rust-serde" ,rust-serde-1)
+             ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+             ("rust-thiserror" ,rust-thiserror-1))
            #:cargo-development-inputs
             `(("rust-futures-executor" ,rust-futures-executor-0.3)
               ("rust-gir-format-check" ,rust-gir-format-check-0.1)
               ("rust-ron" ,rust-ron-0.7)
-              ("rust-serde-json" ,rust-serde-json-1))))
-    (native-inputs (list pkg-config))
-    (inputs (list glib gstreamer))
-    (home-page "https://gstreamer.freedesktop.org")
-    (synopsis "Rust bindings for GStreamer")
-    (description "Rust bindings for GStreamer.")
-    (license (list license:expat license:asl2.0))))
+              ("rust-serde-json" ,rust-serde-json-1))))))
 
 (define-public rust-gstreamer-app-0.18
   (package
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 50/75] gnu: Add rust-gstreamer-base-sys-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-base-sys-0.21): Add
variable.
(rust-gstreamer-base-sys-0.18): Inherit from
rust-gstreamer-base-sys-0.21.

Change-Id: I6ed383f0b6cd38297e0b8d84a0e75f20e4dc0d24
---
 gnu/packages/crates-gtk.scm | 43 +++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 75f332a9f4..14f10783f0 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2481,8 +2481,39 @@ (define-public rust-gstreamer-base-0.18
     (description "Rust bindings for GStreamer Base library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gstreamer-base-sys-0.21
+  (package
+    (name "rust-gstreamer-base-sys")
+    (version "0.21.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-base-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0r2bb4rmkpxs1l2jy61rn2srqzsp1f8q0k5j55di3zkqj0gp1jpl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+                       ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.21)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list glib gstreamer))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "FFI bindings to libgstbase-1.0")
+    (description
+      "This package provides FFI bindings to libgstbase-1.0, part of
+GStreamer.")
+    (license license:expat)))
+
 (define-public rust-gstreamer-base-sys-0.18
   (package
+    (inherit rust-gstreamer-base-sys-0.21)
     (name "rust-gstreamer-base-sys")
     (version "0.18.0")
     (source
@@ -2492,21 +2523,15 @@ (define-public rust-gstreamer-base-sys-0.18
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "13h79fcn3b9bkg7h8j0vxc1zryp92shbvvk6gkx723il7hy4k0x0"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.15)
                        ("rust-gobject-sys" ,rust-gobject-sys-0.15)
                        ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.18)
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-system-deps" ,rust-system-deps-6))
-       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
-    (native-inputs (list pkg-config))
-    (inputs (list glib gstreamer))
-    (home-page "https://gstreamer.freedesktop.org")
-    (synopsis "FFI bindings to libgstbase-1.0")
-    (description "FFI bindings to libgstbase-1.0, part of GStreamer.")
-    (license license:expat)))
+       #:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gstreamer-sys-0.21
   (package
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 51/75] gnu: Add rust-atomic-refcell-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-atomic-refcell-0.1): Add variable.

Change-Id: I966d18d24b8669c97aa6c11b50f6a84d3907ee32
---
 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 b01becbbf1..c6054a716c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6155,6 +6155,27 @@ (define-public rust-atomic-polyfill-0.1
 they're not available.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-atomic-refcell-0.1
+  (package
+    (name "rust-atomic-refcell")
+    (version "0.1.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "atomic_refcell" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0z04ng59y22mwf315wamx78ybhjag0x6k7isc36hdgcv63c7rrj1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-inputs (("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/bholley/atomic_refcell")
+    (synopsis "Threadsafe RefCell")
+    (description "This package provides a threadsafe @code{RefCell}.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-atomic-take-1
   (package
     (name "rust-atomic-take")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 52/75] gnu: Add rust-gstreamer-base-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-base-0.21): Add variable.
(rust-gstreamer-base-0.18): Inherit from rust-gstreamer-base-0.21.

Change-Id: I15f0726dc46c251c3799cdc591c10b99d1f5baff
---
 gnu/packages/crates-gtk.scm | 53 ++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 14f10783f0..9f8a7ae8fa 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2453,34 +2453,63 @@ (define-public rust-gstreamer-audio-sys-0.18
     (description "FFI bindings to libgstaudio, part of Gstreamer.")
     (license license:expat)))
 
-(define-public rust-gstreamer-base-0.18
+(define-public rust-gstreamer-base-0.21
   (package
     (name "rust-gstreamer-base")
-    (version "0.18.0")
+    (version "0.21.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gstreamer-base" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0gw6sr75h01y3j6lpxhc7p1frvkba9a4imyyb2ppqh42cprkakr2"))))
+        (base32 "0zqnld0w2jqkz1m5xna3a3nnrpvrchpcrrzdgwim54540ilhn5fb"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f  ; https://github.com/gtk-rs/gtk3-rs/issues/768
-       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
-                       ("rust-cfg-if" ,rust-cfg-if-1)
-                       ("rust-glib" ,rust-glib-0.15)
-                       ("rust-gstreamer" ,rust-gstreamer-0.18)
-                       ("rust-gstreamer-base-sys" ,rust-gstreamer-base-sys-0.18)
-                       ("rust-libc" ,rust-libc-0.2))
-       #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=subclass::base_transform::tests::test_transform_subclass")
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))
+       #:cargo-inputs
+       (("rust-atomic-refcell" ,rust-atomic-refcell-0.1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-glib" ,rust-glib-0.18)
+        ("rust-gstreamer" ,rust-gstreamer-0.21)
+        ("rust-gstreamer-base-sys" ,rust-gstreamer-base-sys-0.21)
+        ("rust-libc" ,rust-libc-0.2))))
     (native-inputs (list pkg-config))
     (inputs (list glib gstreamer))
     (home-page "https://gstreamer.freedesktop.org")
     (synopsis "Rust bindings for GStreamer Base library")
-    (description "Rust bindings for GStreamer Base library.")
+    (description
+     "This package provides Rust bindings for GStreamer Base library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gstreamer-base-0.18
+  (package
+    (inherit rust-gstreamer-base-0.21)
+    (name "rust-gstreamer-base")
+    (version "0.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-base" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gw6sr75h01y3j6lpxhc7p1frvkba9a4imyyb2ppqh42cprkakr2"))))
+    (arguments
+     `(#:tests? #f  ; https://github.com/gtk-rs/gtk3-rs/issues/768
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-glib" ,rust-glib-0.15)
+        ("rust-gstreamer" ,rust-gstreamer-0.18)
+        ("rust-gstreamer-base-sys" ,rust-gstreamer-base-sys-0.18)
+        ("rust-libc" ,rust-libc-0.2))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
+
 (define-public rust-gstreamer-base-sys-0.21
   (package
     (name "rust-gstreamer-base-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 53/75] gnu: Add rust-gstreamer-video-sys-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-video-sys-0.21): Add
variable.
---
 gnu/packages/crates-gtk.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 9f8a7ae8fa..b5dc3b424b 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2616,6 +2616,39 @@ (define-public rust-gstreamer-sys-0.18
            `(("rust-shell-words" ,rust-shell-words-1)
              ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gstreamer-video-sys-0.21
+  (package
+    (name "rust-gstreamer-video-sys")
+    (version "0.21.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-video-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vhn7fiibwc2q5h8cjlg44imh8i0xss6nns83r859c76k26k20h3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            "--skip=cross_validate_constants_with_c"
+                            "--skip=cross_validate_layout_with_c")
+       #:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs
+       (("rust-glib-sys" ,rust-glib-sys-0.18)
+        ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+        ("rust-gstreamer-base-sys" ,rust-gstreamer-base-sys-0.21)
+        ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.21)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list glib gst-plugins-base gstreamer))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "FFI bindings to libgstvideo-1.0")
+    (description "This package provides FFI bindings to libgstvideo-1.0.")
+    (license license:expat)))
+
 (define-public rust-gtk-0.14
   (package
     (name "rust-gtk")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 54/75] gnu: Add rust-gstreamer-video-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-video-0.21): Add variable.
---
 gnu/packages/crates-gtk.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index b5dc3b424b..33c31cde66 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2616,6 +2616,41 @@ (define-public rust-gstreamer-sys-0.18
            `(("rust-shell-words" ,rust-shell-words-1)
              ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gstreamer-video-0.21
+  (package
+    (name "rust-gstreamer-video")
+    (version "0.21.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-video" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1r8mhzb1bq4dnj08f4szgarxd2fvqbakwv400fp9hyiv3m6jlnz8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1)
+        ("rust-itertools" ,rust-itertools-0.11)
+        ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-futures-channel" ,rust-futures-channel-0.3)
+        ("rust-glib" ,rust-glib-0.18)
+        ("rust-gstreamer" ,rust-gstreamer-0.21)
+        ("rust-gstreamer-base" ,rust-gstreamer-base-0.21)
+        ("rust-gstreamer-video-sys" ,rust-gstreamer-video-sys-0.21)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-thiserror" ,rust-thiserror-1))))
+    (native-inputs (list pkg-config))
+    (inputs (list glib gst-plugins-base))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "Rust bindings for GStreamer Video library")
+    (description
+     "This package provides Rust bindings for GStreamer Video library.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gstreamer-video-sys-0.21
   (package
     (name "rust-gstreamer-video-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 55/75] gnu: Add rust-gstreamer-play-sys-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-play-sys-0.21): Add
variable.
---
 gnu/packages/crates-gtk.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 33c31cde66..c61e0dee1f 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2562,6 +2562,36 @@ (define-public rust-gstreamer-base-sys-0.18
        (("rust-shell-words" ,rust-shell-words-1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gstreamer-play-sys-0.21
+  (package
+    (name "rust-gstreamer-play-sys")
+    (version "0.21.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-play-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13q3jv5hg4g0bd77bzd7zv60lsq2zkcap5j68zd4k3mr4jaizi4w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs
+       (("rust-glib-sys" ,rust-glib-sys-0.18)
+        ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+        ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.21)
+        ("rust-gstreamer-video-sys" ,rust-gstreamer-video-sys-0.21)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list glib gst-plugins-bad-minimal gstreamer))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "FFI bindings to libgstplay-1.0")
+    (description "This package provides FFI bindings to libgstplay-1.0.")
+    (license license:expat)))
+
 (define-public rust-gstreamer-sys-0.21
   (package
     (name "rust-gstreamer-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 56/75] gnu: Add rust-gstreamer-play-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-play-0.21): Add variable.
---
 gnu/packages/crates-gtk.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index c61e0dee1f..a86dfefdac 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2562,6 +2562,35 @@ (define-public rust-gstreamer-base-sys-0.18
        (("rust-shell-words" ,rust-shell-words-1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gstreamer-play-0.21
+  (package
+    (name "rust-gstreamer-play")
+    (version "0.21.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-play" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jphhx0k47bjmyz6b2j9wcbavja7p3rq6p79a5g5vylj7x6glbmd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))
+       #:cargo-inputs
+       (("rust-glib" ,rust-glib-0.18)
+        ("rust-gstreamer" ,rust-gstreamer-0.21)
+        ("rust-gstreamer-play-sys" ,rust-gstreamer-play-sys-0.21)
+        ("rust-gstreamer-video" ,rust-gstreamer-video-0.21)
+        ("rust-libc" ,rust-libc-0.2))))
+    (native-inputs (list pkg-config))
+    (inputs (list gst-plugins-bad-minimal gstreamer))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "Rust bindings for GStreamer Play library")
+    (description
+     "This package provides Rust bindings for GStreamer Play library.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gstreamer-play-sys-0.21
   (package
     (name "rust-gstreamer-play-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 57/75] gnu: Add rust-gstreamer-audio-sys-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-audio-sys-0.21): Add
variable.
(rust-gstreamer-audio-sys-0.18): Inherit from
rust-gstreamer-audio-sys-0.21.
---
 gnu/packages/crates-gtk.scm | 60 +++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index a86dfefdac..bc5ca66a0d 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2422,37 +2422,67 @@ (define-public rust-gstreamer-audio-0.18
     (description "Rust bindings for the GStreamer Audio library.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-gstreamer-audio-sys-0.18
+(define-public rust-gstreamer-audio-sys-0.21
   (package
     (name "rust-gstreamer-audio-sys")
-    (version "0.18.3")
+    (version "0.21.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gstreamer-audio-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0z3xryblh75xp08xyw3m6jfz9azarcvl06dd3psc0n65agxmhhm3"))))
+        (base32 "1lamp4s9cl0hhpbfcwdprn36fll6qq4xihrqbf2pfwqpifp99gbq"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-test-flags
-       (list "--release" "--"
-             "--skip=cross_validate_constants_with_c")
-       #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.15)
-                       ("rust-gobject-sys" ,rust-gobject-sys-0.15)
-                       ("rust-gstreamer-base-sys" ,rust-gstreamer-base-sys-0.18)
-                       ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.18)
-                       ("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6))
-       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
+     `(#:cargo-test-flags '("--release" "--"
+                            "--skip=cross_validate_constants_with_c"
+                            "--skip=cross_validate_layout_with_c")
+       #:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs
+       (("rust-glib-sys" ,rust-glib-sys-0.18)
+        ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+        ("rust-gstreamer-base-sys" ,rust-gstreamer-base-sys-0.21)
+        ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.21)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-system-deps" ,rust-system-deps-6))))
     (native-inputs (list pkg-config))
     (inputs (list glib gstreamer gst-plugins-base))
     (home-page "https://gstreamer.freedesktop.org")
     (synopsis "FFI bindings to libgstaudio-1.0")
-    (description "FFI bindings to libgstaudio, part of Gstreamer.")
+    (description
+      "This package provides FFI bindings to libgstaudio-1.0.")
     (license license:expat)))
 
+(define-public rust-gstreamer-audio-sys-0.18
+  (package
+    (inherit rust-gstreamer-audio-sys-0.21)
+    (name "rust-gstreamer-audio-sys")
+    (version "0.18.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-audio-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0z3xryblh75xp08xyw3m6jfz9azarcvl06dd3psc0n65agxmhhm3"))))
+    (arguments
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             "--skip=cross_validate_constants_with_c")
+       #:cargo-inputs
+       (("rust-glib-sys" ,rust-glib-sys-0.15)
+        ("rust-gobject-sys" ,rust-gobject-sys-0.15)
+        ("rust-gstreamer-base-sys" ,rust-gstreamer-base-sys-0.18)
+        ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.18)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-gstreamer-base-0.21
   (package
     (name "rust-gstreamer-base")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 58/75] gnu: Add rust-gstreamer-audio-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-audio-0.21): Add variable.
(rust-gstreamer-audio-0.18): Inherit from rust-gstreamer-audio-0.21.
---
 gnu/packages/crates-gtk.scm | 61 +++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index bc5ca66a0d..34cda9328c 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2390,38 +2390,67 @@ (define-public rust-gstreamer-app-sys-0.18
     (description "FFI bindings to libgstapp-1.0, part of Gstreamer.")
     (license license:expat)))
 
-(define-public rust-gstreamer-audio-0.18
+(define-public rust-gstreamer-audio-0.21
   (package
     (name "rust-gstreamer-audio")
-    (version "0.18.7")
+    (version "0.21.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gstreamer-audio" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0zl0bj03rz19qlrm50w7i5sagh0i0p5d8gr7ig1k6k5yd7k47sww"))))
+        (base32 "0b91wjhhq0harwl7kyfv5l0kwp6w1vklpnpynakv92f8x6jci5vs"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f  ; https://github.com/gtk-rs/gtk3-rs/issues/768
-       #:cargo-inputs (("rust-array-init" ,rust-array-init-2)
-                       ("rust-bitflags" ,rust-bitflags-1)
-                       ("rust-cfg-if" ,rust-cfg-if-1)
-                       ("rust-glib" ,rust-glib-0.15)
-                       ("rust-gstreamer" ,rust-gstreamer-0.18)
-                       ("rust-gstreamer-audio-sys" ,rust-gstreamer-audio-sys-0.18)
-                       ("rust-gstreamer-base" ,rust-gstreamer-base-0.18)
-                       ("rust-libc" ,rust-libc-0.2)
-                       ("rust-once-cell" ,rust-once-cell-1))
-       #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)
-                                   ("rust-itertools" ,rust-itertools-0.10))))
+     `(#:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1)
+        ("rust-itertools" ,rust-itertools-0.12)
+        ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-glib" ,rust-glib-0.18)
+        ("rust-gstreamer" ,rust-gstreamer-0.21)
+        ("rust-gstreamer-audio-sys" ,rust-gstreamer-audio-sys-0.21)
+        ("rust-gstreamer-base" ,rust-gstreamer-base-0.21)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-serde" ,rust-serde-1))))
     (native-inputs (list pkg-config))
     (inputs (list glib gstreamer gst-plugins-base))
     (home-page "https://gstreamer.freedesktop.org")
     (synopsis "Rust bindings for the GStreamer Audio library")
-    (description "Rust bindings for the GStreamer Audio library.")
+    (description
+     "This package provides Rust bindings for GStreamer Audio library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gstreamer-audio-0.18
+  (package
+    (inherit rust-gstreamer-audio-0.21)
+    (name "rust-gstreamer-audio")
+    (version "0.18.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-audio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zl0bj03rz19qlrm50w7i5sagh0i0p5d8gr7ig1k6k5yd7k47sww"))))
+    (arguments
+     `(#:tests? #f  ; https://github.com/gtk-rs/gtk3-rs/issues/768
+       #:cargo-inputs
+       (("rust-array-init" ,rust-array-init-2)
+        ("rust-bitflags" ,rust-bitflags-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-glib" ,rust-glib-0.15)
+        ("rust-gstreamer" ,rust-gstreamer-0.18)
+        ("rust-gstreamer-audio-sys" ,rust-gstreamer-audio-sys-0.18)
+        ("rust-gstreamer-base" ,rust-gstreamer-base-0.18)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-once-cell" ,rust-once-cell-1))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1)
+        ("rust-itertools" ,rust-itertools-0.10))))))
+
 (define-public rust-gstreamer-audio-sys-0.21
   (package
     (name "rust-gstreamer-audio-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 59/75] gnu: Add rust-gstreamer-pbutils-sys-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-pbutils-sys-0.21): Add
variable.
---
 gnu/packages/crates-gtk.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 34cda9328c..87f20ab6b1 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2621,6 +2621,38 @@ (define-public rust-gstreamer-base-sys-0.18
        (("rust-shell-words" ,rust-shell-words-1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gstreamer-pbutils-sys-0.21
+  (package
+    (name "rust-gstreamer-pbutils-sys")
+    (version "0.21.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-pbutils-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0scx3w02wkyvmq76ia2jr6zhkf24zivn9vyphrcwmj2b8piydakg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs
+       (("rust-glib-sys" ,rust-glib-sys-0.18)
+        ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+        ("rust-gstreamer-audio-sys" ,rust-gstreamer-audio-sys-0.21)
+        ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.21)
+        ("rust-gstreamer-video-sys" ,rust-gstreamer-video-sys-0.21)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list glib gst-plugins-base gstreamer))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "FFI bindings to libgstpbutils-1.0")
+    (description
+      "This package provides FFI bindings to libgstpbutils-1.0.")
+    (license license:expat)))
+
 (define-public rust-gstreamer-play-0.21
   (package
     (name "rust-gstreamer-play")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 60/75] gnu: Add rust-gstreamer-pbutils-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-pbutils-0.21): Add
variable.
---
 gnu/packages/crates-gtk.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 87f20ab6b1..a7c0ead88d 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2621,6 +2621,39 @@ (define-public rust-gstreamer-base-sys-0.18
        (("rust-shell-words" ,rust-shell-words-1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gstreamer-pbutils-0.21
+  (package
+    (name "rust-gstreamer-pbutils")
+    (version "0.21.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-pbutils" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0idr354x9j77q8qrb99r6m6hrpa0z8j97jncqim5m08vhgbij9sb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1)
+        ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-inputs
+       (("rust-glib" ,rust-glib-0.18)
+        ("rust-gstreamer" ,rust-gstreamer-0.21)
+        ("rust-gstreamer-audio" ,rust-gstreamer-audio-0.21)
+        ("rust-gstreamer-pbutils-sys" ,rust-gstreamer-pbutils-sys-0.21)
+        ("rust-gstreamer-video" ,rust-gstreamer-video-0.21)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-thiserror" ,rust-thiserror-1))))
+    (native-inputs (list pkg-config))
+    (inputs (list gstreamer gst-plugins-base))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "Rust bindings for GStreamer Base Utils library")
+    (description
+     "This package provides Rust bindings for GStreamer Base Utils library.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gstreamer-pbutils-sys-0.21
   (package
     (name "rust-gstreamer-pbutils-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 61/75] gnu: Add rust-gstreamer-gl-sys-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-gl-sys-0.21): Add
variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index a7c0ead88d..ea59b526d6 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -30,6 +30,7 @@ (define-module (gnu packages crates-gtk)
   #:use-module (gnu packages crates-graphics)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-windows)
+  #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gstreamer)
@@ -2621,6 +2622,38 @@ (define-public rust-gstreamer-base-sys-0.18
        (("rust-shell-words" ,rust-shell-words-1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gstreamer-gl-sys-0.21
+  (package
+    (name "rust-gstreamer-gl-sys")
+    (version "0.21.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-gl-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kgi8rrlw2qx1p6q9ybk52wxpjn5wscx84lqfg4ng9lr7hdrg06m"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs
+       (("rust-glib-sys" ,rust-glib-sys-0.18)
+        ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+        ("rust-gstreamer-base-sys" ,rust-gstreamer-base-sys-0.21)
+        ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.21)
+        ("rust-gstreamer-video-sys" ,rust-gstreamer-video-sys-0.21)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list glib gst-plugins-base gstreamer mesa))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "FFI bindings to libgstgl-1.0")
+    (description "This package provides FFI bindings to libgstgl-1.0.")
+    (license license:expat)))
+
 (define-public rust-gstreamer-pbutils-0.21
   (package
     (name "rust-gstreamer-pbutils")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 62/75] gnu: Add rust-gstreamer-gl-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-gl-0.21): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index ea59b526d6..f744afdfdb 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2622,6 +2622,37 @@ (define-public rust-gstreamer-base-sys-0.18
        (("rust-shell-words" ,rust-shell-words-1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gstreamer-gl-0.21
+  (package
+    (name "rust-gstreamer-gl")
+    (version "0.21.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-gl" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "140vnlxnkq12c8qqgc5i2y9wdz8c8dga25d99021cg16508vkkry"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1)
+        ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-inputs (("rust-glib" ,rust-glib-0.18)
+                       ("rust-gstreamer" ,rust-gstreamer-0.21)
+                       ("rust-gstreamer-base" ,rust-gstreamer-base-0.21)
+                       ("rust-gstreamer-gl-sys" ,rust-gstreamer-gl-sys-0.21)
+                       ("rust-gstreamer-video" ,rust-gstreamer-video-0.21)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-serde" ,rust-serde-1))))
+    (native-inputs (list pkg-config))
+    (inputs (list gst-plugins-base mesa))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "Rust bindings for GStreamer GL library")
+    (description
+     "This package provides Rust bindings for GStreamer GL library.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gstreamer-gl-sys-0.21
   (package
     (name "rust-gstreamer-gl-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 63/75] gnu: Add rust-gstreamer-gl-egl-sys-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-gl-egl-sys-0.21): Add
variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index f744afdfdb..549d69ea58 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2653,6 +2653,34 @@ (define-public rust-gstreamer-gl-0.21
      "This package provides Rust bindings for GStreamer GL library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gstreamer-gl-egl-sys-0.21
+  (package
+    (name "rust-gstreamer-gl-egl-sys")
+    (version "0.21.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-gl-egl-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0m79m0lbk2s89cm4vc6ckwkgs9khmh2ri7x3gfgmz2hwy2v8hg7f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-gstreamer-gl-sys" ,rust-gstreamer-gl-sys-0.21)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list gst-plugins-base gtk))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "FFI bindings to libgstgl-1.0 (EGL support)")
+    (description
+     "This package provides FFI bindings to libgstgl-1.0 (EGL support).")
+    (license license:expat)))
+
 (define-public rust-gstreamer-gl-sys-0.21
   (package
     (name "rust-gstreamer-gl-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 64/75] gnu: Add rust-gstreamer-gl-egl-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-gl-egl-0.21): Add
variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 549d69ea58..dea328305e 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2653,6 +2653,36 @@ (define-public rust-gstreamer-gl-0.21
      "This package provides Rust bindings for GStreamer GL library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gstreamer-gl-egl-0.21
+  (package
+    (name "rust-gstreamer-gl-egl")
+    (version "0.21.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-gl-egl" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "10nwlmyw1z4jccyrbqijx6iny2c64164jaz05dgnvi5378ianwx1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))
+       #:cargo-inputs
+       (("rust-glib" ,rust-glib-0.18)
+        ("rust-gstreamer" ,rust-gstreamer-0.21)
+        ("rust-gstreamer-gl" ,rust-gstreamer-gl-0.21)
+        ("rust-gstreamer-gl-egl-sys" ,rust-gstreamer-gl-egl-sys-0.21)
+        ("rust-libc" ,rust-libc-0.2))))
+    (native-inputs (list pkg-config))
+    (inputs (list glib gst-plugins-base gstreamer mesa))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "Rust bindings for GStreamer GL library (EGL support)")
+    (description
+     "This package provides Rust bindings for GStreamer GL library
+(EGL support).")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gstreamer-gl-egl-sys-0.21
   (package
     (name "rust-gstreamer-gl-egl-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 65/75] gnu: Add rust-gstreamer-gl-wayland-sys-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-gl-wayland-sys-0.21): Add
variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index dea328305e..fdb3c1fda8 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2743,6 +2743,35 @@ (define-public rust-gstreamer-gl-sys-0.21
     (description "This package provides FFI bindings to libgstgl-1.0.")
     (license license:expat)))
 
+(define-public rust-gstreamer-gl-wayland-sys-0.21
+  (package
+    (name "rust-gstreamer-gl-wayland-sys")
+    (version "0.21.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-gl-wayland-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "188j8i47zn93gph6ngmpjqbvm44jy0wzybr5052s6lxadzqqcywi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs
+       (("rust-glib-sys" ,rust-glib-sys-0.18)
+        ("rust-gstreamer-gl-sys" ,rust-gstreamer-gl-sys-0.21)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list glib gst-plugins-base mesa))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "FFI bindings to libgstgl-1.0 (Wayland support)")
+    (description
+     "This package provides FFI bindings to libgstgl-1.0 (Wayland support).")
+    (license license:expat)))
+
 (define-public rust-gstreamer-pbutils-0.21
   (package
     (name "rust-gstreamer-pbutils")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 66/75] gnu: Add rust-gstreamer-gl-wayland-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-gl-wayland-0.21): Add
variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index fdb3c1fda8..6c4a9c704a 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2743,6 +2743,36 @@ (define-public rust-gstreamer-gl-sys-0.21
     (description "This package provides FFI bindings to libgstgl-1.0.")
     (license license:expat)))
 
+(define-public rust-gstreamer-gl-wayland-0.21
+  (package
+    (name "rust-gstreamer-gl-wayland")
+    (version "0.21.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-gl-wayland" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zz7as2qlf021dvpy1qs4rbahf94p6jb1msmfsgx08nhyai7dhpy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))
+       #:cargo-inputs
+       (("rust-glib" ,rust-glib-0.18)
+        ("rust-gstreamer" ,rust-gstreamer-0.21)
+        ("rust-gstreamer-gl" ,rust-gstreamer-gl-0.21)
+        ("rust-gstreamer-gl-wayland-sys" ,rust-gstreamer-gl-wayland-sys-0.21)
+        ("rust-libc" ,rust-libc-0.2))))
+    (native-inputs (list pkg-config))
+    (inputs (list gst-plugins-base mesa))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "Rust bindings for GStreamer GL library (Wayland support)")
+    (description
+     "This package provides Rust bindings for GStreamer GL library
+(Wayland support).")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gstreamer-gl-wayland-sys-0.21
   (package
     (name "rust-gstreamer-gl-wayland-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 67/75] gnu: Add rust-gstreamer-gl-x11-sys-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-gl-x11-sys-0.21): Add
variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 6c4a9c704a..125b2534c0 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2802,6 +2802,35 @@ (define-public rust-gstreamer-gl-wayland-sys-0.21
      "This package provides FFI bindings to libgstgl-1.0 (Wayland support).")
     (license license:expat)))
 
+(define-public rust-gstreamer-gl-x11-sys-0.21
+  (package
+    (name "rust-gstreamer-gl-x11-sys")
+    (version "0.21.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-gl-x11-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1p5wdrn3h55jx15963z1wnk7whwplpjfymy5yjsmkqdrqw1yz6n4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs
+       (("rust-glib-sys" ,rust-glib-sys-0.18)
+        ("rust-gstreamer-gl-sys" ,rust-gstreamer-gl-sys-0.21)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list glib gst-plugins-base mesa))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "FFI bindings to libgstgl-1.0 (X11 support)")
+    (description
+     "This package provides FFI bindings to libgstgl-1.0 (X11 support).")
+    (license license:expat)))
+
 (define-public rust-gstreamer-pbutils-0.21
   (package
     (name "rust-gstreamer-pbutils")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 68/75] gnu: Add rust-gstreamer-gl-x11-0.21.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gstreamer-gl-x11-0.21): Add
variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 125b2534c0..4d75adfdb9 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2802,6 +2802,36 @@ (define-public rust-gstreamer-gl-wayland-sys-0.21
      "This package provides FFI bindings to libgstgl-1.0 (Wayland support).")
     (license license:expat)))
 
+(define-public rust-gstreamer-gl-x11-0.21
+  (package
+    (name "rust-gstreamer-gl-x11")
+    (version "0.21.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gstreamer-gl-x11" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zgn5aih3bcz3ci3xkdpc2jzxrxiz1hdpkwq121w5ln96ag1n0np"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))
+       #:cargo-inputs
+       (("rust-glib" ,rust-glib-0.18)
+        ("rust-gstreamer" ,rust-gstreamer-0.21)
+        ("rust-gstreamer-gl" ,rust-gstreamer-gl-0.21)
+        ("rust-gstreamer-gl-x11-sys" ,rust-gstreamer-gl-x11-sys-0.21)
+        ("rust-libc" ,rust-libc-0.2))))
+    (native-inputs (list pkg-config))
+    (inputs (list gst-plugins-base mesa))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "Rust bindings for GStreamer GL library (X11 support)")
+    (description
+     "This package provides Rust bindings for GStreamer GL library
+(X11 support).")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gstreamer-gl-x11-sys-0.21
   (package
     (name "rust-gstreamer-gl-x11-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 69/75] gnu: rust-serde-json-1: Upgrade to 1.0.116.

[Herman Rimm via Guix-patches via]

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

Change-Id: I135f2687dce473383a03e42487bec606d01466d7
---
 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 c6054a716c..29d657709e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71311,14 +71311,14 @@ (define-public rust-serde-indextree-0.2
 (define-public rust-serde-json-1
   (package
     (name "rust-serde-json")
-    (version "1.0.114")
+    (version "1.0.116")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde_json" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1q4saigxwkf8bw4y5kp6k33dnavlvvwa2q4zmag59vrjsqdrpw65"))))
+        (base32 "04r81f5myl41zrsyghnbmbl39c4n3azldb9zxfafnzyi4rqxn5ry"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 70/75] gnu: Add rust-toml-edit-0.22.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-toml-edit-0.22): Add variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 29d657709e..54ff0fc760 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -85614,6 +85614,37 @@ (define-public rust-toml-edit-0.14
          ("rust-pretty-assertions" ,rust-pretty-assertions-1)
          ("rust-snapbox" ,rust-snapbox-0.2))))))
 
+(define-public rust-toml-edit-0.22
+  (package
+    (name "rust-toml-edit")
+    (version "0.22.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "toml_edit" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vyxc7naf61hxhn8lccq1x8scfaxb20db8cd96jb41d7d17qscnk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-libtest-mimic" ,rust-libtest-mimic-0.7)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-snapbox" ,rust-snapbox-0.4)
+        ("rust-toml-test-data" ,rust-toml-test-data-1)
+        ("rust-toml-test-harness" ,rust-toml-test-harness-0.4))
+       #:cargo-inputs (("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-kstring" ,rust-kstring-2)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-spanned" ,rust-serde-spanned-0.6)
+                       ("rust-toml-datetime" ,rust-toml-datetime-0.6)
+                       ("rust-winnow" ,rust-winnow-0.6))))
+    (home-page "https://github.com/toml-rs/toml")
+    (synopsis "Yet another format-preserving TOML parser")
+    (description
+     "This package provides Yet another format-preserving TOML parser.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-toml-test-1
   (package
     (name "rust-toml-test")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 71/75] gnu: Add rust-gst-plugin-version-helper-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gst-plugin-version-helper-0.8): Add
variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 4d75adfdb9..8b8a07a22f 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2245,6 +2245,28 @@ (define-public rust-gsk4-sys-0.7
     (description "This package provides FFI bindings of GSK 4.")
     (license license:expat)))
 
+(define-public rust-gst-plugin-version-helper-0.8
+  (package
+    (name "rust-gst-plugin-version-helper")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gst-plugin-version-helper" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0alv0v7jfg7ryybb3qnbdwx3nqzkdl305il1xk92y9b02r7qfpjf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-toml-edit" ,rust-toml-edit-0.22))))
+    (home-page "https://gstreamer.freedesktop.org")
+    (synopsis "build.rs helper function for GStreamer plugin metadata")
+    (description
+     "This package provides build.rs helper function for GStreamer
+plugin metadata.")
+    (license license:expat)))
+
 (define-public rust-gstreamer-0.21
   (package
     (name "rust-gstreamer")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 72/75] gnu: Add rust-gdk4-win32-sys-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk4-win32-sys-0.7): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 8b8a07a22f..991d6b2406 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1067,6 +1067,35 @@ (define-public rust-gdk4-wayland-sys-0.7
     (description "This package provides FFI bindings of GDK4 Wayland.")
     (license license:expat)))
 
+(define-public rust-gdk4-win32-sys-0.7
+  (package
+    (name "rust-gdk4-win32-sys")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk4-win32-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0v9rkv1i1sbzckigdr5zjy0xzz6qf9iccikvg3qxjfnd8rsihp2b"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ; missing gtk4-win32
+       #:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs (("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.18)
+                       ("rust-gdk4-sys" ,rust-gdk4-sys-0.7)
+                       ("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs (list pkg-config))
+    (inputs (list cairo gdk-pixbuf glib gtk pango))
+    (home-page "https://gtk-rs.org/gtk4-rs")
+    (synopsis "FFI bindings of GDK4 Win32")
+    (description "This package provides FFI bindings of GDK4 Win32.")
+    (license license:expat)))
+
 (define-public rust-gdk4-x11-0.7
   (package
     (name "rust-gdk4-x11")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 73/75] gnu: Add rust-gdk4-win32-0.7.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk4-win32-0.7): Add variable.

Change-Id: I18101e081fefb93ea1f3502473c3abc8a2979bf3
---
 gnu/packages/crates-gtk.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 991d6b2406..4ec6736329 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1067,6 +1067,40 @@ (define-public rust-gdk4-wayland-sys-0.7
     (description "This package provides FFI bindings of GDK4 Wayland.")
     (license license:expat)))
 
+(define-public rust-gdk4-win32-0.7
+  (package
+    (name "rust-gdk4-win32")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk4-win32" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mv04mipl57v1lj94j2rkrk9qm75jvdlnp7qm6nl2kpn8466arpy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ; missing gtk4-win32
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1)
+        ("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:cargo-inputs (("rust-gdk4" ,rust-gdk4-0.7)
+                       ("rust-gdk4-win32-sys" ,rust-gdk4-win32-sys-0.7)
+                       ("rust-gio" ,rust-gio-0.18)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-khronos-egl" ,rust-khronos-egl-5)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6)
+                       ("rust-windows" ,rust-windows-0.48))))
+    (native-inputs (list pkg-config))
+    (inputs (list gtk pango))
+    (home-page "https://gtk-rs.org/gtk4-rs")
+    (synopsis "Rust bindings of the GDK4 Win32 library")
+    (description
+     "This package provides Rust bindings of the GDK4 Win32 library.")
+    (license license:expat)))
+
 (define-public rust-gdk4-win32-sys-0.7
   (package
     (name "rust-gdk4-win32-sys")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 74/75] gnu: Add rust-gst-plugin-gtk4-0.11.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gst-plugin-gtk4-0.11): Add variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 4ec6736329..544d8871e0 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2308,6 +2308,44 @@ (define-public rust-gsk4-sys-0.7
     (description "This package provides FFI bindings of GSK 4.")
     (license license:expat)))
 
+(define-public rust-gst-plugin-gtk4-0.11
+  (package
+    (name "rust-gst-plugin-gtk4")
+    (version "0.11.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gst-plugin-gtk4" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hmky9p16hnhrwm5i63ynlwfl1bpc9fp3as5ibrni1qlfq0vhwdj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-channel" ,rust-async-channel-2)
+        ("rust-gdk4-wayland" ,rust-gdk4-wayland-0.7)
+        ("rust-gdk4-win32" ,rust-gdk4-win32-0.7)
+        ("rust-gdk4-x11" ,rust-gdk4-x11-0.7)
+        ("rust-gst-plugin-version-helper"
+         ,rust-gst-plugin-version-helper-0.8)
+        ("rust-gstreamer" ,rust-gstreamer-0.21)
+        ("rust-gstreamer-base" ,rust-gstreamer-base-0.21)
+        ("rust-gstreamer-gl" ,rust-gstreamer-gl-0.21)
+        ("rust-gstreamer-gl-egl" ,rust-gstreamer-gl-egl-0.21)
+        ("rust-gstreamer-gl-wayland" ,rust-gstreamer-gl-wayland-0.21)
+        ("rust-gstreamer-gl-x11" ,rust-gstreamer-gl-x11-0.21)
+        ("rust-gstreamer-video" ,rust-gstreamer-video-0.21)
+        ("rust-gtk4" ,rust-gtk4-0.7)
+        ("rust-windows-sys" ,rust-windows-sys-0.52))))
+    (native-inputs (list pkg-config))
+    (inputs (list gst-plugins-base gtk))
+    (home-page "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs")
+    (synopsis "GStreamer GTK 4 Sink element and Paintable widget")
+    (description
+      "This package provides GStreamer GTK 4 Sink element and Paintable
+widget.")
+    (license license:mpl2.0)))
+
 (define-public rust-gst-plugin-version-helper-0.8
   (package
     (name "rust-gst-plugin-version-helper")
-- 
2.41.0

[bug#69257] [PATCH rust-team v3 75/75] gnu: Add fractal.

[Herman Rimm via Guix-patches via]

* gnu/packages/gnome.scm (fractal): Add variable.
---
 gnu/packages/gnome.scm | 144 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 42f758f8d8..c445dbb8ab 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -78,6 +78,7 @@
 ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
 ;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2024 Dariqq <dariqq@posteo.net>
+;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -356,6 +357,149 @@ (define-public brasero
 features to enable users to create their discs easily and quickly.")
     (license license:gpl2+)))
 
+(define-public fractal
+  (package
+    (name "fractal")
+    (version "6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/World/fractal")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1q6r4y11jrirfhb8lw1r0bnvwzr4dpkhdi2mdig6gnbcjvcwc65m"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (substitute* "Cargo.toml"
+                     ;; Use the version used by Matrix SDK.
+                     (("qrcode = \"0.12\"") "qrcode = \"0.13\"")
+                     ;; Use vendored matrix-sdk.
+                     ((".*(git|rev) =.*") "")
+                     (("\\[dependencies.matrix-sdk\\]" all)
+                      (string-append all "\nversion = \"0.7.1\""))
+                     (("\\[dependencies.matrix-sdk-ui\\]" all)
+                      (string-append all "\nversion = \"0.7.0\"")))
+                   ;; Adjust to ashpd 0.6.2 API change.
+                   (substitute* "src/system_settings/linux.rs"
+                     (("with_args") "with_args::<ClockFormat>")
+                     (("ClockFormat::try_from.*") "setting {"))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:install-source? #f
+       #:modules ((guix build cargo-build-system)
+                  ((guix build meson-build-system) #:prefix meson:)
+                  (guix build utils))
+       #:imported-modules ((guix build cargo-build-system)
+                           (guix build cargo-utils)
+                           (guix build json)
+                           ,@%meson-build-system-modules)
+       #:cargo-inputs
+       (("rust-ashpd" ,rust-ashpd-0.6)
+        ("rust-djb-hash" ,rust-djb-hash-0.1)
+        ("rust-eyeball-im" ,rust-eyeball-im-0.4)
+        ("rust-futures-channel" ,rust-futures-channel-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-geo-uri" ,rust-geo-uri-0.2)
+        ("rust-gettext-rs" ,rust-gettext-rs-0.7)
+        ("rust-gstreamer" ,rust-gstreamer-0.21)
+        ("rust-gstreamer-base" ,rust-gstreamer-base-0.21)
+        ("rust-gst-plugin-gtk4" ,rust-gst-plugin-gtk4-0.11)
+        ("rust-gstreamer-pbutils" ,rust-gstreamer-pbutils-0.21)
+        ("rust-gstreamer-play" ,rust-gstreamer-play-0.21)
+        ("rust-gstreamer-video" ,rust-gstreamer-video-0.21)
+        ("rust-gtk" ,rust-gtk4-0.7)
+        ("rust-html-escape" ,rust-html-escape-0.2)
+        ("rust-html2pango" ,rust-html2pango-0.6)
+        ("rust-html5gum" ,rust-html5gum-0.5)
+        ("rust-image" ,rust-image-0.24)
+        ("rust-indexmap" ,rust-indexmap-2)
+        ("rust-libadwaita" ,rust-libadwaita-0.5)
+        ("rust-libshumate" ,rust-libshumate-0.4)
+        ("rust-matrix-sdk" ,rust-matrix-sdk-0.7)
+        ("rust-matrix-sdk-ui" ,rust-matrix-sdk-ui-0.7)
+        ("rust-mime" ,rust-mime-0.3)
+        ("rust-mime-guess" ,rust-mime-guess-2)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-oo7" ,rust-oo7-0.2)
+        ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9)
+        ("rust-qrcode" ,rust-qrcode-0.13)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-rmp-serde" ,rust-rmp-serde-1)
+        ("rust-rqrr" ,rust-rqrr-0.6)
+        ("rust-ruma" ,rust-ruma-0.9)
+        ("rust-secular" ,rust-secular-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-sourceview5" ,rust-sourceview5-0.7)
+        ("rust-strum" ,rust-strum-0.25)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-url" ,rust-url-2))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'configure-meson
+           (lambda* (#:key outputs #:allow-other-keys #:rest args)
+             (apply (assoc-ref meson:%standard-phases 'configure)
+                    #:build-type "debugoptimized"
+                    #:configure-flags '()
+                    args)
+             (install-file "../source/.cargo/config" "cargo-home")
+             (copy-recursively "../source/guix-vendor" "guix-vendor")))
+         ;; Build and install desktop, GSettings, and GResource files.
+         (replace 'build
+           (lambda* (#:key outputs #:allow-other-keys #:rest args)
+             (apply (assoc-ref meson:%standard-phases 'build) args)))
+         ;; TODO: also try cargo test with --manifest specified.
+         (replace 'check
+           (lambda* (#:key outputs #:allow-other-keys #:rest args)
+             (apply (assoc-ref meson:%standard-phases 'check)
+                    #:test-options '()
+                    args)))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys #:rest args)
+             (apply (assoc-ref meson:%standard-phases 'install) args)))
+         (add-after 'install 'glib-or-gtk-wrap
+           (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
+             (apply (assoc-ref meson:%standard-phases 'glib-or-gtk-wrap)
+                    #:inputs inputs
+                    #:outputs outputs
+                    args))))))
+    (native-inputs (list meson ninja pkg-config))
+    (inputs
+      (list cairo
+            clang
+            desktop-file-utils
+            gdk-pixbuf
+            gettext-minimal
+            glib
+            (list glib "bin")
+            graphene
+            gsettings-desktop-schemas
+            gst-plugins-bad-minimal
+            gst-plugins-base
+            gstreamer
+            gtk
+            (list gtk "bin")
+            gtksourceview
+            libadwaita
+            libshumate
+            openssl
+            pango
+            pipewire
+            xdg-desktop-portal))
+    (home-page "https://gitlab.gnome.org/World/fractal")
+    (synopsis "Matrix messaging app for GNOME written in Rust")
+    (description
+      "Fractal is a Matrix messaging app for GNOME written in Rust.  Its
+interface is optimized for collaboration in large groups, such as free
+software projects, and will fit all screens, big or small.")
+    (license license:gpl3+)))
+
 ;;; Minimal variant, used to break a cycle with Inkscape.
 (define-public libcloudproviders-minimal
   (package
-- 
2.41.0