[bug#71110] [PATCH rust-team 00/37] Update rust-xremap to 0.10.0

[bug#71110] [PATCH rust-team 00/37] Update rust-xremap to 0.10.0

[Nicolas Goaziou via Guix-patches via]

The following patch set updates rust-xremap to 0.10.0.

Nicolas Goaziou (37):
  gnu: rust-expect-test-1: Update to 1.5.0.
  gnu: rust-serde-with-macros-3: Update to 3.8.1.
  gnu: Add rust-serde-derive-internals-0.29.
  gnu: rust-schemars-derive-0.8: Update to 0.8.20.
  gnu: rust-schemars-0.8: Update to 0.8.20.
  gnu: Add rust-base64-0.22.
  gnu: rust-serde-with-3: Update to 3.8.1.
  gnu: rust-regex-automata-0.4: Update to 0.4.6.
  gnu: rust-regex-1: Update to 1.10.4.
  gnu: rust-value-bag-sval2-1: Update to 1.9.0.
  gnu: rust-value-bag-serde1-1: Update to 1.9.0.
  gnu: rust-value-bag-1: Update to 1.9.0.
  gnu: rust-env-logger-0.10: Update to 0.10.2.
  gnu: Add rust-bson-1.
  gnu: rust-anyhow-1: Update to 1.0.86.
  gnu: Add rust-pretty-assertions-0.5.
  gnu: Add rust-graphql-parser-0.3.
  gnu: Add rust-iso8601-0.6.
  gnu: Add rust-num-cmp-0.1.
  gnu: Add rust-h3-0.0.4.
  gnu: Add rust-h3-quinn-0.0.5.
  gnu: Add rust-hyper-tls-0.6.
  gnu: Add rust-hyper-rustls-0.26.
  gnu: rust-pin-project-internal-1: Update to 1.1.5.
  gnu: rust-rustls-pki-types-1: Update to 1.7.0.
  gnu: rust-pin-project-1: Update to 1.1.5.
  gnu: Add rust-wasm-streams-0.4.
  gnu: Add rust-reqwest-0.12.
  gnu: Add rust-derive-utils-0.11.
  gnu: Add rust-futures-enum-0.1.
  gnu: Add rust-juniper-codegen-0.15, rust-juniper-0.15.
  gnu: rust-num-traits-0.2: Update to 0.2.19.
  gnu: rust-num-complex-0.4: Update to 0.4.6.
  gnu: rust-num-integer-0.1: Update to 0.1.46.
  gnu: rust-num-iter-0.1: Update to 0.1.45.
  gnu: rust-num-0.4: Update to 0.4.2.
  gnu: rust-xremap: Update to 0.10.0.

 gnu/packages/crates-io.scm  | 473 +++++++++++++++++++++++++++++-------
 gnu/packages/crates-tls.scm |  12 +-
 gnu/packages/crates-web.scm | 279 ++++++++++++++++++---
 gnu/packages/rust-apps.scm  |  38 +--
 4 files changed, 653 insertions(+), 149 deletions(-)


base-commit: 2c90e7aa2f078da27d517b2b77b61810f4513809
-- 
2.41.0

[bug#71110] [PATCH rust-team 01/37] gnu: rust-expect-test-1: Update to 1.5.0.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-expect-test-1): Update to 1.5.0.

Change-Id: I7cb7231b9baa70f2648f2058c550ed4b50845a08
---
 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 fd87a0f8c7..02e93535f2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24938,14 +24938,14 @@ (define-public rust-expat-sys-2
 (define-public rust-expect-test-1
   (package
     (name "rust-expect-test")
-    (version "1.4.1")
+    (version "1.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "expect-test" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1lzqx5hqh1g4llzqby4z1d18xmrjjx63c5l0na7ycf6mmpzfmn9h"))))
+        (base32 "1q55nrkgzg345905aqbsdrwlq4sk0gjn4z5bdph1an1kc6jy02wy"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#71110] [PATCH rust-team 02/37] gnu: rust-serde-with-macros-3: Update to 3.8.1.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serde-with-macros-3): Update to 3.8.1.

Change-Id: Icd4ebd3d000ac82c3028ca6cef46c20f567bff85
---
 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 02e93535f2..4eef8a2461 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68884,14 +68884,14 @@ (define-public rust-serde-with-1
 (define-public rust-serde-with-macros-3
   (package
     (name "rust-serde-with-macros")
-    (version "3.4.0")
+    (version "3.8.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde_with_macros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1277nm0ry2bs52zd5kkddgkzk5s2mhi80x74dnqj68ssyyslwqwk"))))
+        (base32 "1qmwh1bw83p8h24ijmivfaz0nifhkdvwbcdvr25kwi215xq9nmk5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
-- 
2.41.0

[bug#71110] [PATCH rust-team 03/37] gnu: Add rust-serde-derive-internals-0.29.

[Nicolas Goaziou via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4eef8a2461..a02fcf31de 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68228,29 +68228,46 @@ (define-public rust-serde-derive-0.9
         ("rust-serde-codegen-internals" ,rust-serde-codegen-internals-0.14)
         ("rust-syn" ,rust-syn-0.11))))))
 
-(define-public rust-serde-derive-internals-0.26
+(define-public rust-serde-derive-internals-0.29
   (package
     (name "rust-serde-derive-internals")
-    (version "0.26.0")
+    (version "0.29.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde_derive_internals" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0g2zdr6s8i0r29yy7pdl6ahimq8w6ck70hvrciiry2ljwwlq5gw5"))))
+        (base32 "04g7macx819vbnxhi52cx0nhxi56xlhrybgwybyy7fb9m4h6mlhq"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f  ; no variant or associated item named `__TestExhaustive`
-       #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+     `(#:cargo-inputs (("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://serde.rs")
     (synopsis "AST representation used by Serde derive macros")
     (description "This package provides AST representation used by Serde
 derive macros.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-serde-derive-internals-0.26
+  (package
+    (inherit rust-serde-derive-internals-0.29)
+    (name "rust-serde-derive-internals")
+    (version "0.26.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serde_derive_internals" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0g2zdr6s8i0r29yy7pdl6ahimq8w6ck70hvrciiry2ljwwlq5gw5"))))
+    (arguments
+     `(#:tests? #f    ; no variant or associated item named `__TestExhaustive`
+       #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-serde-derive-internals-0.25
   (package
     (inherit rust-serde-derive-internals-0.26)
-- 
2.41.0

[bug#71110] [PATCH rust-team 04/37] gnu: rust-schemars-derive-0.8: Update to 0.8.20.

[Nicolas Goaziou via Guix-patches via]

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

Change-Id: Ic0775a075c3628e0029d79f8384d8f5db9478fc9
---
 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 a02fcf31de..307c613475 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66617,20 +66617,20 @@ (define-public rust-schemars-0.6
 (define-public rust-schemars-derive-0.8
   (package
     (name "rust-schemars-derive")
-    (version "0.8.16")
+    (version "0.8.20")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "schemars_derive" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32 "0rq9sdcf5hyvsyj9v9nfy2jgjbjzaldjq4i6y2fcz72xlrpzsry7"))))
+          (base32 "1lzlj36qcjjpynadbi4x152i5pd2wbv42p8n3bin5ycgrv6a3m9y"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
         (("rust-proc-macro2" ,rust-proc-macro2-1)
          ("rust-quote" ,rust-quote-1)
-         ("rust-serde-derive-internals" ,rust-serde-derive-internals-0.26)
+         ("rust-serde-derive-internals" ,rust-serde-derive-internals-0.29)
          ("rust-syn" ,rust-syn-1))
         #:cargo-development-inputs
         (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
-- 
2.41.0

[bug#71110] [PATCH rust-team 05/37] gnu: rust-schemars-0.8: Update to 0.8.20.

[Nicolas Goaziou via Guix-patches via]

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

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

[bug#71110] [PATCH rust-team 06/37] gnu: Add rust-base64-0.22.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-base64-0.22): New variable.
(rust-base64-0.21): Inherit from above.

Change-Id: I55e4ddc1c2d1bd127c8fdbbeeea2ee0b0e47a1d7
---
 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 46e211d56c..20608b8353 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6630,8 +6630,36 @@ (define-public rust-base58-0.1
 c6e7d37.  However, this package works only up to 128 bytes.")
     (license license:expat)))
 
+(define-public rust-base64-0.22
+  (package
+    (name "rust-base64")
+    (version "0.22.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "base64" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1imqzgh7bxcikp5vx3shqvw9j09g9ly0xr0jma0q66i52r7jbcvj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-clap" ,rust-clap-3)
+        ("rust-criterion" ,rust-criterion-0.4)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rstest" ,rust-rstest-0.13)
+        ("rust-rstest-reuse" ,rust-rstest-reuse-0.6)
+        ("rust-strum" ,rust-strum-0.25))))
+    (home-page "https://github.com/marshallpierce/rust-base64")
+    (synopsis "Encodes and decodes base64 as bytes or utf8")
+    (description
+     "This package encodes and decodes base64 as bytes or utf8.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-base64-0.21
   (package
+    (inherit rust-base64-0.22)
     (name "rust-base64")
     (version "0.21.7")
     (source (origin
@@ -6641,7 +6669,6 @@ (define-public rust-base64-0.21
               (sha256
                (base32
                 "0rw52yvsk75kar9wgqfwgb414kvil1gn7mqkrhn9zf1537mpsacx"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
        (("rust-clap" ,rust-clap-3)
@@ -6650,12 +6677,7 @@ (define-public rust-base64-0.21
         ("rust-rand" ,rust-rand-0.8)
         ("rust-rstest" ,rust-rstest-0.13)
         ("rust-rstest-reuse" ,rust-rstest-reuse-0.6)
-        ("rust-strum" ,rust-strum-0.25))))
-    (home-page "https://github.com/marshallpierce/rust-base64")
-    (synopsis "Encodes and decodes base64 as bytes or utf8")
-    (description
-     "This package encodes and decodes base64 as bytes or utf8.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-strum" ,rust-strum-0.25))))))
 
 (define-public rust-base64-0.20
   (package
-- 
2.41.0

[bug#71110] [PATCH rust-team 07/37] gnu: rust-serde-with-3: Update to 3.8.1.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serde-with-3): Update to 3.8.1.
[arguments]<#:cargo-inputs>: Add RUST-BASE64, RUST-SCHEMARS and RUST-SERDE-DERIVE.

Change-Id: Ibab9d5f1523d7d5d271531d8e76f434a4dd76440
---
 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 20608b8353..1b9cd24bee 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68827,14 +68827,14 @@ (define-public rust-serde-value-0.7
 (define-public rust-serde-with-3
   (package
     (name "rust-serde-with")
-    (version "3.4.0")
+    (version "3.8.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde_with" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "08sw83b6hfwzylr0waf4mc29h6fxnb02g7vkwbkjjyhvrin27kb4"))
+        (base32 "082a7j42h79rs2jzafw67lay0497hnip56fdxfjxaj81mg987m0a"))
        (modules '((guix build utils)))
        (snippet
         '(begin (substitute* "Cargo.toml"
@@ -68847,7 +68847,7 @@ (define-public rust-serde-with-3
          ;; Test fails in release tarball.
          "--skip=test_serde_with_macros_dependency")
        #:cargo-inputs
-       (("rust-base64" ,rust-base64-0.21)
+       (("rust-base64" ,rust-base64-0.22)
         ("rust-chrono" ,rust-chrono-0.4)
         ("rust-doc-comment" ,rust-doc-comment-0.3)
         ("rust-document-features" ,rust-document-features-0.2)
@@ -68855,7 +68855,9 @@ (define-public rust-serde-with-3
         ("rust-hex" ,rust-hex-0.4)
         ("rust-indexmap" ,rust-indexmap-1)
         ("rust-indexmap" ,rust-indexmap-2)
+        ("rust-schemars" ,rust-schemars-0.8)
         ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-serde-with-macros" ,rust-serde-with-macros-3)
         ("rust-time" ,rust-time-0.3))
-- 
2.41.0

[bug#71110] [PATCH rust-team 08/37] gnu: rust-regex-automata-0.4: Update to 0.4.6.

[Nicolas Goaziou via Guix-patches via]

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

Change-Id: I99e28857f4eb9cc8a4c3de466d8c521974dbbc31
---
 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 1b9cd24bee..d96b4d107d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61361,14 +61361,14 @@ (define-public rust-regex-0.1
 (define-public rust-regex-automata-0.4
   (package
     (name "rust-regex-automata")
-    (version "0.4.3")
+    (version "0.4.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex-automata" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0gs8q9yhd3kcg4pr00ag4viqxnh5l7jpyb9fsfr8hzh451w4r02z"))))
+        (base32 "1spaq7y4im7s56d1gxa2hi4hzf6dwswb1bv8xyavzya7k25kpf46"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f          ; Not all files included.
-- 
2.41.0

[bug#71110] [PATCH rust-team 09/37] gnu: rust-regex-1: Update to 1.10.4.

[Nicolas Goaziou via Guix-patches via]

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

Change-Id: Ife95bab44e552121f2ce608ee5b9ba4a60ddab22
---
 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 d96b4d107d..a53cdbada4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61273,14 +61273,14 @@ (define-public rust-refpool-0.4
 (define-public rust-regex-1
   (package
     (name "rust-regex")
-    (version "1.10.2")
+    (version "1.10.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0hxkd814n4irind8im5c9am221ri6bprx49nc7yxv02ykhd9a2rq"))))
+        (base32 "0k5sb0h2mkwf51ab0gvv3x38jp1q7wgxf63abfbhi0wwvvgxn5y1"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#71110] [PATCH rust-team 10/37] gnu: rust-value-bag-sval2-1: Update to 1.9.0.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-value-bag-sval2-1): Update to 1.9.0.

Change-Id: I73cebf5eb6b47dd54793a27ccd0bdf4924e2a8de
---
 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 a53cdbada4..1cee118b39 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -86769,14 +86769,14 @@ (define-public rust-value-bag-serde1-1
 (define-public rust-value-bag-sval2-1
   (package
     (name "rust-value-bag-sval2")
-    (version "1.8.0")
+    (version "1.9.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "value-bag-sval2" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "10jqa3mprd763plyabxifmvg32hrc8xn0bfqsyhc6w33h550z79v"))))
+        (base32 "0nr8453w1357xc70ilbvwcg4qa6bgll44pci0fbznb82hvjbm18p"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#71110] [PATCH rust-team 11/37] gnu: rust-value-bag-serde1-1: Update to 1.9.0.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-value-bag-serde1-1): Update to 1.9.0.

Change-Id: Icd104927b04af3bf05e4ea947ccd6cc23bd8c181
---
 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 1cee118b39..354823034d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -86744,14 +86744,14 @@ (define-public rust-value-bag-1
 (define-public rust-value-bag-serde1-1
   (package
     (name "rust-value-bag-serde1")
-    (version "1.8.0")
+    (version "1.9.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "value-bag-serde1" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "14fq98dm5ddlc0pzg35nk1bw3f3z8y6fhjcsy41n4s06v69vdmga"))))
+        (base32 "12rjnrh2g3ijvjgfh78y7x1ilk3mw2svri93nymsjxxhbh6gbb6c"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#71110] [PATCH rust-team 12/37] gnu: rust-value-bag-1: Update to 1.9.0.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-value-bag-1): Update to 1.9.0.

Change-Id: I92c614b6b4afcb4af0348554feb8ca10f4bff275
---
 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 354823034d..8c5b0a2dcc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -86720,14 +86720,14 @@ (define-public rust-valuable-serde-0.1
 (define-public rust-value-bag-1
   (package
     (name "rust-value-bag")
-    (version "1.8.0")
+    (version "1.9.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "value-bag" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "07acyp7drvd5hqgy6vcrkw8sw6w9gzynkxyhrm0s9z6nbfi2dv4g"))))
+        (base32 "00aij8p1n7vcggkb9nxpwx9g5nqzclrf7prd1wpi9c3sscvw312s"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#71110] [PATCH rust-team 13/37] gnu: rust-env-logger-0.10: Update to 0.10.2.

[Nicolas Goaziou via Guix-patches via]

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

Change-Id: I8f3681329c90048c32edaab3ac5be09aae028af3
---
 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 8c5b0a2dcc..12d0b12fd6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23977,14 +23977,14 @@ (define-public rust-env-logger-0.10
   (package
     (inherit rust-env-logger-0.11)
     (name "rust-env-logger")
-    (version "0.10.1")
+    (version "0.10.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "env_logger" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1kmy9xmfjaqfvd4wkxr1f7d16ld3h9b487vqs2q9r0s8f3kg7cwm"))))
+        (base32 "1005v71kay9kbz1d5907l0y7vh9qn2fqsp2yfgb8bjvin6m0bm2c"))))
     (arguments
      `(#:cargo-inputs
        (("rust-humantime" ,rust-humantime-2)
-- 
2.41.0

[bug#71110] [PATCH rust-team 14/37] gnu: Add rust-bson-1.

[Nicolas Goaziou via Guix-patches via]

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

Change-Id: Ic8c8660b30df76db9c63888a778d2eb7d2ce665a
---
 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 12d0b12fd6..3f19f703cc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9182,6 +9182,36 @@ (define-public rust-bson-2
     (description "This crate provides encoding and decoding support for BSON.")
     (license license:expat)))
 
+(define-public rust-bson-1
+  (package
+    (inherit rust-bson-2)
+    (name "rust-bson")
+    (version "1.2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bson" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1cbc9mbjm4imzcv95y8r6rgl6kgv7ka5ifhhlxaqi4sv0dwaa2ny"))))
+    (arguments
+     `(#:tests? #f      ; file not found for module `tests`
+       #:cargo-inputs
+       (("rust-base64" ,rust-base64-0.13)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-decimal" ,rust-decimal-2)
+        ("rust-hex" ,rust-hex-0.4)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-linked-hash-map" ,rust-linked-hash-map-0.5)
+        ("rust-rand" ,rust-rand-0.7)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-uuid" ,rust-uuid-0.8))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)
+        ("rust-serde-bytes" ,rust-serde-bytes-0.11))))))
+
 (define-public rust-bstr-1
   (package
     (name "rust-bstr")
-- 
2.41.0

[bug#71110] [PATCH rust-team 15/37] gnu: rust-anyhow-1: Update to 1.0.86.

[Nicolas Goaziou via Guix-patches via]

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

Change-Id: I36bb6b7f6bb85be750c95b9396f7eb59b3ebe0dd
---
 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 3f19f703cc..1eb6014d05 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2092,14 +2092,14 @@ (define-public rust-antidote-1
 (define-public rust-anyhow-1
   (package
     (name "rust-anyhow")
-    (version "1.0.79")
+    (version "1.0.86")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "anyhow" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1ji5irqiwr8yprgqj8zvnli7zd7fz9kzaiddq44jnrl2l289h3h8"))))
+        (base32 "1nk301x8qhpdaks6a9zvcp7yakjqnczjmqndbg7vk4494d3d1ldk"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#71110] [PATCH rust-team 16/37] gnu: Add rust-pretty-assertions-0.5.

[Nicolas Goaziou via Guix-patches via]

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

Change-Id: Iaf34d946033e45fa8672796d3b28d1c6fd23815e
---
 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 1eb6014d05..48ab6f6a9a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55314,6 +55314,26 @@ (define-public rust-pretty-assertions-0.6
         ("rust-ansi-term" ,rust-ansi-term-0.11)
         ("rust-difference" ,rust-difference-2))))))
 
+(define-public rust-pretty-assertions-0.5
+  (package
+    (inherit rust-pretty-assertions-0.7)
+    (name "rust-pretty-assertions")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pretty_assertions" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1ins6swkpxmrh8q5h96h8nv0497d3dclsiyx2lyvqi6py0q980is"))))
+    (arguments
+     `(#:tests? #f                      ;XXX: Tests fail
+       #:cargo-inputs
+       (("rust-ansi-term" ,rust-ansi-term-0.11)
+        ("rust-difference" ,rust-difference-2))))))
+
 (define-public rust-pretty-assertions-0.4
   (package
     (inherit rust-pretty-assertions-0.6)
-- 
2.41.0

[bug#71110] [PATCH rust-team 17/37] gnu: Add rust-graphql-parser-0.3.

[Nicolas Goaziou via Guix-patches via]

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

Change-Id: I1640bddaad6e35be1dd818a4fd271c9a02053816
---
 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 48ab6f6a9a..f0ce7e5924 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30238,6 +30238,32 @@ (define-public rust-goblin-0.6
         ("rust-plain" ,rust-plain-0.2)
         ("rust-scroll" ,rust-scroll-0.11))))))
 
+(define-public rust-graphql-parser-0.3
+  (package
+    (name "rust-graphql-parser")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "graphql-parser" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1wp6vnrhgi6q3b942zkc6p4mi104gbw71pnc0d5c1ps7ab7d9ayi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-combine" ,rust-combine-3)
+        ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-0.5))))
+    (home-page "https://github.com/graphql-rust/graphql-parser")
+    (synopsis
+     "Parser, AST and serializer for graphql query language")
+    (description
+     "This package provides a parser, AST and serializer for graphql query
+language and scheme definition language (sometimes called IDL).")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-greetd-ipc-0.9
   (package
     (name "rust-greetd-ipc")
-- 
2.41.0

[bug#71110] [PATCH rust-team 18/37] gnu: Add rust-iso8601-0.6.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-iso8601-0.6): New variable.
(rust-is-terminal-0.4): Inherit from above.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f0ce7e5924..54520dc8db 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34950,25 +34950,46 @@ (define-public rust-is-wsl-0.4
 Windows Subsystem for Linux.")
     (license license:expat)))
 
-(define-public rust-iso8601-0.4
+(define-public rust-iso8601-0.6
   (package
     (name "rust-iso8601")
-    (version "0.4.2")
+    (version "0.6.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "iso8601" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "15nfg6d4qlniw4gk7039s5y07lzgr1dp9snsw63lsxarnyz4zfg5"))))
+        (base32 "0lqif1zp19fjmrbhcdjx0ydnljax3090san5zq8r1x98x9rmsklj"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-nom" ,rust-nom-7))))
+     `(#:cargo-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-nom" ,rust-nom-7)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-serde-json" ,rust-serde-json-1))))
     (home-page "https://github.com/badboy/iso8601")
-    (synopsis "Parsing ISO8601 dates using nom")
-    (description "Parsing ISO8601 dates using nom.")
+    (synopsis "Parsing ISO8601 dates using @code{nom}")
+    (description "This crate parses ISO8601 dates using @code{nom}.")
     (license license:expat)))
 
+(define-public rust-iso8601-0.4
+  (package
+    (inherit rust-iso8601-0.6)
+    (name "rust-iso8601")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "iso8601" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15nfg6d4qlniw4gk7039s5y07lzgr1dp9snsw63lsxarnyz4zfg5"))))
+    (arguments
+     `(#:cargo-inputs (("rust-nom" ,rust-nom-7))))))
+
 (define-public rust-iso8601-0.3
   (package
     (inherit rust-iso8601-0.4)
-- 
2.41.0

[bug#71110] [PATCH rust-team 19/37] gnu: Add rust-num-cmp-0.1.

[Nicolas Goaziou via Guix-patches via]

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

Change-Id: Ic7d6bb4dddc3d6cac2e7ce41c78b4ac94f6ac38a
---
 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 54520dc8db..bf386f58ba 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47220,6 +47220,25 @@ (define-public rust-num-bigint-dig-0.7
         ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)
         ("rust-serde-test" ,rust-serde-test-1))))))
 
+(define-public rust-num-cmp-0.1
+  (package
+    (name "rust-num-cmp")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "num-cmp" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1alavi36shn32b3cwbmkncj1wal3y3cwzkm21bxy5yil5hp5ncv3"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/lifthrasiir/num-cmp")
+    (synopsis "Comparison between differently typed numbers")
+    (description
+     "This crate provides tools for comparison between differently typed
+numbers.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-num-complex-0.4
   (package
     (name "rust-num-complex")
-- 
2.41.0

[bug#71110] [PATCH rust-team 20/37] gnu: Add rust-h3-0.0.4.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-web.scm (rust-h3-0.0.4): New variable.
(rust-h3-0.0.3): Inherit from above.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index eab91e7139..8287dfe19b 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2020-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020-2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
 ;;; Copyright © 2023 Steve George <steve@futurile.net>
 ;;; Copyright © 2023 VÖRÖSKŐI András <voroskoi@gmail.com>
@@ -2492,25 +2492,25 @@ (define-public rust-h2-0.1
         ("rust-webpki" ,rust-webpki-0.21)
         ("rust-webpki-roots" ,rust-webpki-roots-0.17))))))
 
-(define-public rust-h3-0.0.3
+(define-public rust-h3-0.0.4
   (package
     (name "rust-h3")
-    (version "0.0.3")
+    (version "0.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "h3" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "101vg73galsyk5gnjb49cjb6q40c9z2npcdxpfsj99ky2waijgmq"))))
+        (base32 "04clhh6b5iqlgnbppikbz4zpxl78g4vkyhyrjgnyg4vfkrmqij5i"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f      ; Not all files included
+     `(#:tests? #f                      ;not all files included
        #:cargo-inputs
        (("rust-bytes" ,rust-bytes-1)
         ("rust-fastrand" ,rust-fastrand-2)
         ("rust-futures-util" ,rust-futures-util-0.3)
-        ("rust-http" ,rust-http-0.2)
+        ("rust-http" ,rust-http-1)
         ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
         ("rust-tokio" ,rust-tokio-1)
         ("rust-tracing" ,rust-tracing-0.1))
@@ -2531,6 +2531,41 @@ (define-public rust-h3-0.0.3
     (description "This package provides an async HTTP/3 implementation.")
     (license license:expat)))
 
+(define-public rust-h3-0.0.3
+  (package
+    (inherit rust-h3-0.0.4)
+    (name "rust-h3")
+    (version "0.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "h3" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "101vg73galsyk5gnjb49cjb6q40c9z2npcdxpfsj99ky2waijgmq"))))
+    (arguments
+     `(#:tests? #f                      ; Not all files included
+       #:cargo-inputs
+       (("rust-bytes" ,rust-bytes-1)
+        ("rust-fastrand" ,rust-fastrand-2)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-quinn" ,rust-quinn-0.10)
+        ("rust-quinn-proto" ,rust-quinn-proto-0.10)
+        ("rust-rcgen" ,rust-rcgen-0.11)
+        ("rust-rustls" ,rust-rustls-0.21)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-util" ,rust-tokio-util-0.7)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))))
+
 (define-public rust-h3-0.0.2
   (package
     (inherit rust-h3-0.0.3)
-- 
2.41.0

[bug#71110] [PATCH rust-team 21/37] gnu: Add rust-h3-quinn-0.0.5.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-web.scm (rust-h3-quinn-0.0.5): New variable.
(rust-h3-quinn-0.0.4): Inherit from above.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 8287dfe19b..52b5d1cef3 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -2587,8 +2587,36 @@ (define-public rust-h3-0.0.2
                        ("rust-tokio" ,rust-tokio-1)
                        ("rust-tracing" ,rust-tracing-0.1))))))
 
+(define-public rust-h3-quinn-0.0.5
+  (package
+    (name "rust-h3-quinn")
+    (version "0.0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "h3-quinn" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ii06bi5a19k4qfkppn5019nw8xca2wzfl66cax949jc1v66ny3k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bytes" ,rust-bytes-1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-h3" ,rust-h3-0.0.4)
+        ("rust-quinn" ,rust-quinn-0.10)
+        ("rust-quinn-proto" ,rust-quinn-proto-0.10)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-util" ,rust-tokio-util-0.7))))
+    (home-page "https://github.com/hyperium/h3")
+    (synopsis "QUIC transport implementation based on Quinn")
+    (description
+     "This package provides QUIC transport implementation based on Quinn.")
+    (license license:expat)))
+
 (define-public rust-h3-quinn-0.0.4
   (package
+    (inherit rust-h3-quinn-0.0.5)
     (name "rust-h3-quinn")
     (version "0.0.4")
     (source
@@ -2598,7 +2626,6 @@ (define-public rust-h3-quinn-0.0.4
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1r0sm0j51crlfpy2j1wfhgpg2lrfq2xmf5qjd98ksg3h9l0pb5mc"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1)
                        ("rust-futures" ,rust-futures-0.3)
@@ -2606,12 +2633,7 @@ (define-public rust-h3-quinn-0.0.4
                        ("rust-quinn" ,rust-quinn-0.10)
                        ("rust-quinn-proto" ,rust-quinn-proto-0.10)
                        ("rust-tokio" ,rust-tokio-1)
-                       ("rust-tokio-util" ,rust-tokio-util-0.7))))
-    (home-page "https://github.com/hyperium/h3")
-    (synopsis "QUIC transport implementation based on Quinn")
-    (description
-     "This package provides QUIC transport implementation based on Quinn.")
-    (license license:expat)))
+                       ("rust-tokio-util" ,rust-tokio-util-0.7))))))
 
 (define-public rust-h3-quinn-0.0.3
   (package
-- 
2.41.0

[bug#71110] [PATCH rust-team 22/37] gnu: Add rust-hyper-tls-0.6.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-web.scm (rust-hyper-tls-0.6): New variable.
(rust-hyper-tls-0.5): Inherit from above.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 52b5d1cef3..c526f2f74e 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3913,32 +3913,60 @@ (define-public rust-hyper-timeout-0.4
 to be used with Hyper client.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-hyper-tls-0.5
+(define-public rust-hyper-tls-0.6
   (package
     (name "rust-hyper-tls")
-    (version "0.5.0")
+    (version "0.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "hyper-tls" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "01crgy13102iagakf6q4mb75dprzr7ps1gj0l5hxm1cvm7gks66n"))))
+        (base32 "1q36x2yps6hhvxq5r7mc8ph9zz6xlb573gx0x3yskb0fi736y83h"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-bytes" ,rust-bytes-1)
-        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-http-body-util" ,rust-http-body-util-0.1)
+        ("rust-hyper" ,rust-hyper-1)
+        ("rust-hyper-util" ,rust-hyper-util-0.1)
         ("rust-native-tls" ,rust-native-tls-0.2)
         ("rust-tokio" ,rust-tokio-1)
-        ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3))))
+        ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)
+        ("rust-tower-service" ,rust-tower-service-0.3))
+       #:cargo-development-inputs
+       (("rust-hyper-util" ,rust-hyper-util-0.1)
+        ("rust-tokio" ,rust-tokio-1))))
+    (native-inputs (list pkg-config))
+    (inputs (list openssl))
     (home-page "https://hyper.rs")
     (synopsis "Default TLS implementation for use with hyper")
     (description "This package provides the default TLS implementation for use
 with hyper.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-hyper-tls-0.5
+  (package
+    (inherit rust-hyper-tls-0.6)
+    (name "rust-hyper-tls")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hyper-tls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01crgy13102iagakf6q4mb75dprzr7ps1gj0l5hxm1cvm7gks66n"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bytes" ,rust-bytes-1)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-native-tls" ,rust-native-tls-0.2)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3))))))
+
 (define-public rust-hyper-tls-0.4
   (package
     (inherit rust-hyper-tls-0.5)
-- 
2.41.0

[bug#71110] [PATCH rust-team 23/37] gnu: Add rust-hyper-rustls-0.26.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-web.scm (rust-hyper-rustls-0.26): New variable.
(rust-hyper-rustls-0.24): Inherit from above.

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

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index c526f2f74e..0166e7ef0f 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3738,8 +3738,48 @@ (define-public rust-hyper-proxy-0.9
     (description "Proxy connector for the Hyper HTTP library.")
     (license license:expat)))
 
+(define-public rust-hyper-rustls-0.26
+  (package
+    (name "rust-hyper-rustls")
+    (version "0.26.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hyper-rustls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b4m1jvs147hxi8677n2dxxib663s7c31xmfni7b5qkanihsggm0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f                      ;not all files included
+       #:cargo-inputs
+       (("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-http" ,rust-http-1)
+        ("rust-hyper" ,rust-hyper-1)
+        ("rust-hyper-util" ,rust-hyper-util-0.1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-rustls" ,rust-rustls-0.22)
+        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.7)
+        ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.25)
+        ("rust-tower-service" ,rust-tower-service-0.3)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.26))
+       #:cargo-development-inputs
+       (("rust-http-body-util" ,rust-http-body-util-0.1)
+        ("rust-hyper-util" ,rust-hyper-util-0.1)
+        ("rust-rustls" ,rust-rustls-0.22)
+        ("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
+        ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/rustls/hyper-rustls")
+    (synopsis "Rustls+Hyper integration for pure Rust HTTPS")
+    (description
+     "This package provides Rustls+Hyper integration for pure Rust HTTPS.")
+    (license (list license:asl2.0 license:isc license:expat))))
+
 (define-public rust-hyper-rustls-0.24
   (package
+    (inherit rust-hyper-rustls-0.26)
     (name "rust-hyper-rustls")
     (version "0.24.2")
     (source
@@ -3749,9 +3789,8 @@ (define-public rust-hyper-rustls-0.24
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1475j4a2nczz4aajzzsq3hpwg1zacmzbqg393a14j80ff8izsgpc"))))
-    (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f              ; Not all files included.
+     `(#:tests? #f                      ; Not all files included.
        #:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3)
                        ("rust-http" ,rust-http-0.2)
                        ("rust-hyper" ,rust-hyper-0.14)
@@ -3764,12 +3803,7 @@ (define-public rust-hyper-rustls-0.24
        #:cargo-development-inputs (("rust-hyper" ,rust-hyper-0.14)
                                    ("rust-rustls" ,rust-rustls-0.21)
                                    ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
-                                   ("rust-tokio" ,rust-tokio-1))))
-    (home-page "https://github.com/rustls/hyper-rustls")
-    (synopsis "Rustls+Hyper integration for pure Rust HTTPS")
-    (description
-     "This package provides Rustls+Hyper integration for pure Rust HTTPS.")
-    (license (list license:asl2.0 license:isc license:expat))))
+                                   ("rust-tokio" ,rust-tokio-1))))))
 
 (define-public rust-hyper-rustls-0.23
   (package
-- 
2.41.0

[bug#71110] [PATCH rust-team 24/37] gnu: rust-pin-project-internal-1: Update to 1.1.5.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pin-project-internal-1): Update to 1.1.5.
[arguments]<#:cargo-inputs>: Update RUST-SYN version.

Change-Id: I2287455735ea002aba9b1f2b41cf5bf06c69fb92
---
 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 bf386f58ba..530231284f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -52965,21 +52965,21 @@ (define-public rust-pin-project-0.4
 (define-public rust-pin-project-internal-1
   (package
     (name "rust-pin-project-internal")
-    (version "1.0.12")
+    (version "1.1.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pin-project-internal" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0maa6icn7rdfy4xvgfaq7m7bwpw9f19wg76f1ncsiixd0lgdp6q6"))))
+        (base32 "0r9r4ivwiyqf45sv6b30l1dx282lxaax2f6gl84jwa3q590s8f1g"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #false
        #:cargo-inputs
        (("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/taiki-e/pin-project")
     (synopsis "Implementation detail of the @code{pin-project} crate")
     (description
-- 
2.41.0

[bug#71110] [PATCH rust-team 25/37] gnu: rust-rustls-pki-types-1: Update to 1.7.0.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-tls.scm (rust-rustls-pki-types-1): Update to 1.7.0.

Change-Id: Iea95baaa716e8bf4baaacccb8df009996d9d0d65
---
 gnu/packages/crates-tls.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 9f7863f197..61ce82cda8 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
 ;;; Copyright © 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020, 2021, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
 ;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
@@ -1452,18 +1452,22 @@ (define-public rust-rustls-pemfile-0.2
 (define-public rust-rustls-pki-types-1
   (package
     (name "rust-rustls-pki-types")
-    (version "1.0.1")
+    (version "1.7.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rustls-pki-types" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16rkx6gn5l2zximxy8fx9h2vzks1hfxi5z5cd9y97r0fl853wrz7"))))
+        (base32 "0banlc9xzwqrx8n0h4bd0igmq3z5hc72rn941lf22cp3gkkraqlp"))))
     (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-web-time" ,rust-web-time-1))))
     (home-page "https://github.com/rustls/pki-types")
     (synopsis "Shared types for the rustls PKI ecosystem")
-    (description "Shared types for the rustls PKI ecosystem.")
+    (description
+     "This crate provides shared types for the rustls PKI ecosystem.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-rustls-webpki-0.102
-- 
2.41.0

[bug#71110] [PATCH rust-team 26/37] gnu: rust-pin-project-1: Update to 1.1.5.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pin-project-1): Update to 1.1.5.
[arguments]<#:tests?>: Disable tests; error undecipherable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 530231284f..2ce9f1dd50 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -52889,17 +52889,20 @@ (define-public rust-pikchr-0.1
 (define-public rust-pin-project-1
   (package
     (name "rust-pin-project")
-    (version "1.0.12")
+    (version "1.1.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pin-project" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1k3f9jkia3idxl2pqxamszwnl89dk52fa4jqj3p7zmmwnq4scadd"))))
+        (base32 "1cxl146x0q7lawp0m1826wsgj8mmmfs6ja8q7m6f7ff5j6vl7gxn"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     ;; XXX: Tests fail with "error[E0433]: failed to resolve: use of
+     ;; undeclared crate or module `macrotest`".
+     `(#:tests? #false
+       #:cargo-inputs
        (("rust-pin-project-internal" ,rust-pin-project-internal-1))
        #:cargo-development-inputs
        (("rust-macrotest" ,rust-macrotest-1)
-- 
2.41.0

[bug#71110] [PATCH rust-team 27/37] gnu: Add rust-wasm-streams-0.4.

[Nicolas Goaziou via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2ce9f1dd50..d629f45860 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -88163,8 +88163,39 @@ (define-public rust-wasm-encoder-0.38
      "This package provides a low-level @code{WebAssembly} encoder.")
     (license license:asl2.0)))
 
+(define-public rust-wasm-streams-0.4
+  (package
+    (name "rust-wasm-streams")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wasm-streams" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ad17c59xb8fffsnbrqbyqz93hb66nzxhizpii31icb31g4w8pdn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-js-sys" ,rust-js-sys-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-pin-project" ,rust-pin-project-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
+        ("rust-web-sys" ,rust-web-sys-0.3))))
+    (home-page "https://github.com/MattiasBuelens/wasm-streams/")
+    (synopsis "Bridge between web streams and Rust streams using WebAssembly")
+    (description
+     "Bridging between web streams and Rust streams using WebAssembly.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-wasm-streams-0.3
   (package
+    (inherit rust-wasm-streams-0.4)
     (name "rust-wasm-streams")
     (version "0.3.0")
     (source
@@ -88174,7 +88205,6 @@ (define-public rust-wasm-streams-0.3
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1iqa4kmhbsjj8k4q15i1x0x4p3xda0dhbg7zw51mydr4g129sq5l"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3)
                        ("rust-js-sys" ,rust-js-sys-0.3)
@@ -88184,12 +88214,7 @@ (define-public rust-wasm-streams-0.3
        #:cargo-development-inputs (("rust-pin-project" ,rust-pin-project-1)
                                    ("rust-tokio" ,rust-tokio-1)
                                    ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
-                                   ("rust-web-sys" ,rust-web-sys-0.3))))
-    (home-page "https://github.com/MattiasBuelens/wasm-streams/")
-    (synopsis "Bridge between web streams and Rust streams using WebAssembly")
-    (description
-     "Bridging between web streams and Rust streams using WebAssembly.")
-    (license (list license:expat license:asl2.0))))
+                                   ("rust-web-sys" ,rust-web-sys-0.3))))))
 
 (define-public rust-wasm-streams-0.2
   (package
-- 
2.41.0

[bug#71110] [PATCH rust-team 28/37] gnu: Add rust-reqwest-0.12.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-web.scm (rust-reqwest-0.12): New variable.
(rust-reqwest-0.11): Inherit from above.

Change-Id: If1082fb770b458049faeb606ccd105cffb65b3ff
---
 gnu/packages/crates-web.scm | 104 ++++++++++++++++++++++++++++++++----
 1 file changed, 94 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 0166e7ef0f..d103144370 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4557,8 +4557,101 @@ (define-public rust-poem-derive-1
     (description "This package provides macros for poem.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-reqwest-0.12
+  (package
+    (name "rust-reqwest")
+    (version "0.12.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "reqwest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "047aa0qnngnlnf9i0abrs6pgmz15vk81p5pvscwhk3l6jbfsyv2n"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            "--skip=badssl"
+                            "--skip=test_allowed_methods"
+                            "--skip=test_tls_info"
+                            "--skip=connect_many_timeout"
+                            "--skip=connect_timeout")
+       #:cargo-inputs
+       (("rust-async-compression" ,rust-async-compression-0.4)
+        ("rust-base64" ,rust-base64-0.22)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-cookie" ,rust-cookie-0.17)
+        ("rust-cookie-store" ,rust-cookie-store-0.20)
+        ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+        ("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-h2" ,rust-h2-0.4)
+        ("rust-h3" ,rust-h3-0.0.4)
+        ("rust-h3-quinn" ,rust-h3-quinn-0.0.5)
+        ("rust-hickory-resolver" ,rust-hickory-resolver-0.24)
+        ("rust-http" ,rust-http-1)
+        ("rust-http-body" ,rust-http-body-1)
+        ("rust-http-body-util" ,rust-http-body-util-0.1)
+        ("rust-hyper" ,rust-hyper-1)
+        ("rust-hyper-rustls" ,rust-hyper-rustls-0.26)
+        ("rust-hyper-tls" ,rust-hyper-tls-0.6)
+        ("rust-hyper-util" ,rust-hyper-util-0.1)
+        ("rust-ipnet" ,rust-ipnet-2)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-mime" ,rust-mime-0.3)
+        ("rust-mime-guess" ,rust-mime-guess-2)
+        ("rust-native-tls" ,rust-native-tls-0.2)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-quinn" ,rust-quinn-0.10)
+        ("rust-rustls" ,rust-rustls-0.22)
+        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.7)
+        ("rust-rustls-pemfile" ,rust-rustls-pemfile-2)
+        ("rust-rustls-pki-types" ,rust-rustls-pki-types-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
+        ("rust-sync-wrapper" ,rust-sync-wrapper-0.1)
+        ("rust-system-configuration" ,rust-system-configuration-0.5)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.25)
+        ("rust-tokio-socks" ,rust-tokio-socks-0.5)
+        ("rust-tokio-util" ,rust-tokio-util-0.7)
+        ("rust-tower-service" ,rust-tower-service-0.3)
+        ("rust-url" ,rust-url-2)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
+        ("rust-wasm-streams" ,rust-wasm-streams-0.4)
+        ("rust-web-sys" ,rust-web-sys-0.3)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.26)
+        ("rust-winreg" ,rust-winreg-0.52))
+       #:cargo-development-inputs
+       (("rust-brotli" ,rust-brotli-3)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-hyper" ,rust-hyper-1)
+        ("rust-hyper-util" ,rust-hyper-util-0.1)
+        ("rust-libflate" ,rust-libflate-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
+        ("rust-zstd" ,rust-zstd-0.13))))
+    (native-inputs (list pkg-config))
+    (inputs (list openssl (list zstd "lib")))
+    (home-page "https://github.com/seanmonstar/reqwest")
+    (synopsis "High level HTTP client library")
+    (description "This package provides a high level HTTP client library.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-reqwest-0.11
   (package
+    (inherit rust-reqwest-0.12)
     (name "rust-reqwest")
     (version "0.11.23")
     (source
@@ -4568,7 +4661,6 @@ (define-public rust-reqwest-0.11
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0hgvzb7r46656r9vqhl5qk1kbr2xzjb91yr2cb321160ka6sxc9p"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
        '("--release" "--"
@@ -4637,15 +4729,7 @@ (define-public rust-reqwest-0.11
         ("rust-serde" ,rust-serde-1)
         ("rust-tokio" ,rust-tokio-1)
         ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
-    (inputs
-     (list openssl))
-    (native-inputs
-     (list pkg-config))
-    (home-page "https://github.com/seanmonstar/reqwest")
-    (synopsis "High level HTTP client library")
-    (description "This package provides a high level HTTP client library.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))))
 
 (define-public rust-reqwest-0.10
   (package
-- 
2.41.0

[bug#71110] [PATCH rust-team 29/37] gnu: Add rust-derive-utils-0.11.

[Nicolas Goaziou via Guix-patches via]

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

Change-Id: I7e19f16e73df269b41ad6dac33715a4915d76f6b
---
 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 d629f45860..86923765c2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20838,6 +20838,34 @@ (define-public rust-derive-new-0.5
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-derive-utils-0.11
+  (package
+    (name "rust-derive-utils")
+    (version "0.11.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "derive_utils" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1gx7giwn8x427d5f8c92n9h0hhcqdsasvz7i8iq2rqffvhalqask"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-rustversion" ,rust-rustversion-1)
+        ("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://github.com/taiki-e/derive_utils")
+    (synopsis "Macro helper for easily writing derives macros for enum")
+    (description
+     "This crate provides a procedural macro helper for easily
+writing derives macros for enums.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-derive-where-1
   (package
     (name "rust-derive-where")
-- 
2.41.0

[bug#71110] [PATCH rust-team 30/37] gnu: Add rust-futures-enum-0.1.

[Nicolas Goaziou via Guix-patches via]

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

Change-Id: Ia84cbd88b04e515026f4c9045a371f7481f04ae5
---
 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 86923765c2..dfcd6299d3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28158,6 +28158,40 @@ (define-public rust-futures-cpupool-0.1
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-futures-enum-0.1
+  (package
+    (name "rust-futures-enum")
+    (version "0.1.17")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "futures-enum" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07kvpnr21qalhw4hw44h3335wi0lgrdf02n1vglm4flhwx6x28il"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-derive-utils" ,rust-derive-utils-0.11)
+        ("rust-find-crate" ,rust-find-crate-0.6)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-futures" ,rust-futures-0.1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-io" ,rust-futures-io-0.3)
+        ("rust-futures-sink" ,rust-futures-sink-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3))))
+    (home-page "https://github.com/taiki-e/futures-enum")
+    (synopsis
+     "Future, Stream, Sink, AsyncRead, AsyncWrite, AsyncSeek, AsyncBufRead for enums")
+    (description
+     "This crate provides @code{#[derive(Future, Stream, Sink, AsyncRead, AsyncWrite,
+AsyncSeek, AsyncBufRead)]} for enums.")
+    (license (list license:asl2.0 license:expat))))
+
+
 (define-public rust-futures-executor-0.3
   (package
     (name "rust-futures-executor")
-- 
2.41.0

[bug#71110] [PATCH rust-team 31/37] gnu: Add rust-juniper-codegen-0.15, rust-juniper-0.15.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-juniper-codegen-0.15): New variable.
(rust-juniper-0.15): New variable.
(rust-juniper-codegen-0.14, rust-juniper-0.14): Inherit from above.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dfcd6299d3..85254e0547 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36185,26 +36185,30 @@ (define-public rust-juliex-0.3
 concurrency primitives and multiple allocations.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-juniper-codegen-0.14
+(define-public rust-juniper-codegen-0.15
   (package
     (name "rust-juniper-codegen")
-    (version "0.14.2")
+    (version "0.15.9")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "juniper_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "06ym8568k9p75kvnfc4ywqbkzaa4ib6gngx9vpbsjwg9v0sg42nl"))))
+        (base32 "1nvigsc1yrfv09wx1yv830dd60ay556haz87p80h7m8s0rqpdsdf"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #false                  ;FIXME: fail due to unresolved import
+     ;; XXX: Tests fail with "error[E0599]: no variant or associated item
+     ;; named `__TestExhaustive` found for enum `syn::Type` in the current
+     ;; scope".
+     `(#:tests? #false
        #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-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-1))
        #:cargo-development-inputs
-       (("rust-juniper" ,rust-juniper-0.14))))
+       (("rust-juniper" ,rust-juniper-0.15))))
     (home-page "https://github.com/graphql-rust/juniper")
     (synopsis "Internal custom derive trait for Juniper GraphQL")
     (description
@@ -36212,32 +36216,63 @@ (define-public rust-juniper-codegen-0.14
 GraphQL.")
     (license license:bsd-2)))
 
-(define-public rust-juniper-0.14
+(define-public rust-juniper-codegen-0.14
   (package
-    (name "rust-juniper")
+    (inherit rust-juniper-codegen-0.15)
+    (name "rust-juniper-codegen")
     (version "0.14.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "juniper_codegen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06ym8568k9p75kvnfc4ywqbkzaa4ib6gngx9vpbsjwg9v0sg42nl"))))
+    (arguments
+     `(#:tests? #false                  ;FIXME: fail due to unresolved import
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-juniper" ,rust-juniper-0.14))))))
+
+(define-public rust-juniper-0.15
+  (package
+    (name "rust-juniper")
+    (version "0.15.12")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "juniper" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0s56rb31yddhvjynl5bk8jihcdln8h5yfsx63kfxdhzvw98vlqpn"))))
+        (base32 "1dg1b5msr8k4kwmam2h0f64z7aamk4799vdh3cg55c881idclpc7"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-chrono" ,rust-chrono-0.4)
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-bson" ,rust-bson-1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-chrono-tz" ,rust-chrono-tz-0.5)
         ("rust-fnv" ,rust-fnv-1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-enum" ,rust-futures-enum-0.1)
+        ("rust-graphql-parser" ,rust-graphql-parser-0.3)
         ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-juniper-codegen" ,rust-juniper-codegen-0.14)
+        ("rust-juniper-codegen" ,rust-juniper-codegen-0.15)
         ("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-smartstring" ,rust-smartstring-1)
+        ("rust-static-assertions" ,rust-static-assertions-1)
         ("rust-url" ,rust-url-2)
-        ("rust-uuid" ,rust-uuid-0.7))
+        ("rust-uuid" ,rust-uuid-0.8))
        #:cargo-development-inputs
        (("rust-bencher" ,rust-bencher-0.1)
-        ("rust-serde-json" ,rust-serde-json-1))))
+        ("rust-pretty-assertions" ,rust-pretty-assertions-0.7)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-tokio" ,rust-tokio-1))))
     (home-page "https://github.com/graphql-rust/juniper")
     (synopsis "GraphQL server library for Rust")
     (description
@@ -36252,6 +36287,33 @@ (define-public rust-juniper-0.14
 debugging.")
     (license license:bsd-2)))
 
+(define-public rust-juniper-0.14
+  (package
+    (inherit rust-juniper-0.15)
+    (name "rust-juniper")
+    (version "0.14.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "juniper" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0s56rb31yddhvjynl5bk8jihcdln8h5yfsx63kfxdhzvw98vlqpn"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-fnv" ,rust-fnv-1)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-juniper-codegen" ,rust-juniper-codegen-0.14)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-url" ,rust-url-2)
+        ("rust-uuid" ,rust-uuid-0.7))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher-0.1)
+        ("rust-serde-json" ,rust-serde-json-1))))))
+
 (define-public rust-keccak-0.1
   (package
     (name "rust-keccak")
-- 
2.41.0

[bug#71110] [PATCH rust-team 32/37] gnu: rust-num-traits-0.2: Update to 0.2.19.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-num-traits-0.2): Update to 0.2.19.

Change-Id: Ib50d44c8bd322586876cd15352c0395c5fd5796e
---
 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 85254e0547..cc003b3656 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47927,14 +47927,14 @@ (define-public rust-num-threads-0.1
 (define-public rust-num-traits-0.2
   (package
     (name "rust-num-traits")
-    (version "0.2.17")
+    (version "0.2.19")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "num-traits" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0z16bi5zwgfysz6765v3rd6whfbjpihx3mhsn4dg8dzj2c221qrr"))))
+        (base32 "0h984rhdkkqd4ny9cif7y2azl3xdfb7768hb9irhpsch4q3gq787"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#71110] [PATCH rust-team 33/37] gnu: rust-num-complex-0.4: Update to 0.4.6.

[Nicolas Goaziou via Guix-patches via]

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

Change-Id: Ifc2f83f5be8e435c7b306f4618f4a2d5a79fb8b7
---
 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 cc003b3656..fa4839cbd1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47366,14 +47366,14 @@ (define-public rust-num-cmp-0.1
 (define-public rust-num-complex-0.4
   (package
     (name "rust-num-complex")
-    (version "0.4.4")
+    (version "0.4.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "num-complex" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "051j73vvdj07kdlpqv056s3a50ragsx3183cbpl1shc51355g88v"))))
+        (base32 "15cla16mnw12xzf5g041nxbjjm9m85hdgadd5dl5d0b30w9qmy3k"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#71110] [PATCH rust-team 34/37] gnu: rust-num-integer-0.1: Update to 0.1.46.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-num-integer-0.1): Update to 0.1.46.

Change-Id: Ie80aa5347fc81e477a41828e535a707318b83480
---
 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 fa4839cbd1..cc6f57a8f6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47768,7 +47768,7 @@ (define-public rust-num-format-windows-0.4
 (define-public rust-num-integer-0.1
   (package
     (name "rust-num-integer")
-    (version "0.1.45")
+    (version "0.1.46")
     (source
      (origin
        (method url-fetch)
@@ -47776,7 +47776,7 @@ (define-public rust-num-integer-0.1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1ncwavvwdmsqzxnn65phv6c6nn72pnv9xhpmjd6a429mzf4k6p92"))))
+         "13w5g54a9184cqlbsq80rnxw4jj4s0d8wv75jsq5r2lms8gncsbr"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#71110] [PATCH rust-team 35/37] gnu: rust-num-iter-0.1: Update to 0.1.45.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-num-iter-0.1): Update to 0.1.45.

Change-Id: Ide464a7048ca0c88871fee84d34cde40475ad724
---
 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 cc6f57a8f6..e84c18c9dc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47792,7 +47792,7 @@ (define-public rust-num-integer-0.1
 (define-public rust-num-iter-0.1
   (package
     (name "rust-num-iter")
-    (version "0.1.43")
+    (version "0.1.45")
     (source
      (origin
        (method url-fetch)
@@ -47800,7 +47800,7 @@ (define-public rust-num-iter-0.1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0lp22isvzmmnidbq9n5kbdh8gj0zm3yhxv1ddsn5rp65530fc0vx"))))
+         "1gzm7vc5g9qsjjl3bqk9rz1h6raxhygbrcpbfl04swlh0i506a8l"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#71110] [PATCH rust-team 36/37] gnu: rust-num-0.4: Update to 0.4.2.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/crates-io.scm (rust-num-0.4): Update to 0.4.2.

Change-Id: I44d152b1f736930e3b7023928e4f4cd73c5ddf90
---
 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 e84c18c9dc..20c2ea25f6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47084,14 +47084,14 @@ (define-public rust-ntex-bytes-0.1
 (define-public rust-num-0.4
   (package
     (name "rust-num")
-    (version "0.4.1")
+    (version "0.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "num" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1bz7kvj94pyw4zi1pm7knziljzii218sw79ap8qfb81xkvb80ldh"))))
+        (base32 "0hbaawqgb3gsmx2i94ygbhc7nyqi6a30zbpja453n43xya5b0d9i"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#71110] [PATCH rust-team 37/37] gnu: rust-xremap: Update to 0.10.0.

[Nicolas Goaziou via Guix-patches via]

* gnu/packages/rust-apps.scm (rust-xremap): Update to 0.10.0.
[arguments]<#:cargo-inputs>: Remove RUST-HYPRLAND and RUST-SWAYIPC.
(xremap-hyprland, xremap-sway): Deprecate for XREMAP-WLROOTS.

`sway' and `hypr' clients have been dropped upstream.

Change-Id: Ib413ac773a18c81dfe292f0c30916047a835574b
---
 gnu/packages/rust-apps.scm | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 8da7b827e7..04f88e769d 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
-;;; Copyright © 2020-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.ccom>
@@ -3169,7 +3169,7 @@ (define-public git-delta
 (define-public rust-xremap
   (package
     (name "rust-xremap")
-    (version "0.8.14")
+    (version "0.10.0")
     (source
      (origin
        (method url-fetch)
@@ -3177,7 +3177,7 @@ (define-public rust-xremap
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1691clzqbwcywz66k0lf5wjz3q5cpbks0l090bfv42idzr5a0ghl"))))
+         "13pvlc40zha7c9ma30s32x65c8qciqcnsznw43crx3wymlaqc9sn"))))
     (build-system cargo-build-system)
     (arguments
      `(#:features '()
@@ -3190,7 +3190,6 @@ (define-public rust-xremap
         ("rust-env-logger" ,rust-env-logger-0.10)
         ("rust-evdev" ,rust-evdev-0.12)
         ("rust-fork" ,rust-fork-0.1)
-        ("rust-hyprland" ,rust-hyprland-0.3)
         ("rust-indoc" ,rust-indoc-2)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-log" ,rust-log-0.4)
@@ -3200,7 +3199,6 @@ (define-public rust-xremap
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-serde-with" ,rust-serde-with-3)
         ("rust-serde-yaml" ,rust-serde-yaml-0.9)
-        ("rust-swayipc" ,rust-swayipc-3)
         ("rust-toml" ,rust-toml-0.8)
         ("rust-wayland-client" ,rust-wayland-client-0.30)
         ("rust-wayland-protocols-wlr" ,rust-wayland-protocols-wlr-0.1)
@@ -3215,19 +3213,19 @@ (define-public rust-xremap
                     (xremap (string-append out "/bin/xremap")))
                (mkdir-p (string-append share "/bash-completion/completions"))
                (with-output-to-file
-                 (string-append share "/bash-completion/completions/xremap")
+                   (string-append share "/bash-completion/completions/xremap")
                  (lambda _ (invoke xremap "--completions" "bash")))
                (mkdir-p (string-append share "/fish/vendor_completions.d"))
                (with-output-to-file
-                 (string-append share "/fish/vendor_completions.d/xremap.fish")
+                   (string-append share "/fish/vendor_completions.d/xremap.fish")
                  (lambda _ (invoke xremap "--completions" "fish")))
                (mkdir-p (string-append share "/zsh/site-functions"))
                (with-output-to-file
-                 (string-append share "/zsh/site-functions/_xremap")
+                   (string-append share "/zsh/site-functions/_xremap")
                  (lambda _ (invoke xremap "--completions" "zsh")))
                (mkdir-p (string-append share "/elvish/lib"))
                (with-output-to-file
-                 (string-append share "/elvish/lib/xremap")
+                   (string-append share "/elvish/lib/xremap")
                  (lambda _ (invoke xremap "--completions" "elvish")))))))))
     (home-page "https://github.com/k0kubun/xremap")
     (synopsis "Dynamic key remapp for X and Wayland")
@@ -3242,22 +3240,6 @@ (define-public xremap-gnome
      (substitute-keyword-arguments (package-arguments rust-xremap)
        ((#:features _) '(list "gnome"))))))
 
-(define-public xremap-hyprland
-  (package
-    (inherit rust-xremap)
-    (name "xremap-hyprland")
-    (arguments
-     (substitute-keyword-arguments (package-arguments rust-xremap)
-       ((#:features _) '(list "hypr"))))))
-
-(define-public xremap-sway
-  (package
-    (inherit rust-xremap)
-    (name "xremap-sway")
-    (arguments
-     (substitute-keyword-arguments (package-arguments rust-xremap)
-       ((#:features _) '(list "sway"))))))
-
 (define-public xremap-wlroots
   (package
     (inherit rust-xremap)
@@ -3266,6 +3248,12 @@ (define-public xremap-wlroots
      (substitute-keyword-arguments (package-arguments rust-xremap)
        ((#:features _) '(list "wlroots"))))))
 
+(define-public xremap-hyprland
+  (deprecated-package "xremap-hyprland" xremap-wlroots))
+
+(define-public xremap-sway
+  (deprecated-package "xremap-sway" xremap-wlroots))
+
 (define-public xremap-x11
   (package
     (inherit rust-xremap)
-- 
2.41.0

bug#71110: [PATCH rust-team 00/37] Update rust-xremap to 0.10.0

[Nicolas Goaziou via Guix-patches via]

Nicolas Goaziou via Guix-patches via <guix-patches@gnu.org> writes:

> The following patch set updates rust-xremap to 0.10.0.

Patch set applied onto "rust-team" branch.