[bug#68819] [PATCH 00/49 rust-team] Update i3status-rust to 0.32.3.

[bug#68819] [PATCH 00/49 rust-team] Update i3status-rust to 0.32.3.

[Herman Rimm via Guix-patches via]

Hi rust-team,

When I started using Guix, my i3status-rust config was for a newer
version, now I got around to updating the package. I understand why
noone had updated it, as it was quite tedious. Anyway, I added the
dependencies required for the new version. Some notes:

I shortened synopses and punctuated descriptions, but mostly left the
#:cargo-inputs indentation as guix import had generated it. I want guix
import crate to generate appropriate indentation.

rust-arrow2 and rust-tera are patched and build with rust-chrono-tz-0.8
so that it can replace rust-chrono-tz-0.6 in a single commit.

rust-zbus-3 and rust-zbus-macros-3 dependency are updated in a single
commit, instead of relaxing rust-zbus-3 dependency versioning.

Enabled tests on rust-notmuch.

Although ordered-stream-0.2 is not adjacent to ordered-stream-0.1, the
latter is removed in a later commit.

Lastly, i3status-rust is updated and any dependencies that become unused
are removed recursively.

Assorted questions:

1. Should rust-from-variants-impl-0.6 be public?

2. I updated wayrs-client to 1.0, because adding a #[macro_use] made
the wayrs-scanner-0.12 generate! macro available, so wayrs-client 0.12
would build in isolation, but not as a dependency of i3status-rust.
Adding #[macro_export] to the macro in wayrs-scanner-0.12 did not have
any effect. Does this issue seem familiar?

3. rust-async-io-2 and rust-async-net-2 form a cyclical dependency,
should they be added as separate packages anyway?

4. When to #:skip-build?

5. Why is a rust package name defined when inheriting the same name?

Cheers,
Herman

Herman Rimm (49):
  gnu: Add rust-async-once-cell-0.5.
  gnu: Add rust-backon-0.4.
  gnu: Add rust-calibright-0.1.
  gnu: Add rust-neli-proc-macros-0.1.
  gnu: Add rust-neli-0.6.
  gnu: Add rust-neli-wifi-0.6.
  gnu: Add rust-chrono-tz-build-0.2.
  gnu: Replace rust-chrono-tz-0.6 with rust-chrono-tz-0.8.
  gnu: Add rust-from-variants-impl-0.6.
  gnu: Add rust-from-variants-0.6.
  gnu: Add rust-notmuch-0.8.
  gnu: rust-gethostname-0.2: Update to 0.2.3.
  gnu: Add rust-maildir-0.6.
  gnu: Add rust-libsensors-sys-0.2.
  gnu: Add rust-sensors-0.2.
  gnu: Add rust-signal-hook-tokio-0.3.
  gnu: rust-swayipc-types-1: Update to 1.3.1.
  gnu: Add rust-async-pidfd-0.1.
  gnu: rust-parking-2: Update to 2.2.0.
  gnu: Add rust-futures-lite-2.
  gnu: Add rust-swayipc-async-2.
  gnu: Add rust-proc-macro-crate-3.
  gnu: Add rust-wayrs-proto-parser-2
  gnu: Add rust-wayrs-scanner-0.13.
  gnu: Add rust-wayrs-client-1.
  gnu: Add rust-wayrs-protocols-0.13.
  gnu: Add rust-event-listener-4.
  gnu: Add rust-event-listener-strategy-0.4.
  gnu: Add rust-async-channel-2.
  gnu: Add rust-async-lock-3.
  gnu: Add rust-async-io-2 and rust-async-net-2 cyclical dependency.
  gnu: Add rust-ordered-stream-0.2.
  gnu: Add rust-xdg-home-1.
  gnu: Add rust-async-signal-0.2.
  gnu: Add rust-event-listener-3.
  gnu: rust-async-process-1: Update to 1.8.1.
  gnu: rust-async-fs-1: Update to 1.6.0.
  gnu: rust-zbus-3: Update to 3.14.1.
  gnu: Add rust-pandoc-0.8.
  gnu: i3status-rust: Update to 0.32.3.
  gnu: Deprecate rust-nl80211-0.0.2.
  gnu: Remove rust-neli-0.4.
  gnu: Remove rust-notmuch-0.6.
  gnu: Remove rust-cpuprofiler-0.0.
  gnu: Remove rust-progress-0.2.
  gnu: Remove rust-buffering-0.3.
  gnu: Remove rust-supercow-0.1.
  gnu: Remove rust-buffering-nocopy-macro-0.1.
  gnu: Remove rust-ordered-stream-0.1.

 gnu/local.mk                                  |    1 -
 gnu/packages/crates-graphics.scm              |   88 ++
 gnu/packages/crates-io.scm                    | 1133 ++++++++++++-----
 ...status-rust-enable-unstable-features.patch |   20 -
 gnu/packages/rust-apps.scm                    |  100 +-
 5 files changed, 959 insertions(+), 383 deletions(-)
 delete mode 100644 gnu/packages/patches/i3status-rust-enable-unstable-features.patch


base-commit: 36315bde09efa660d38198f666b4e1582cb71db3
-- 
2.41.0

[bug#68819] [PATCH 01/49] gnu: Add rust-async-once-cell-0.5.

[Herman Rimm via Guix-patches via]

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

Change-Id: I9985c6dcb134628caa7924ff68247c5b4c06bb07
---
 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 2cfaff10e3..9bf6a1f3f4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3857,6 +3857,26 @@ (define-public rust-async-net-1
      "Async networking primitives for TCP/UDP/Unix communication")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-async-once-cell-0.5
+  (package
+    (name "rust-async-once-cell")
+    (version "0.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async-once-cell" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ss2ll9r92jiv4g0fdnwqggs3dn48sakij3fg0ba95dag077jf4k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-critical-section" ,rust-critical-section-1))))
+    (home-page "https://github.com/danieldg/async-once-cell")
+    (synopsis "Async single assignment cells and lazy values")
+    (description "This package provides async single assignment cells
+and lazy values.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-async-oneshot-0.5
   (package
     (name "rust-async-oneshot")
-- 
2.41.0

[bug#68819] [PATCH 02/49] gnu: Add rust-backon-0.4.

[Herman Rimm via Guix-patches via]

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

Change-Id: If08111dac5f818d43dd3fee7812819e7eae7531d
---
 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 9bf6a1f3f4..e6fa47b844 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4826,6 +4826,32 @@ (define-public rust-az-1
     (description "This crate provides casts and checked casts.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-backon-0.4
+  (package
+    (name "rust-backon")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "backon" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yfwd1idd5hf6aq2p0rbx4cv0n450canazr6b8cb42qjnabn26hc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-fastrand" ,rust-fastrand-1)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-pin-project" ,rust-pin-project-1)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)
+                                   ("rust-reqwest" ,rust-reqwest-0.11)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "")
+    (synopsis "Retry with backoff without effort")
+    (description "This package provides a retry with backoff without
+effort.")
+    (license license:asl2.0)))
+
 (define-public rust-backtrace-0.3
   (package
     (name "rust-backtrace")
-- 
2.41.0

[bug#68819] [PATCH 03/49] gnu: Add rust-calibright-0.1.

[Herman Rimm via Guix-patches via]

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

Change-Id: I99bd0086eaf7a98ba44c9f0760906121768e2cdf
---
 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 e6fa47b844..6c85670ef1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8479,6 +8479,37 @@ (define-public rust-calamine-0.18
 spreadsheet file.")
     (license license:expat)))
 
+(define-public rust-calibright-0.1
+  (package
+    (name "rust-calibright")
+    (version "0.1.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "calibright" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0a76k1mpi03kpp6p21ajdr5z8am2v96x4vg5yr7bkk27z43mpziz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-dirs" ,rust-dirs-5)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-notify" ,rust-notify-5)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-smart-default" ,rust-smart-default-0.7)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-toml" ,rust-toml-0.7)
+                       ("rust-zbus" ,rust-zbus-3))))
+    (home-page "https://github.com/bim9262/calibright")
+    (synopsis "Brightness utility with calibration between monitors")
+    (description
+     "This package provides a brightness utility that allows you to calibrate
+brightness between monitors.")
+    (license license:gpl3)))
+
 (define-public rust-calloop-0.12
   (package
     (name "rust-calloop")
-- 
2.41.0

[bug#68819] [PATCH 04/49] gnu: Add rust-neli-proc-macros-0.1.

[Herman Rimm via Guix-patches via]

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

Change-Id: Ibe047f5aad245bf1bf50b35f5bb7f1e4a8c19f18
---
 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 6c85670ef1..3f841c58c6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38704,6 +38704,29 @@ (define-public rust-neli-0.4
         ("rust-mio" ,rust-mio-0.6)
         ("rust-tokio" ,rust-tokio-0.1))))))
 
+(define-public rust-neli-proc-macros-0.1
+  (package
+    (name "rust-neli-proc-macros")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "neli-proc-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1m06j6vgy5zzr6dvnbpacpai6mgwwzd20h17hr3i67iv6x6ijs61"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-either" ,rust-either-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/jbaublitz/neli")
+    (synopsis "Procedural macros for neli")
+    (description "This crate provides procedural macros for neli.")
+    (license license:bsd-3)))
+
 (define-public rust-neso-0.5
   (package
     (name "rust-neso")
-- 
2.41.0

[bug#68819] [PATCH 05/49] gnu: Add rust-neli-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-neli-0.6): Add variable.
(rust-neli-0.5): Inherit from rust-neli-0.6.
---
 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 3f841c58c6..c5e71b78c2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38657,32 +38657,55 @@ (define-public rust-needletail-0.4
 processing library for Rust.")
     (license license:expat)))
 
-(define-public rust-neli-0.5
+(define-public rust-neli-0.6
   (package
     (name "rust-neli")
-    (version "0.5.3")
+    (version "0.6.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "neli" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "020m4axf6dd05i9l3lyhspp71s5xcmlj1cfskh6y3dywnm75alwh"))))
+        (base32 "0hzg86zg8rj14yklwm2r2yzg6w2wbnba8qfdpsrm0hb00sg2400i"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)
-                       ("rust-futures" ,rust-futures-0.3)
-                       ("rust-lazy-static" ,rust-lazy-static-1)
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-log" ,rust-log-0.4)
-                       ("rust-simple-logger" ,rust-simple-logger-1)
-                       ("rust-tokio" ,rust-tokio-1))))
+                       ("rust-neli-proc-macros" ,rust-neli-proc-macros-0.1)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.9)
+                                   ("rust-lazy-static" ,rust-lazy-static-1)
+                                   ("rust-tokio" ,rust-tokio-1))))
     (home-page "https://github.com/jbaublitz/neli")
     (synopsis "Type safe netlink library written in Rust")
     (description
      "This crate is a type safe netlink library written in Rust.")
     (license license:bsd-3)))
 
+(define-public rust-neli-0.5
+  (package
+    (inherit rust-neli-0.6)
+    (name "rust-neli")
+    (version "0.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "neli" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "020m4axf6dd05i9l3lyhspp71s5xcmlj1cfskh6y3dywnm75alwh"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-simple-logger" ,rust-simple-logger-1)
+                       ("rust-tokio" ,rust-tokio-1))))))
+
 (define-public rust-neli-0.4
   (package
     (inherit rust-neli-0.5)
-- 
2.41.0

[bug#68819] [PATCH 06/49] gnu: Add rust-neli-wifi-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-neli-wifi-0.6): 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 c5e71b78c2..7e883f8c28 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38750,6 +38750,27 @@ (define-public rust-neli-proc-macros-0.1
     (description "This crate provides procedural macros for neli.")
     (license license:bsd-3)))
 
+(define-public rust-neli-wifi-0.6
+  (package
+    (name "rust-neli-wifi")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "neli-wifi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0w5wkg8vzdzmsy8g1g5f65fxdnxxb9nbvfi47m9fjqnsrwr2584y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-neli" ,rust-neli-0.6)
+                       ("rust-neli-proc-macros" ,rust-neli-proc-macros-0.1))
+       #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/MaxVerevkin/neli-wifi")
+    (synopsis "Communicate with nl80211")
+    (description "This package provides communication with nl80211.")
+    (license license:expat)))
+
 (define-public rust-neso-0.5
   (package
     (name "rust-neso")
-- 
2.41.0

[bug#68819] [PATCH 07/49] gnu: Add rust-chrono-tz-build-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-chrono-tz-build-0.2): Add variable.
(rust-chrono-tz-build-0.0.3): Delete variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7e883f8c28..8dc83e46a1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10105,25 +10105,24 @@ (define-public rust-chrono-tz-0.5
         ("rust-parse-zoneinfo" ,rust-parse-zoneinfo-0.3)
         ("rust-serde" ,rust-serde-1))))))
 
-(define-public rust-chrono-tz-build-0.0.3
+(define-public rust-chrono-tz-build-0.2
   (package
     (name "rust-chrono-tz-build")
-    (version "0.0.3")
+    (version "0.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "chrono-tz-build" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "031s51dd2vbxdhz7fxk1jpbbvr800w57an14bsq3fd5khwx9ql3g"))))
+        (base32 "03rmzd69cn7fp0fgkjr5042b3g54s2l941afjm3001ls7kqkjgj3"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-parse-zoneinfo" ,rust-parse-zoneinfo-0.3)
-        ("rust-phf" ,rust-phf-0.11)
-        ("rust-phf-codegen" ,rust-phf-codegen-0.11)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-uncased" ,rust-uncased-0.9))))
+     `(#:cargo-inputs (("rust-parse-zoneinfo" ,rust-parse-zoneinfo-0.3)
+                       ("rust-phf" ,rust-phf-0.11)
+                       ("rust-phf-codegen" ,rust-phf-codegen-0.11)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-uncased" ,rust-uncased-0.9))))
     (home-page "https://github.com/chronotope/chrono-tz")
     (synopsis "Internal build script for chrono-tz Rust package")
     (description
-- 
2.41.0

[bug#68819] [PATCH 08/49] gnu: Replace rust-chrono-tz-0.6 with rust-chrono-tz-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-chrono-tz-0.8): Add variable.
(rust-chrono-tz-0.6): Delete variable.
(rust-chrono-tz-0.5): Inherit from rust-chrono-tz-0.8.
(rust-tera-1): Use rust-chrono-tz-0.8 and substitute version.
(rust-arrow2-0.7): Use rust-chrono-tz-0.8 and substitute version.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8dc83e46a1..70af71362f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2584,7 +2584,7 @@ (define-public rust-arrow2-0.7
         ("rust-avro-rs" ,rust-avro-rs-0.13)
         ("rust-base64" ,rust-base64-0.13)
         ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-chrono-tz" ,rust-chrono-tz-0.6)
+        ("rust-chrono-tz" ,rust-chrono-tz-0.8)
         ("rust-comfy-table" ,rust-comfy-table-4)
         ("rust-csv" ,rust-csv-1)
         ("rust-futures" ,rust-futures-0.3)
@@ -2608,7 +2608,14 @@ (define-public rust-arrow2-0.7
         ("rust-simdutf8" ,rust-simdutf8-0.1)
         ("rust-streaming-iterator" ,rust-streaming-iterator-0.1)
         ("rust-strength-reduce" ,rust-strength-reduce-0.2)
-        ("rust-zstd" ,rust-zstd-0.9))))
+        ("rust-zstd" ,rust-zstd-0.9))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-chrono-tz-version
+           (lambda* _
+             (substitute* "Cargo.toml"
+               (("chrono-tz = \\{ version = \"0.6\"")
+                "chrono-tz = { version = \"0.8\"")))))))
     (home-page "https://github.com/jorgecarleitao/arrow2")
     (synopsis "Unofficial implementation of Apache Arrow spec in safe Rust")
     (description
@@ -10054,33 +10061,29 @@ (define-public rust-chrono-humanize-0.2
 Python @code{arrow.humanize}.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-chrono-tz-0.6
+(define-public rust-chrono-tz-0.8
   (package
     (name "rust-chrono-tz")
-    (version "0.6.3")
+    (version "0.8.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "chrono-tz" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1pmv434fhw9pwiqc12pvgaiskrq4v1dh1f238gfsg48r301r5hr9"))))
+        (base32 "1dv0yqhr60wrhm4sdlralqw1jf5plcxc91q6v93hvamzk6gbgmwi"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-test-flags
-       (list "--release" "--"
-             "--skip=tests::second_offsets")
-       #:cargo-inputs
-       (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-chrono-tz-build" ,rust-chrono-tz-build-0.0.3)
-        ("rust-phf" ,rust-phf-0.11)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-uncased" ,rust-uncased-0.9))
-       #:cargo-development-inputs
-       (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-serde-test" ,rust-serde-test-1))))
+     `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-chrono-tz-build" ,rust-chrono-tz-build-0.2)
+                       ("rust-phf" ,rust-phf-0.11)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-uncased" ,rust-uncased-0.9))
+       #:cargo-development-inputs (("rust-chrono" ,rust-chrono-0.4)
+                                   ("rust-serde-test" ,rust-serde-test-1))))
     (home-page "https://github.com/chronotope/chrono-tz")
-    (synopsis "TimeZone implementations for rust-chrono from the IANA database")
+    (synopsis "TimeZone implementations for chrono from the IANA database")
     (description
      "Chrono-TZ is a library that provides implementors of the TimeZone trait
 for @code{rust-chrono}.")
@@ -10088,7 +10091,7 @@ (define-public rust-chrono-tz-0.6
 
 (define-public rust-chrono-tz-0.5
   (package
-    (inherit rust-chrono-tz-0.6)
+    (inherit rust-chrono-tz-0.8)
     (name "rust-chrono-tz")
     (version "0.5.3")
     (source
@@ -66539,7 +66542,7 @@ (define-public rust-tera-1
              "--skip=tera::tests::can_load_from_glob")
        #:cargo-inputs
        (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-chrono-tz" ,rust-chrono-tz-0.6)
+        ("rust-chrono-tz" ,rust-chrono-tz-0.8)
         ("rust-globwalk" ,rust-globwalk-0.8)
         ("rust-humansize" ,rust-humansize-2)
         ("rust-lazy-static" ,rust-lazy-static-1)
@@ -66555,7 +66558,13 @@ (define-public rust-tera-1
        #:cargo-development-inputs
        (("rust-pretty-assertions" ,rust-pretty-assertions-1)
         ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-tempfile" ,rust-tempfile-3))))
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-chrono-tz-version
+           (lambda* _
+             (substitute* "Cargo.toml"
+               (("0.6.1") "0.8")))))))
     (home-page "https://tera.netlify.com/")
     (synopsis "Template engine based on Jinja2/Django templates")
     (description
-- 
2.41.0

[bug#68819] [PATCH 09/49] gnu: Add rust-from-variants-impl-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-from-variants-impl-0.6): Add
variable.

Change-Id: I613787f3cc2c4633367727a7bacb1f11ce0df118
---
 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 70af71362f..bc66f5aec2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23659,6 +23659,31 @@ (define-public rust-freetype-sys-0.13
     (native-inputs
      (list pkg-config))))
 
+(define-public rust-from-variants-impl-0.6
+  (package
+    (name "rust-from-variants-impl")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "from_variants_impl" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06i4bjjxbq6c4hlx2ly04s64d1972zkskshc2v4xx7n8lfghf23y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-darling" ,rust-darling-0.10)
+                       ("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-0.6))))
+    (home-page "https://github.com/TedDriggs/from_variants")
+    (synopsis "Internal helper crate for from_variants crate")
+    (description "This package is an internal helper crate for
+from_variants crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-fs2-0.4
   (package
     (name "rust-fs2")
-- 
2.41.0

[bug#68819] [PATCH 10/49] gnu: Add rust-from-variants-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-from-variants-0.6): Add variable.

Change-Id: Iacf4ebe86fd8d4d95f41e7a8b43573f61daebbe5
---
 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 bc66f5aec2..2a0df8be22 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23659,6 +23659,28 @@ (define-public rust-freetype-sys-0.13
     (native-inputs
      (list pkg-config))))
 
+(define-public rust-from-variants-0.6
+  (package
+    (name "rust-from-variants")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "from_variants" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qx4jmwljwmcdfc998ndf7iz8wyg7lmlc3vl3fy812f9lfqiw6i2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-from-variants-impl" ,rust-from-variants-impl-0.6))))
+    (home-page "https://github.com/TedDriggs/from_variants")
+    (synopsis "Macro to generate conversions for newtype enums")
+    (description
+     "This package provides a Rust macro to automatically generate
+conversions for newtype enums.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-from-variants-impl-0.6
   (package
     (name "rust-from-variants-impl")
-- 
2.41.0

[bug#68819] [PATCH 11/49] gnu: Add rust-notmuch-0.8.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-notmuch-0.8): Add variable.
(rust-notmuch-0.6): Inherit from rust-notmuch-0.8.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2a0df8be22..6880d7096b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40212,23 +40212,22 @@ (define-public rust-notify-4
        (("rust-tempfile" ,rust-tempfile-3))))
     (license license:cc0)))
 
-(define-public rust-notmuch-0.6
+(define-public rust-notmuch-0.8
   (package
     (name "rust-notmuch")
-    (version "0.6.0")
+    (version "0.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "notmuch" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "19q93iyvx4liksm09mhq9ibm8zj7i3dizc1s40f916z0kbpn9k5w"))))
+        (base32 "0i6xc7lv10m2sq6vlpjr5wxmlxihvd0v4f5if75r2kwz8ji12pg2"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f         ;see https://github.com/vhdirk/notmuch-rs/issues/35
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-supercow" ,rust-supercow-0.1))
+     `(#:cargo-inputs
+       (("rust-from-variants" ,rust-from-variants-0.6)
+        ("rust-libc" ,rust-libc-0.2))
        #:cargo-development-inputs
        (("rust-dirs" ,rust-dirs-1)
         ("rust-gethostname" ,rust-gethostname-0.2)
@@ -40252,6 +40251,38 @@ (define-public rust-notmuch-0.6
      "This crate provides a Rust interface and bindings for Notmuch.")
     (license license:gpl3+)))
 
+(define-public rust-notmuch-0.6
+  (package
+    (inherit rust-notmuch-0.8)
+    (name "rust-notmuch")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "notmuch" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19q93iyvx4liksm09mhq9ibm8zj7i3dizc1s40f916z0kbpn9k5w"))))
+    (arguments
+     `(#:tests? #f         ;see https://github.com/vhdirk/notmuch-rs/issues/35
+       #:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-supercow" ,rust-supercow-0.1))
+       #:cargo-development-inputs
+       (("rust-dirs" ,rust-dirs-1)
+        ("rust-gethostname" ,rust-gethostname-0.2)
+        ("rust-lettre" ,rust-lettre-0.9)
+        ("rust-lettre-email" ,rust-lettre-email-0.9)
+        ("rust-maildir" ,rust-maildir-0.5)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-maildir-version
+           (lambda* _
+             (substitute* "Cargo.toml"
+               (("version = \"0.3.2\"") "version = \"0.5.0\"")))))))))
+
+
 (define-public rust-ntapi-0.4
   (package
     (name "rust-ntapi")
-- 
2.41.0

[bug#68819] [PATCH 12/49] gnu: rust-gethostname-0.2: Update to 0.2.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-gethostname-0.2): Update to 0.2.3.

Change-Id: Id999846e0d1a231564b4e49e16038e164863b511
---
 gnu/packages/crates-io.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6880d7096b..806073c92d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25267,21 +25267,19 @@ (define-public rust-gethostname-0.2
   (package
     (inherit rust-gethostname-0.3)
     (name "rust-gethostname")
-    (version "0.2.1")
+    (version "0.2.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gethostname" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0a609j9dhk816il2f2a01avvi5sqzxh0p38nxwrja7dcpybf54p6"))))
+        (base32 "0bl6wf7zclzmjriipzh98rr84xv2ilj664z8ffxh0vn46m7d7sy1"))))
     (arguments
-     `(#:tests? #f                      ; test panics
-       #: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))
        #:cargo-development-inputs
-       (("rust-pretty-assertions" ,rust-pretty-assertions-0.6))))))
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
 
 (define-public rust-getopts-0.2
   (package
-- 
2.41.0

[bug#68819] [PATCH 13/49] gnu: Add rust-maildir-0.6.

[Herman Rimm via Guix-patches via]

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

Change-Id: Iaeb447ffbec76d92ef146562b329f92bbf8fb6f7
---
 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 806073c92d..56c8a995cc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -35106,8 +35106,35 @@ (define-public rust-magic-string-0.3
      "This package provides a MagicString port driven by Rust and N-API.")
     (license license:expat)))
 
+(define-public rust-maildir-0.6
+  (package
+    (name "rust-maildir")
+    (version "0.6.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "maildir" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dqlkvhcrigs4y5vg0jf8ccgwns8jj85cjp6vsgj3f1sfkk6m6l7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gethostname" ,rust-gethostname-0.2)
+                       ("rust-mailparse" ,rust-mailparse-0.14)
+                       ("rust-memmap2" ,rust-memmap2-0.5))
+       #:cargo-development-inputs
+       (("rust-percent-encoding" ,rust-percent-encoding-1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-walkdir" ,rust-walkdir-2))))
+    (home-page "https://github.com/staktrace/maildir/blob/master/README.md")
+    (synopsis "Simple library for maildir manipulation")
+    (description
+     "This package provides a simple library for maildir manipulation")
+    (license license:bsd-0)))
+
 (define-public rust-maildir-0.5
   (package
+    (inherit rust-maildir-0.6)
     (name "rust-maildir")
     (version "0.5.0")
     (source
@@ -35117,7 +35144,6 @@ (define-public rust-maildir-0.5
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0pivq6njjmfnf0jn6i8sihbfgly6v674zwncd6f5nwiw79lz9p3a"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-gethostname" ,rust-gethostname-0.2)
@@ -35126,12 +35152,7 @@ (define-public rust-maildir-0.5
        #:cargo-development-inputs
        (("rust-percent-encoding" ,rust-percent-encoding-1)
         ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-walkdir" ,rust-walkdir-2))))
-    (home-page "https://github.com/staktrace/maildir")
-    (synopsis "Simple library for maildir manipulation")
-    (description
-     "This package provides a simple library for maildir manipulation.")
-    (license license:bsd-0)))
+        ("rust-walkdir" ,rust-walkdir-2))))))
 
 (define-public rust-mailparse-0.14
   (package
-- 
2.41.0

[bug#68819] [PATCH 14/49] gnu: Add rust-libsensors-sys-0.2.

[Herman Rimm via Guix-patches via]

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

Change-Id: I0573781443c0e5e3d91ff47d54c437d74d28f15e
---
 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 56c8a995cc..4ee079892c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33293,6 +33293,23 @@ (define-public rust-librespot-protocol-0.4
 This package contains the protobuf logic.")
     (license license:expat)))
 
+(define-public rust-libsensors-sys-0.2
+  (package
+    (name "rust-libsensors-sys")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libsensors-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cii4jbj19d95q6nyczfi3d3s2j3jg4qf7qc8qfxx5jb2v3hqwx1"))))
+    (build-system cargo-build-system)
+    (home-page "https://docs.rs/libsensors-sys/0.2.0/libsensors_sys/")
+    (synopsis "Rust bindings to libsensors")
+    (description "This package provides Rust bindings to libsensors.")
+    (license license:miros)))
+
 (define-public rust-libsqlite3-sys-0.27
   (package
     (name "rust-libsqlite3-sys")
-- 
2.41.0

[bug#68819] [PATCH 15/49] gnu: Add rust-sensors-0.2.

[Herman Rimm via Guix-patches via]

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

Change-Id: Ifbe65abf8a5aed9190d40136382e815dd33d786d
---
 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 4ee079892c..26cf93c8a8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59387,6 +59387,27 @@ (define-public rust-servo-fontconfig-sys-5
      "This package provides a Rust wrapper around Fontxonfig.")
     (license license:expat)))
 
+(define-public rust-sensors-0.2
+  (package
+    (name "rust-sensors")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sensors" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1l6nvmbbbbl9mdkd9806mmls68d6hvqb2nl0nm14chva5xwz8fks"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-libsensors-sys" ,rust-libsensors-sys-0.2))))
+    (home-page "https://github.com/nyantec/sensors")
+    (synopsis "A Rust-friendly interface to lm-sensors")
+    (description
+     "This package provides a Rust-friendly interface to lm-sensors")
+    (license license:miros)))
+
 (define-public rust-shadow-rs-0.8
   (package
     (name "rust-shadow-rs")
-- 
2.41.0

[bug#68819] [PATCH 16/49] gnu: Add rust-signal-hook-tokio-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-signal-hook-tokio-0.3): Add variable.

Change-Id: Ia25aa3669c5edc4c2abb6d75c1cb5d1e789dd3a9
---
 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 26cf93c8a8..6403b1a0b3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59760,6 +59760,31 @@ (define-public rust-signal-hook-registry-1
     (description "This package is a backend crate for @code{signal-hook}.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-signal-hook-tokio-0.3
+  (package
+    (name "rust-signal-hook-tokio")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "signal-hook-tokio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07nggsi80jv39xisdk2r7cik7hx2d2qa2sivvqkpxqxidzvl2ci1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-signal-hook" ,rust-signal-hook-0.3)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-futures" ,rust-futures-0.3)
+                                   ("rust-serial-test" ,rust-serial-test-0.5)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/vorner/signal-hook")
+    (synopsis "Tokio support for signal-hook")
+    (description "This package provides Tokio support for signal-hook.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-simba-0.8
   (package
     (name "rust-simba")
-- 
2.41.0

[bug#68819] [PATCH 17/49] gnu: rust-swayipc-types-1: Update to 1.3.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-swayipc-types-1): Update to 1.3.1.
---
 gnu/packages/crates-io.scm | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6403b1a0b3..1eda29abf5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64428,7 +64428,7 @@ (define-public rust-swayipc-command-builder-0.1
 
 (define-public rust-swayipc-types-1
   (package
-   (name "rust-swayipc-types")
+    (name "rust-swayipc-types")
     (version "1.3.1")
     (source
      (origin
@@ -64437,18 +64437,17 @@ (define-public rust-swayipc-types-1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1fwzdifnaj9ayz6fq96vcxpzr4dqhq1zgbqk3xbgsdlg89b2ddmi"))))
-   (build-system cargo-build-system)
-   (arguments
-    `(#:cargo-inputs
-      (("rust-serde" ,rust-serde-1)
-       ("rust-serde-json" ,rust-serde-json-1)
-       ("rust-thiserror" ,rust-thiserror-1))))
-   (home-page "https://github.com/jaycefayne/swayipc-rs")
-   (synopsis "Library containing Type defintions from sway's IPC interface")
-   (description
-    "This package provides a library containing Type defintions from sway's IPC
-interface.")
-   (license license:expat)))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/jaycefayne/swayipc-rs")
+    (synopsis "Type definitions from sway's IPC interface")
+    (description
+     "This package provides a library containing type defintions from
+sway's IPC interface.")
+    (license license:expat)))
 
 (define-public rust-symlink-0.1
   (package
-- 
2.41.0

[bug#68819] [PATCH 18/49] gnu: Add rust-async-pidfd-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-async-pidfd-0.1): 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 1eda29abf5..d9fa7b4b0c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3910,6 +3910,31 @@ (define-public rust-async-oneshot-0.5
 async-aware oneshot channel.")
     (license license:mpl2.0)))
 
+(define-public rust-async-pidfd-0.1
+  (package
+    (name "rust-async-pidfd")
+    (version "0.1.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async-pidfd" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "168pylpf7n898szw32sva7kf9h3x1mnip54mfr8f7f4v55c705qj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-io" ,rust-async-io-1)
+                       ("rust-libc" ,rust-libc-0.2))
+       #:cargo-development-inputs
+       (("rust-futures-lite" ,rust-futures-lite-1))))
+    (home-page "https://github.com/joshtriplett/async-pidfd")
+    (synopsis "Process file descriptors (pidfd) for Linux")
+    (description
+      "@code{async-pidfd} provides Rust support for pidfd, and supports
+managing processes both synchronously (via the PidFd type) and
+asynchronously (via the AsyncPidFd type).")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-async-process-1
   (package
     (name "rust-async-process")
-- 
2.41.0

[bug#68819] [PATCH 19/49] gnu: rust-parking-2: Update to 2.2.0.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d9fa7b4b0c..e37132e2dc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -43542,22 +43542,22 @@ (define-public rust-parity-wasm-0.41
 (define-public rust-parking-2
   (package
     (name "rust-parking")
-    (version "2.0.0")
+    (version "2.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "parking" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0wnxxnizfxlax3n709s5r83f4n8awy3m4a18q4fdk0z7z693hz22"))))
+        (base32 "1blwbkq6im1hfxp5wlbr475mw98rsyc0bbr2d5n16m38z253p0dv"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-development-inputs
+     `(#:cargo-inputs (("rust-loom" ,rust-loom-0.7))
+       #:cargo-development-inputs
        (("rust-easy-parallel" ,rust-easy-parallel-3))))
-    (home-page "https://github.com/stjepang/parking")
+    (home-page "https://github.com/smol-rs/parking")
     (synopsis "Thread parking and unparking")
-    (description "This package provides methods for thread parking and
-unparking.")
+    (description "Thread parking and unparking")
     (license (list license:asl2.0 license:expat))))
 
 (define-public rust-parking-1
-- 
2.41.0

[bug#68819] [PATCH 20/49] gnu: Add rust-futures-lite-2.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e37132e2dc..3c59fe6837 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24470,8 +24470,38 @@ (define-public rust-futures-join-macro-preview-0.3
 @code{try_join!} macro.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-futures-lite-2
+  (package
+    (name "rust-futures-lite")
+    (version "2.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "futures-lite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1flj85i6xm0rjicxixmajrp6rhq8i4bnbzffmrd6h23ln8jshns4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-fastrand" ,rust-fastrand-2)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-io" ,rust-futures-io-0.3)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-parking" ,rust-parking-2)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2))
+       #:cargo-development-inputs (("rust-spin-on" ,rust-spin-on-0.1)
+                                   ("rust-waker-fn" ,rust-waker-fn-1))))
+    (home-page "https://github.com/smol-rs/futures-lite")
+    (synopsis "Futures, streams, and async I/O combinators")
+    (description
+     "This crate is a subset of @code{futures} that compiles an order of
+magnitude faster, fixes minor warts in its API, fills in some obvious gaps,
+and removes almost all unsafe code from it.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-futures-lite-1
   (package
+    (inherit rust-futures-lite-2)
     (name "rust-futures-lite")
     (version "1.13.0")
     (source
@@ -24481,7 +24511,6 @@ (define-public rust-futures-lite-1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1kkbqhaib68nzmys2dc8j9fl2bwzf2s91jfk13lb2q3nwhfdbaa9"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-fastrand" ,rust-fastrand-1)
@@ -24492,14 +24521,7 @@ (define-public rust-futures-lite-1
         ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
         ("rust-waker-fn" ,rust-waker-fn-1))
        #:cargo-development-inputs
-       (("rust-spin-on" ,rust-spin-on-0.1))))
-    (home-page "https://github.com/stjepang/futures-lite")
-    (synopsis "Futures, streams, and async I/O combinators")
-    (description
-     "This crate is a subset of @code{futures} that compiles an order of
-magnitude faster, fixes minor warts in its API, fills in some obvious gaps,
-and removes almost all unsafe code from it.")
-    (license (list license:asl2.0 license:expat))))
+       (("rust-spin-on" ,rust-spin-on-0.1))))))
 
 (define-public rust-futures-lite-0.1
   (package
-- 
2.41.0

[bug#68819] [PATCH 21/49] gnu: Add rust-swayipc-async-2.

[Herman Rimm via Guix-patches via]

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

Change-Id: I2d9eb7d4ab08e49fc22c1850bb8f4750bfae0359
---
 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 3c59fe6837..792fe103f3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64454,6 +64454,32 @@ (define-public rust-swayipc-2
         ("rust-swayipc-command-builder" ,rust-swayipc-command-builder-0.1)
         ("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-swayipc-async-2
+  (package
+    (name "rust-swayipc-async")
+    (version "2.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "swayipc-async" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yyv7jwsr2z5azjal5hj8hgxb06dqrnxsaxrnjfjnp1pmwvjch48"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-io" ,rust-async-io-2)
+                       ("rust-async-pidfd" ,rust-async-pidfd-0.1)
+                       ("rust-futures-lite" ,rust-futures-lite-2)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-swayipc-types" ,rust-swayipc-types-1))))
+    (home-page "https://github.com/jaycefayne/swayipc-rs")
+    (synopsis "Library to control sway through IPC interface")
+    (description
+     "This package provides a library for controlling sway through its
+IPC interface.")
+    (license license:expat)))
+
 (define-public rust-swayipc-command-builder-0.1
   (package
     (name "rust-swayipc-command-builder")
-- 
2.41.0

[bug#68819] [PATCH 22/49] gnu: Add rust-proc-macro-crate-3.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 792fe103f3..b840aecfd6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47767,8 +47767,35 @@ (define-public rust-priority-queue-1
 priority of an object.")
     (license license:expat)))
 
+(define-public rust-proc-macro-crate-3
+  (package
+    (name "rust-proc-macro-crate")
+    (version "3.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "proc-macro-crate" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+          "110jcl9vnj92ihbhjqmkp19m8rzxc14a7i60knlmv99qlwfcadvd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-toml-edit" ,rust-toml-edit-0.21))
+       #: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/bkchr/proc-macro-crate")
+    (synopsis "Get the name of a (renamed) crate in @file{Cargo.toml}")
+    (description
+     "This crate provides a way to get the name of a crate, even if it
+is renamed in @file{Cargo.toml}.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-proc-macro-crate-2
   (package
+    (inherit rust-proc-macro-crate-3)
     (name "rust-proc-macro-crate")
     (version "2.0.1")
     (source
@@ -47783,7 +47810,6 @@ (define-public rust-proc-macro-crate-2
         '(begin (substitute* "Cargo.toml"
                   (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
                    (string-append "\"^" version)))))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags '("--release" "--"
                             ;; Not all files included.
@@ -47792,13 +47818,7 @@ (define-public rust-proc-macro-crate-2
                        ("rust-toml-edit" ,rust-toml-edit-0.20))
        #: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/bkchr/proc-macro-crate")
-    (synopsis "Support for @code{$crate} in procedural macros")
-    (description
-     "This crate provides a way to get the name of a crate, even if it
-renamed in @file{Cargo.toml}.")
-    (license (list license:asl2.0 license:expat))))
+                                   ("rust-syn" ,rust-syn-2))))))
 
 (define-public rust-proc-macro-crate-1
   (package
-- 
2.41.0

[bug#68819] [PATCH 23/49] gnu: Add rust-wayrs-proto-parser-2

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-wayrs-proto-parser-2): Add
  variable.
---
 gnu/packages/crates-graphics.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 892839467f..f6b1cba997 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -4994,6 +4994,27 @@ (define-public rust-wayland-sys-0.21
         (base32
          "0a0ndgkg98pvmkv44yya4f7mxzjaxylknqh64bpa05w0azyv02jj"))))))
 
+(define-public rust-wayrs-proto-parser-2
+  (package
+    (name "rust-wayrs-proto-parser")
+    (version "2.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wayrs-proto-parser" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1a9gb0iv6rm1z2n4isfb9x05pv6wlgn23hljb9s038m4dgmyn1hl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-quick-xml" ,rust-quick-xml-0.31)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/MaxVerevkin/wayrs")
+    (synopsis "Parser for wayland protocol xml files")
+    (description "This package provides a parser for wayland protocol
+xml files.")
+    (license license:expat)))
+
 (define-public rust-webp-0.2
   (package
     (name "rust-webp")
-- 
2.41.0

[bug#68819] [PATCH 24/49] gnu: Add rust-wayrs-scanner-0.13.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-wayrs-scanner-0.13): Add variable.
---
 gnu/packages/crates-graphics.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index f6b1cba997..010a0c2070 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -5015,6 +5015,30 @@ (define-public rust-wayrs-proto-parser-2
 xml files.")
     (license license:expat)))
 
+(define-public rust-wayrs-scanner-0.13
+  (package
+    (name "rust-wayrs-scanner")
+    (version "0.13.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wayrs-scanner" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07xzg36rnnsb4z4rd82r2mk3y05vg1ssfwrry2kd4yz395sx91z3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro-crate" ,rust-proc-macro-crate-3)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-wayrs-proto-parser" ,rust-wayrs-proto-parser-2))))
+    (home-page "https://github.com/MaxVerevkin/wayrs")
+    (synopsis "Generates code for wayrs-client from xml files")
+    (description "This package provides code generation for wayrs-client
+from xml files.")
+    (license license:expat)))
+
 (define-public rust-webp-0.2
   (package
     (name "rust-webp")
-- 
2.41.0

[bug#68819] [PATCH 25/49] gnu: Add rust-wayrs-client-1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-wayrs-client-1): Add variable.
---
 gnu/packages/crates-graphics.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 010a0c2070..32fb19ada7 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -4994,6 +4994,28 @@ (define-public rust-wayland-sys-0.21
         (base32
          "0a0ndgkg98pvmkv44yya4f7mxzjaxylknqh64bpa05w0azyv02jj"))))))
 
+(define-public rust-wayrs-client-1
+  (package
+    (name "rust-wayrs-client")
+    (version "1.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wayrs-client" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18i19b7z4wp0mjwn256ps3pdfk47lx45h0cx8wkjlv7akkgzxnj7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-nix" ,rust-nix-0.27)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-wayrs-scanner" ,rust-wayrs-scanner-0.13))))
+    (home-page "https://github.com/MaxVerevkin/wayrs")
+    (synopsis "Wayland client library")
+    (description "This package provides a wayland client library.")
+    (license license:expat)))
+
 (define-public rust-wayrs-proto-parser-2
   (package
     (name "rust-wayrs-proto-parser")
-- 
2.41.0

[bug#68819] [PATCH 26/49] gnu: Add rust-wayrs-protocols-0.13.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-wayrs-protocols-0.13): Add
variable.
---
 gnu/packages/crates-graphics.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 32fb19ada7..6cccd47729 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -5037,6 +5037,27 @@ (define-public rust-wayrs-proto-parser-2
 xml files.")
     (license license:expat)))
 
+(define-public rust-wayrs-protocols-0.13
+  (package
+    (name "rust-wayrs-protocols")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wayrs-protocols" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1888h4wh3knjwh19v4y2gjpsv5j78c4vk08gls5f3aa1iryfpd7x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-wayrs-client" ,rust-wayrs-client-1))))
+    (home-page "https://github.com/MaxVerevkin/wayrs")
+    (synopsis "Collection of Wayland protocols to use with wayrs-client")
+    (description
+     "This package provides a collection of Wayland protocols to use
+with wayrs-client")
+    (license license:expat)))
+
 (define-public rust-wayrs-scanner-0.13
   (package
     (name "rust-wayrs-scanner")
-- 
2.41.0

[bug#68819] [PATCH 27/49] gnu: Add rust-event-listener-4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-event-listener-4): Add variable.
(rust-event-listener-2): Inherit from rust-event-listener-4.

Change-Id: I23ebc60b21fb33e992832553dd9817672b4fb920
---
 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 b840aecfd6..2241dd126e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21363,23 +21363,31 @@ (define-public rust-evdev-0.12
     (description "This package provides evdev interface for Linux.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-event-listener-2
+(define-public rust-event-listener-4
   (package
     (name "rust-event-listener")
-    (version "2.5.3")
+    (version "4.0.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "event-listener" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1q4w3pndc518crld6zsqvvpy9lkzwahp2zgza9kbzmmqh9gif1h2"))))
+        (base32 "0vk4smw1vf871vi76af1zn7w69jg3zmpjddpby2qq91bkg21bck7"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-development-inputs
-       (("rust-futures" ,rust-futures-0.3)
-        ("rust-waker-fn" ,rust-waker-fn-1))))
-    (home-page "https://github.com/stjepang/event-listener")
+     `(#:cargo-inputs
+       (("rust-concurrent-queue" ,rust-concurrent-queue-2)
+        ("rust-parking" ,rust-parking-2)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-portable-atomic" ,rust-portable-atomic-1)
+        ("rust-portable-atomic-util" ,rust-portable-atomic-util-0.1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.5)
+        ("rust-futures-lite" ,rust-futures-lite-2)
+        ("rust-waker-fn" ,rust-waker-fn-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/smol-rs/event-listener")
     (synopsis "Notify async tasks or threads")
     (description
      "This is a synchronization primitive similar to @code{eventcounts}.
@@ -21387,6 +21395,23 @@ (define-public rust-event-listener-2
 blocking data structures.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-event-listener-2
+  (package
+    (inherit rust-event-listener-4)
+    (name "rust-event-listener")
+    (version "2.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "event-listener" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1q4w3pndc518crld6zsqvvpy9lkzwahp2zgza9kbzmmqh9gif1h2"))))
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-futures" ,rust-futures-0.3)
+        ("rust-waker-fn" ,rust-waker-fn-1))))))
+
 (define-public rust-executable-path-1
   (package
     (name "rust-executable-path")
-- 
2.41.0

[bug#68819] [PATCH 28/49] gnu: Add rust-event-listener-strategy-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-event-listener-strategy-0.4): Add
variable.

Change-Id: I254717f31ee2d2c2d527c7bb325a6e29508a78bf
---
 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 2241dd126e..bfa8f3b2dc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21412,6 +21412,30 @@ (define-public rust-event-listener-2
        (("rust-futures" ,rust-futures-0.3)
         ("rust-waker-fn" ,rust-waker-fn-1))))))
 
+(define-public rust-event-listener-strategy-0.4
+  (package
+    (name "rust-event-listener-strategy")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "event-listener-strategy" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lwprdjqp2ibbxhgm9khw7s7y7k4xiqj5i5yprqiks6mnrq4v3lm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-event-listener" ,rust-event-listener-4)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2))
+       #:cargo-development-inputs
+       (("rust-futures-lite" ,rust-futures-lite-2)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/smol-rs/event-listener")
+    (synopsis "Block or poll on event_listener")
+    (description "This packages provides block and poll on
+event_listener.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-executable-path-1
   (package
     (name "rust-executable-path")
-- 
2.41.0

[bug#68819] [PATCH 29/49] gnu: Add rust-async-channel-2.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bfa8f3b2dc..b78b040fdf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3420,8 +3420,38 @@ (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-channel-2
+  (package
+    (name "rust-async-channel")
+    (version "2.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async-channel" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1337ywc1paw03rdlwh100kh8pa0zyp0nrlya8bpsn6zdqi5kz8qw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-concurrent-queue" ,rust-concurrent-queue-2)
+        ("rust-event-listener" ,rust-event-listener-4)
+        ("rust-event-listener-strategy" ,rust-event-listener-strategy-0.4)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2))
+       #:cargo-development-inputs
+       (("rust-easy-parallel" ,rust-easy-parallel-3)
+        ("rust-futures-lite" ,rust-futures-lite-2)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/smol-rs/async-channel")
+    (synopsis "Async multi-producer multi-consumer channel")
+    (description "This package provides async multi-producer
+multi-consumer channels.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-async-channel-1
   (package
+    (inherit rust-async-channel-2)
     (name "rust-async-channel")
     (version "1.9.0")
     (source
@@ -3431,7 +3461,6 @@ (define-public rust-async-channel-1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0dbdlkzlncbibd3ij6y6jmvjd0cmdn48ydcfdpfhw09njd93r5c1"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-concurrent-queue" ,rust-concurrent-queue-2)
@@ -3439,12 +3468,7 @@ (define-public rust-async-channel-1
         ("rust-futures-core" ,rust-futures-core-0.3))
        #:cargo-development-inputs
        (("rust-easy-parallel" ,rust-easy-parallel-3)
-        ("rust-futures-lite" ,rust-futures-lite-1))))
-    (home-page "https://github.com/smol-rs/async-channel")
-    (synopsis "Async multi-producer multi-consumer channel")
-    (description
-     "Async multi-producer multi-consumer channel")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-futures-lite" ,rust-futures-lite-1))))))
 
 (define-public rust-async-compression-0.4
   (package
-- 
2.41.0

[bug#68819] [PATCH 30/49] gnu: Add rust-async-lock-3.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b78b040fdf..f808d92c12 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3730,8 +3730,37 @@ (define-public rust-async-io-1
 that expires at a point in time.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-async-lock-3
+  (package
+    (name "rust-async-lock")
+    (version "3.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async-lock" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0yxflkfw46rad4lv86f59b5z555dlfmg1riz1n8830rgi0qb8d6h"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-event-listener" ,rust-event-listener-4)
+        ("rust-event-listener-strategy" ,rust-event-listener-strategy-0.4)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2))
+       #:cargo-development-inputs
+       (("rust-async-channel" ,rust-async-channel-2)
+        ("rust-fastrand" ,rust-fastrand-2)
+        ("rust-futures-lite" ,rust-futures-lite-2)
+        ("rust-waker-fn" ,rust-waker-fn-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/smol-rs/async-lock")
+    (synopsis "Async synchronization primitives")
+    (description "This package provides async synchronization primitives.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-async-lock-2
   (package
+    (inherit rust-async-lock-3)
     (name "rust-async-lock")
     (version "2.7.0")
     (source
@@ -3741,7 +3770,6 @@ (define-public rust-async-lock-2
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1mrd4kai92fcgl9974dpmibiq6ja9drz41v3crvv0c27a8kzf97s"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-event-listener" ,rust-event-listener-2))
@@ -3749,11 +3777,7 @@ (define-public rust-async-lock-2
        (("rust-async-channel" ,rust-async-channel-1)
         ("rust-fastrand" ,rust-fastrand-1)
         ("rust-futures-lite" ,rust-futures-lite-1)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
-    (home-page "https://github.com/stjepang/async-lock")
-    (synopsis "Async synchronization primitives")
-    (description "This package provides Async synchronization primitives.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))))
 
 (define-public rust-async-log-1
   (package
-- 
2.41.0

[bug#68819] [PATCH 31/49] gnu: Add rust-async-io-2 and rust-async-net-2 cyclical dependency.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-async-io-2, rust-async-net-2): Add
  variable.
(rust-async-io-1): Inherit from rust-async-io-2.
(rust-async-net-1): Inherit from rust-async-net-2.
---
 gnu/packages/crates-io.scm | 83 +++++++++++++++++++++++++++++++-------
 1 file changed, 68 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f808d92c12..947bbbf586 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3685,8 +3685,51 @@ (define-public rust-async-global-executor-2
 @code{async-executor} and @code{async-io}.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-async-io-2
+  (package
+    (name "rust-async-io")
+    (version "2.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async-io" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0i57lqp1i7h9c5k7ccspyjxlaq032rgalwq7p9p794aa08cynhgv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-lock" ,rust-async-lock-3)
+                       ("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-concurrent-queue" ,rust-concurrent-queue-2)
+                       ("rust-futures-io" ,rust-futures-io-0.3)
+                       ("rust-futures-lite" ,rust-futures-lite-2)
+                       ("rust-parking" ,rust-parking-2)
+                       ("rust-polling" ,rust-polling-3)
+                       ("rust-rustix" ,rust-rustix-0.38)
+                       ("rust-slab" ,rust-slab-0.4)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-windows-sys" ,rust-windows-sys-0.52))
+       #:cargo-development-inputs (("rust-async-channel" ,rust-async-channel-2)
+                                   ("rust-async-net" ,rust-async-net-2)
+                                   ("rust-blocking" ,rust-blocking-1)
+                                   ("rust-criterion" ,rust-criterion-0.4)
+                                   ("rust-getrandom" ,rust-getrandom-0.2)
+                                   ("rust-inotify" ,rust-inotify-0.10)
+                                   ("rust-signal-hook" ,rust-signal-hook-0.3)
+                                   ("rust-tempfile" ,rust-tempfile-3)
+                                   ("rust-timerfd" ,rust-timerfd-1)
+                                   ("rust-uds-windows" ,rust-uds-windows-1))))
+    (home-page "https://github.com/smol-rs/async-io")
+    (synopsis "Async I/O and timers")
+    (description
+     "This crate provides two tools: Async, an adapter for standard
+networking types (and many other types) to use in async programs, and
+Timer, a future that expires at a point in time.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-async-io-1
   (package
+    (inherit rust-async-io-2)
     (name "rust-async-io")
     (version "1.13.0")
     (source
@@ -3696,7 +3739,6 @@ (define-public rust-async-io-1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1byj7lpw0ahk6k63sbc9859v68f28hpaab41dxsjj1ggjdfv9i8g"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-async-lock" ,rust-async-lock-2)
@@ -3721,14 +3763,7 @@ (define-public rust-async-io-1
         ("rust-signal-hook" ,rust-signal-hook-0.3)
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-timerfd" ,rust-timerfd-1)
-        ("rust-uds-windows" ,rust-uds-windows-1))))
-    (home-page "https://github.com/stjepang/async-io")
-    (synopsis "Async I/O and timers")
-    (description
-     "This crate provides two tools: Async, an adapter for standard networking
-types (and many other types) to use in async programs, and Timer, a future
-that expires at a point in time.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-uds-windows" ,rust-uds-windows-1))))))
 
 (define-public rust-async-lock-3
   (package
@@ -3888,8 +3923,31 @@ (define-public rust-async-mutex-1
 @end itemize")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-async-net-2
+  (package
+    (name "rust-async-net")
+    (version "2.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async-net" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xyc5a5vcp3a7h1q2lbfh79wz8136dig4q4x6g4w2ws8ml7h0j5r"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-io" ,rust-async-io-2)
+                       ("rust-blocking" ,rust-blocking-1)
+                       ("rust-futures-lite" ,rust-futures-lite-2))))
+    (home-page "https://github.com/smol-rs/async-net")
+    (synopsis "Async networking primitives for TCP/UDP/Unix communication")
+    (description "This package provides async networking primitives for
+TCP/UDP/Unix communication.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-async-net-1
   (package
+    (inherit rust-async-net-2)
     (name "rust-async-net")
     (version "1.5.0")
     (source
@@ -3905,12 +3963,7 @@ (define-public rust-async-net-1
        (("rust-async-io" ,rust-async-io-1)
         ("rust-blocking" ,rust-blocking-1)
         ("rust-fastrand" ,rust-fastrand-1)
-        ("rust-futures-lite" ,rust-futures-lite-1))))
-    (home-page "https://github.com/stjepang/async-net")
-    (synopsis "Async networking primitives for TCP/UDP/Unix communication")
-    (description
-     "Async networking primitives for TCP/UDP/Unix communication")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-futures-lite" ,rust-futures-lite-1))))))
 
 (define-public rust-async-once-cell-0.5
   (package
-- 
2.41.0

[bug#68819] [PATCH 32/49] gnu: Add rust-ordered-stream-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ordered-stream-0.2): Add variable.
(rust-ordered-stream-0.1): Inherit from rust-ordered-stream-0.2.

Change-Id: I24169187e93fe2b08fe85a9d3ba6290b9f751dc3
---
 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 947bbbf586..55a334e396 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42779,17 +42779,17 @@ (define-public rust-ordered-multimap-0.3
 insertion order across all keys and values.")
     (license license:expat)))
 
-(define-public rust-ordered-stream-0.1
+(define-public rust-ordered-stream-0.2
   (package
     (name "rust-ordered-stream")
-    (version "0.1.4")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "ordered-stream" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "140c0h0ap30mcfhdk2xy1q9iqyb450wh11dglshh2y6vmjyj82in"))))
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ordered-stream" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0l0xxp697q7wiix1gnfn66xsss7fdhfivl2k7bvpjs4i3lgb18ls"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -42804,6 +42804,19 @@ (define-public rust-ordered-stream-0.1
 external events in Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ordered-stream-0.1
+  (package
+    (inherit rust-ordered-stream-0.2)
+    (name "rust-ordered-stream")
+    (version "0.1.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ordered-stream" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "140c0h0ap30mcfhdk2xy1q9iqyb450wh11dglshh2y6vmjyj82in"))))))
+
 (define-public rust-ordermap-0.3
   (package
     (name "rust-ordermap")
-- 
2.41.0

[bug#68819] [PATCH 33/49] gnu: Add rust-xdg-home-1.

[Herman Rimm via Guix-patches via]

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

Change-Id: I3c10b1303c37c93c6302bd0537120db786f4463c
---
 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 55a334e396..d23868d7c0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -76570,6 +76570,26 @@ (define-public rust-xdg-2
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-xdg-home-1
+  (package
+    (name "rust-xdg-home")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "xdg-home" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kbd1ks8bvpsay6lgk60yaf1w13daaf75ghmslan031ss4y20s97"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-nix" ,rust-nix-0.26)
+                       ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/zeenix/xdg-home")
+    (synopsis "User home directory per XDG Specification")
+    (description "The user's home directory as per the XDG Specification.")
+    (license license:expat)))
+
 (define-public rust-xflags-macros-0.2
   (package
     (name "rust-xflags-macros")
-- 
2.41.0

[bug#68819] [PATCH 34/49] gnu: Add rust-async-signal-0.2.

[Herman Rimm via Guix-patches via]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d23868d7c0..f3d3a0c187 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4121,6 +4121,41 @@ (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-signal-0.2
+  (package
+    (name "rust-async-signal")
+    (version "0.2.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "async-signal" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1i9466hiqghhmljjnn83a8vnxi8z013xga03f59c89d2cl7xjiwy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-io" ,rust-async-io-2)
+        ("rust-async-lock" ,rust-async-lock-2)
+        ("rust-atomic-waker" ,rust-atomic-waker-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-io" ,rust-futures-io-0.3)
+        ("rust-rustix" ,rust-rustix-0.38)
+        ("rust-signal-hook-registry" ,rust-signal-hook-registry-1)
+        ("rust-slab" ,rust-slab-0.4)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs
+       (("rust-async-io" ,rust-async-io-2)
+        ("rust-fastrand" ,rust-fastrand-2)
+        ("rust-futures-lite" ,rust-futures-lite-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-signal-hook" ,rust-signal-hook-0.3))))
+    (home-page "https://github.com/smol-rs/async-signal")
+    (synopsis "Async signal handling")
+    (description "This package provides async signal handling.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-async-std-1
   (package
     (name "rust-async-std")
-- 
2.41.0

[bug#68819] [PATCH 35/49] gnu: Add rust-event-listener-3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-event-listener-3): Add variable and
inherit from rust-event-listener-4.

Change-Id: I84635d1ab1333847c6a3024a88edc1a2d1db5389
---
 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 f3d3a0c187..7159e359de 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21531,6 +21531,31 @@ (define-public rust-event-listener-4
 blocking data structures.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-event-listener-3
+  (package
+    (inherit rust-event-listener-4)
+    (name "rust-event-listener")
+    (version "3.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "event-listener" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hihkg6ihvb6p9yi7nq11di8mhd5y0iqv81ij6h0rf0fvsy7ff6r"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-concurrent-queue" ,rust-concurrent-queue-2)
+        ("rust-parking" ,rust-parking-2)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-portable-atomic" ,rust-portable-atomic-1)
+        ("rust-portable-atomic-util" ,rust-portable-atomic-util-0.1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-futures-lite" ,rust-futures-lite-2)
+        ("rust-waker-fn" ,rust-waker-fn-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))))
+
 (define-public rust-event-listener-2
   (package
     (inherit rust-event-listener-4)
-- 
2.41.0

[bug#68819] [PATCH 36/49] gnu: rust-async-process-1: Update to 1.8.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-async-process-1): Update to 1.8.1.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7159e359de..66d7d4cba7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4039,30 +4039,34 @@ (define-public rust-async-pidfd-0.1
 (define-public rust-async-process-1
   (package
     (name "rust-async-process")
-    (version "1.0.1")
+    (version "1.8.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "async-process" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1nmvqwqxzy0gv7n8agknaijns9dsxqj81bxms4bs647vq44ym32c"))))
+        (base32 "126s968lvhg9rlwsnxp7wfzkfn7rl87p0dlvqqlibn081ax3hr7a"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-test-flags '("--release" "--"
-                            "--skip=set_current_dir_works"
-                            "--skip=signal_reported_right"
-                            "--skip=stdin_works")
-       #:cargo-inputs
-       (("rust-async-io" ,rust-async-io-1)
-        ("rust-blocking" ,rust-blocking-1)
-        ("rust-cfg-if" ,rust-cfg-if-0.1)
-        ("rust-event-listener" ,rust-event-listener-2)
-        ("rust-futures-lite" ,rust-futures-lite-1)
-        ("rust-once-cell" ,rust-once-cell-1)
-        ("rust-signal-hook" ,rust-signal-hook-0.1)
-        ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/stjepang/async-process")
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=set_current_dir_works" ; assertion failed: p.is_ok()
+         ;; No such file or directory
+         "--skip=signal_reported_right"
+         "--skip=stdin_works"
+         "--skip=test_spawn_multiple_with_stdio")
+       #:cargo-inputs (("rust-async-io" ,rust-async-io-1)
+                       ("rust-async-lock" ,rust-async-lock-2)
+                       ("rust-async-signal" ,rust-async-signal-0.2)
+                       ("rust-blocking" ,rust-blocking-1)
+                       ("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-event-listener" ,rust-event-listener-3)
+                       ("rust-futures-lite" ,rust-futures-lite-1)
+                       ("rust-rustix" ,rust-rustix-0.38)
+                       ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs (("rust-async-io" ,rust-async-io-1))))
+    (home-page "https://github.com/smol-rs/async-process")
     (synopsis "Async interface for working with processes")
     (description
      "This crate is an async version of @code{std::process}.  A background
-- 
2.41.0

[bug#68819] [PATCH 37/49] gnu: rust-async-fs-1: Update to 1.6.0.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-async-fs-1): Update to 1.6.0.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 66d7d4cba7..e122ce8af4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3631,23 +3631,25 @@ (define-public rust-async-executor-1
 (define-public rust-async-fs-1
   (package
     (name "rust-async-fs")
-    (version "1.5.0")
+    (version "1.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "async-fs" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1qnsqg0jjpda590w8nvbhh5mcmdyx5f43xx2g313fz0izzwa8g4b"))))
+        (base32 "01if2h77mry9cnm91ql2md595108i2c1bfy9gaivzvjfcl2gk717"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-async-lock" ,rust-async-lock-2)
-        ("rust-blocking" ,rust-blocking-1)
-        ("rust-futures-lite" ,rust-futures-lite-1))))
-    (home-page "https://github.com/stjepang/async-fs")
-    (synopsis "Async filesystem primitives in Rust")
+       #: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))))
 
-- 
2.41.0

[bug#68819] [PATCH 38/49] gnu: rust-zbus-3: Update to 3.14.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-zbus-3, rust-zbus-macros-3): Update
to 3.14.1.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e122ce8af4..6657be60d8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77169,38 +77169,39 @@ (define-public rust-zbase32-0.1
 (define-public rust-zbus-3
   (package
     (name "rust-zbus")
-    (version "3.7.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "zbus" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0pl5ri4lihzzxzxgvw1m0lpq90pnack0hi6gg48jsqyb1iy5i79p"))))
+    (version "3.14.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "zbus" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0j5rxgszrmkk5pbpwccrvj3gflwqw8jv8wfx9v84qbl75l53kpii"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; Not all files included.
        #:cargo-inputs
        (("rust-async-broadcast" ,rust-async-broadcast-0.5)
         ("rust-async-executor" ,rust-async-executor-1)
+        ("rust-async-fs" ,rust-async-fs-1)
         ("rust-async-io" ,rust-async-io-1)
         ("rust-async-lock" ,rust-async-lock-2)
+        ("rust-async-process" ,rust-async-process-1)
         ("rust-async-recursion" ,rust-async-recursion-1)
         ("rust-async-task" ,rust-async-task-4)
         ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-blocking" ,rust-blocking-1)
         ("rust-byteorder" ,rust-byteorder-1)
         ("rust-derivative" ,rust-derivative-2)
-        ("rust-dirs" ,rust-dirs-4)
         ("rust-enumflags2" ,rust-enumflags2-0.7)
         ("rust-event-listener" ,rust-event-listener-2)
         ("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-hex" ,rust-hex-0.4)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-nix" ,rust-nix-0.25)
+        ("rust-nix" ,rust-nix-0.26)
         ("rust-once-cell" ,rust-once-cell-1)
-        ("rust-ordered-stream" ,rust-ordered-stream-0.1)
+        ("rust-ordered-stream" ,rust-ordered-stream-0.2)
         ("rust-quick-xml" ,rust-quick-xml-0.27)
         ("rust-rand" ,rust-rand-0.8)
         ("rust-serde" ,rust-serde-1)
@@ -77214,6 +77215,7 @@ (define-public rust-zbus-3
         ("rust-uds-windows" ,rust-uds-windows-1)
         ("rust-vsock" ,rust-vsock-0.3)
         ("rust-winapi" ,rust-winapi-0.3)
+        ("rust-xdg-home" ,rust-xdg-home-1)
         ("rust-zbus-macros" ,rust-zbus-macros-3)
         ("rust-zbus-names" ,rust-zbus-names-2)
         ("rust-zvariant" ,rust-zvariant-3))
@@ -77270,26 +77272,25 @@ (define-public rust-zbus-1
 (define-public rust-zbus-macros-3
   (package
     (name "rust-zbus-macros")
-    (version "3.7.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "zbus_macros" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1y4cw7x8hrpz9xd43spd0vzvfbm1991bik1yb2873py0j0p2ljb6"))))
+    (version "3.14.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "zbus_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17dwc1vvvwxlgn78cpds72hcf7y1hxqkjnpm0zlc0y38ji57kla1"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; Tests need a running dbus instance.
-       #:cargo-inputs
-       (("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-syn" ,rust-syn-1))
+       #:cargo-inputs (("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-syn" ,rust-syn-1)
+                       ("rust-zvariant-utils" ,rust-zvariant-utils-1))
        #:cargo-development-inputs
        (("rust-async-io" ,rust-async-io-1)
-        ("rust-doc-comment" ,rust-doc-comment-0.3)
         ("rust-futures-util" ,rust-futures-util-0.3)
         ("rust-rustversion" ,rust-rustversion-1)
         ("rust-serde" ,rust-serde-1)
-- 
2.41.0

[bug#68819] [PATCH 39/49] gnu: Add rust-pandoc-0.8.

[Herman Rimm via Guix-patches via]

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

Change-Id: I62d9ebbdd423678f667d4df1177e0daa3830a60d
---
 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 6657be60d8..8d059e8d7c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -43653,6 +43653,26 @@ (define-public rust-parasail-sys-0.2
 sequence alignment library.")
     (license license:expat)))
 
+(define-public rust-pandoc-0.8
+  (package
+    (name "rust-pandoc")
+    (version "0.8.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pandoc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0p56085drzwb143ximsvr5bni7k0cl9ld7dz7lh92hkslz8m6ga6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-itertools" ,rust-itertools-0.12))))
+    (home-page "https://github.com/oli-obk/rust-pandoc")
+    (synopsis "Library API that wraps calls to the pandoc executable")
+    (description "A library API that wraps calls to the pandoc 2.x
+executable.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-parasailors-0.3
   (package
     (name "rust-parasailors")
-- 
2.41.0

[bug#68819] [PATCH 40/49] gnu: i3status-rust: Update to 0.32.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/rust-apps.scm (i3status-rust): Update to 0.32.3.

Change-Id: I84e34ee0f60c3c10a013e3b8edc42f157db5732c
---
 gnu/local.mk                                  |   1 -
 ...status-rust-enable-unstable-features.patch |  20 ----
 gnu/packages/rust-apps.scm                    | 100 ++++++++++++------
 3 files changed, 65 insertions(+), 56 deletions(-)
 delete mode 100644 gnu/packages/patches/i3status-rust-enable-unstable-features.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index a215c1e84b..c036dd4894 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2003,7 +2003,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/rust-1.70-fix-rustix-build.patch	\
   %D%/packages/patches/rust-cargo-edit-remove-ureq.patch	\
   %D%/packages/patches/rust-ring-0.17-ring-core.patch		\
-  %D%/packages/patches/i3status-rust-enable-unstable-features.patch	\
   %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch	\
   %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch	\
   %D%/packages/patches/rust-ndarray-0.14-remove-blas-src.patch	\
diff --git a/gnu/packages/patches/i3status-rust-enable-unstable-features.patch b/gnu/packages/patches/i3status-rust-enable-unstable-features.patch
deleted file mode 100644
index 535b45d865..0000000000
--- a/gnu/packages/patches/i3status-rust-enable-unstable-features.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 3006390c0058f06c255d9850327163aebcdc3b40 Mon Sep 17 00:00:00 2001
-From: Petr Hodina <phodina@protonmail.com>
-Date: Mon, 11 Oct 2021 22:35:39 +0200
-Subject: [PATCH] Enable unstable features.
-
-
-diff --git a/src/main.rs b/src/main.rs
-index d9e964b..820e22e 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -1,3 +1,6 @@
-+#![feature(bool_to_option)]
-+#![feature(clamp)]
-+
- #[macro_use]
- mod de;
- #[macro_use]
---
-2.33.0
-
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 2d714c4861..8b21080e31 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -768,7 +768,7 @@ (define-public hyperfine
 (define-public i3status-rust
   (package
     (name "i3status-rust")
-    (version "0.20.1")
+    (version "0.32.3")
     (source
      (origin
        (method git-fetch)
@@ -776,42 +776,71 @@ (define-public i3status-rust
              (url "https://github.com/greshake/i3status-rust")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
-       (patches (search-patches "i3status-rust-enable-unstable-features.patch"))
        (sha256
-        (base32 "00gzm3g297s9bfp13vnb623p7dfac3g6cdhz2b3lc6l0kmnnqs1s"))))
+        (base32 "11n32kkfwlv38mj9018hp5rbg4w3d1vq9f6x8rhqahs19mm5amqa"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:features '("pulseaudio" "libpulse-binding")
-       #:install-source? #f
+     `(#:install-source? #f
        #:cargo-inputs
-       (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-chrono-tz" ,rust-chrono-tz-0.5)
-        ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
-        ("rust-curl" ,rust-curl-0.4)
-        ("rust-dbus" ,rust-dbus-0.9)
-        ("rust-dbus-tree" ,rust-dbus-tree-0.9)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-nix" ,rust-nix-0.20)
-        ("rust-nl80211" ,rust-nl80211-0.0.2)
+       (("rust-anyhow" ,rust-anyhow-1) ; Dependency of xtask.
+        ("rust-async-once-cell" ,rust-async-once-cell-0.5)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-backon" ,rust-backon-0.4)
+        ("rust-calibright" ,rust-calibright-0.1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-chrono-tz" ,rust-chrono-tz-0.8)
+        ("rust-clap" ,rust-clap-4) ; Dependency of xtask also.
+        ("rust-dirs" ,rust-dirs-5)
+        ("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-glob" ,rust-glob-0.3)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-inotify" ,rust-inotify-0.10)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-libpulse-binding" ,rust-libpulse-binding-2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-maildir" ,rust-maildir-0.6)
+        ("rust-neli" ,rust-neli-0.6)
+        ("rust-neli-wifi" ,rust-neli-wifi-0.6)
+        ("rust-nix" ,rust-nix-0.27)
+        ("rust-nom" ,rust-nom-7)
+        ("rust-notmuch" ,rust-notmuch-0.8)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-pandoc" ,rust-pandoc-0.8) ; Dependency of xtask.
+        ("rust-regex" ,rust-regex-1)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-sensors" ,rust-sensors-0.2)
         ("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-with" ,rust-serde-with-3)
+        ("rust-shellexpand" ,rust-shellexpand-3)
         ("rust-signal-hook" ,rust-signal-hook-0.3)
-        ("rust-swayipc" ,rust-swayipc-2)
-        ("rust-toml" ,rust-toml-0.5)
-        ("rust-cpuprofiler" ,rust-cpuprofiler-0.0)
-        ("rust-inotify" ,rust-inotify-0.9)
-        ("rust-libpulse-binding" ,rust-libpulse-binding-2)
-        ("rust-maildir" ,rust-maildir-0.5)
-        ("rust-notmuch" ,rust-notmuch-0.6)
-        ("rust-progress" ,rust-progress-0.2))
-       #:cargo-development-inputs
-       (("rust-assert-fs" ,rust-assert-fs-1))
+        ("rust-signal-hook-tokio" ,rust-signal-hook-tokio-0.3)
+        ("rust-smart-default" ,rust-smart-default-0.7)
+        ("rust-swayipc-async" ,rust-swayipc-async-2)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-toml" ,rust-toml-0.8)
+        ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+        ("rust-wayrs-client" ,rust-wayrs-client-1)
+        ("rust-wayrs-protocols" ,rust-wayrs-protocols-0.13)
+        ("rust-clap-mangen" ,rust-clap-mangen-0.2) ; Dependency of xtask.
+        ("rust-zbus" ,rust-zbus-3))
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'enable-unstable-features
+         (add-after 'unpack 'remove-optional-icu-deps
            (lambda _
-             (setenv "RUSTC_BOOTSTRAP" "1")))
+             (substitute* "Cargo.toml"
+               (("^icu_calendar.*") "")
+               (("^icu_datetime.*") "")
+               (("^icu_locid.*") ""))))
+         (add-after 'unpack 'fix-wayrs-versions
+           (lambda _
+             (substitute* "Cargo.toml"
+               (("^(wayrs-client = \\{ version = \")0.12\"" all most)
+                (string-append most "1.0\""))
+               (("^(wayrs-protocols = \\{ version = \"0.1)2\"" all most)
+                (string-append most "3\"")))))
          (add-after 'unpack 'fix-resources-path
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -827,11 +856,12 @@ (define-public i3status-rust
              (let ((out (assoc-ref outputs "out"))
                    (paths (map
                            (lambda (input)
-                             (string-append (assoc-ref inputs input) "/bin"))
-                           '("alsa-utils" "coreutils" "curl" "dbus" "ibus" "iproute"
-                             "kdeconnect" "lm-sensors" "pulseaudio"
-                             "openssl"
-                             "setxkbmap" "speedtest-cli" "xdg-utils" "xrandr"
+                             (string-append
+                               (assoc-ref inputs input) "/bin"))
+                           '("alsa-utils" "coreutils" "curl" "dbus"
+                             "ibus" "iproute" "kdeconnect" "lm-sensors"
+                             "pulseaudio" "openssl" "setxkbmap"
+                             "speedtest-cli" "xdg-utils" "xrandr"
                              "zlib"))))
                (wrap-program (string-append out "/bin/i3status-rs")
                  `("PATH" prefix ,paths))))))))
@@ -846,7 +876,7 @@ (define-public i3status-rust
        ("ibus" ,ibus)
        ("iproute" ,iproute)
        ("kdeconnect" ,kdeconnect)
-       ("lm-sensors" ,lm-sensors)
+       ("lm-sensors" ,lm-sensors "lib")
        ("pulseaudio" ,pulseaudio)
        ("openssl" ,openssl)
        ("setxkbmap" ,setxkbmap)
@@ -854,8 +884,8 @@ (define-public i3status-rust
        ("xdg-utils" ,xdg-utils)
        ("xrandr" ,xrandr)
        ("zlib" ,zlib)))
-    (home-page "https://github.com/greshake/i3status-rust")
-    (synopsis "i3status, written in pure Rust")
+    (home-page "https://github.com/greshake/i3status-rust/")
+    (synopsis "Replacement for i3status, written in Rust")
     (description "@code{i3status-rs} is a feature-rich and resource-friendly
 replacement for i3status, written in pure Rust.  It provides a way to display
 @code{blocks} of system information (time, battery status, volume, etc) on the i3
-- 
2.41.0

[bug#68819] [PATCH 41/49] gnu: Deprecate rust-nl80211-0.0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-nl80211-0.0.2): Deprecate in favor of
  rust-neli-wifi-0.6.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8d059e8d7c..fe2c1cd979 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39832,30 +39832,6 @@ (define-public rust-nix-0.8
         ("rust-libc" ,rust-libc-0.2)
         ("rust-void" ,rust-void-1))))))
 
-(define-public rust-nl80211-0.0.2
-  (package
-    (name "rust-nl80211")
-    (version "0.0.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "nl80211" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0jgx12qy0a004sc4qpr3ahgn9gma3rln9gsxiq4cdw6dd8h4dmx0"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-buffering" ,rust-buffering-0.3)
-        ("rust-hex" ,rust-hex-0.4)
-        ("rust-neli" ,rust-neli-0.4))))
-    (home-page "https://github.com/Eonm/nl80211")
-    (synopsis "Send commands to nl80211 and receive messages")
-    (description
-     "This crate provides a low level access to nl80211.  It can send commands
-to nl80211 and receive messages.")
-    (license license:expat)))
-
 (define-public rust-no-color-0.1
   (package
     (name "rust-no-color")
-- 
2.41.0

[bug#68819] [PATCH 42/49] gnu: Remove rust-neli-0.4.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-neli-0.4): Delete variable.
---
 gnu/packages/crates-io.scm | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fe2c1cd979..aa40575ffa 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39054,27 +39054,6 @@ (define-public rust-neli-0.5
                        ("rust-simple-logger" ,rust-simple-logger-1)
                        ("rust-tokio" ,rust-tokio-1))))))
 
-(define-public rust-neli-0.4
-  (package
-    (inherit rust-neli-0.5)
-    (name "rust-neli")
-    (version "0.4.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "neli" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1lxnns9vfrsiwksscjgr7yvgpc5658lw07d745ir37r5pn19fpp8"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-buffering" ,rust-buffering-0.4)
-        ("rust-byteorder" ,rust-byteorder-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-mio" ,rust-mio-0.6)
-        ("rust-tokio" ,rust-tokio-0.1))))))
-
 (define-public rust-neli-proc-macros-0.1
   (package
     (name "rust-neli-proc-macros")
-- 
2.41.0

[bug#68819] [PATCH 43/49] gnu: Remove rust-notmuch-0.6.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-notmuch-0.6): Remove variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index aa40575ffa..18f4edf8e6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40505,38 +40505,6 @@ (define-public rust-notmuch-0.8
      "This crate provides a Rust interface and bindings for Notmuch.")
     (license license:gpl3+)))
 
-(define-public rust-notmuch-0.6
-  (package
-    (inherit rust-notmuch-0.8)
-    (name "rust-notmuch")
-    (version "0.6.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "notmuch" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "19q93iyvx4liksm09mhq9ibm8zj7i3dizc1s40f916z0kbpn9k5w"))))
-    (arguments
-     `(#:tests? #f         ;see https://github.com/vhdirk/notmuch-rs/issues/35
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-supercow" ,rust-supercow-0.1))
-       #:cargo-development-inputs
-       (("rust-dirs" ,rust-dirs-1)
-        ("rust-gethostname" ,rust-gethostname-0.2)
-        ("rust-lettre" ,rust-lettre-0.9)
-        ("rust-lettre-email" ,rust-lettre-email-0.9)
-        ("rust-maildir" ,rust-maildir-0.5)
-        ("rust-tempfile" ,rust-tempfile-3))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-maildir-version
-           (lambda* _
-             (substitute* "Cargo.toml"
-               (("version = \"0.3.2\"") "version = \"0.5.0\"")))))))))
-
-
 (define-public rust-ntapi-0.4
   (package
     (name "rust-ntapi")
-- 
2.41.0

[bug#68819] [PATCH 44/49] gnu: Remove rust-cpuprofiler-0.0.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-cpuprofiler-0.0): Delete variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 18f4edf8e6..f38f456c99 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13967,32 +13967,6 @@ (define-public rust-cpuid-bool-0.2
     (description "This package has been replaced by the `cpufeatures` crate.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-cpuprofiler-0.0
-  (package
-    (name "rust-cpuprofiler")
-    (version "0.0.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cpuprofiler" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0az588yyl9r13w4k7xfdh5ckfaq52fwpjry2q2hblazxpjflgy23"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-error-chain" ,rust-error-chain-0.12)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-pkg-config" ,rust-pkg-config-0.3))))
-    (inputs
-     (list gperftools))
-    (home-page "https://github.com/AtheMathmo/cpuprofiler")
-    (synopsis "Bindings to Google's cpu profiler")
-    (description "This package provides bindings to Google's cpu profiler.")
-    (license license:bsd-2)))
-
 (define-public rust-uom-0.34
   (package
     (name "rust-uom")
-- 
2.41.0

[bug#68819] [PATCH 45/49] gnu: Remove rust-progress-0.2.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-progress-0.2): Remove variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f38f456c99..d9168ac2f5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48427,29 +48427,6 @@ (define-public rust-profiling-procmacros-1
      "This crate provides a very thin abstraction over other profiler crates.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-progress-0.2
-  (package
-    (name "rust-progress")
-    (version "0.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "progress" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0i0w5zh2hm4l16ibg5mgr9pf3vpybhhx0zrs0nb8d191awq21f0p"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f                      ; 2 tests fail
-       #:cargo-inputs
-       (("rust-terminal-size" ,rust-terminal-size-0.1))))
-    (home-page "https://github.com/TheKK/progress")
-    (synopsis "Library for showing text based progress bar and job status")
-    (description
-     "This library is used for showing text based progress bar and job
-status.")
-    (license license:expat)))
-
 (define-public rust-progressing-3
   (package
     (name "rust-progressing")
-- 
2.41.0

[bug#68819] [PATCH 46/49] gnu: Remove rust-buffering-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io (rust-buffering-0.3): Delete variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d9168ac2f5..e861b4f613 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7698,24 +7698,6 @@ (define-public rust-buffering-0.4
 buffer operations.")
     (license license:bsd-3)))
 
-(define-public rust-buffering-0.3
-  (package
-    (inherit rust-buffering-0.4)
-    (name "rust-buffering")
-    (version "0.3.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "buffering" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "11cyq2nm569j028g93jxk00h8nfwc3l6n3hqw79w34na01p3lq97"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-buffering-nocopy-macro" ,rust-buffering-nocopy-macro-0.1))))))
-
 (define-public rust-buffering-nocopy-macro-0.2
   (package
     (name "rust-buffering-nocopy-macro")
-- 
2.41.0

[bug#68819] [PATCH 47/49] gnu: Remove rust-supercow-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io (rust-supercow-0.1): Delete variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e861b4f613..f627940f78 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64088,25 +64088,6 @@ (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-supercow-0.1
-  (package
-    (name "rust-supercow")
-    (version "0.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "supercow" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0qxxk2z4pa7ni17bdhix9syhax0nnnpbjjpsinkhd8vsnknmh5qp"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/altsysrq/supercow")
-    (synopsis "Generic way to accept general reference-like values")
-    (description
-     "This package provides a generic way to accept general reference-like
-values without proliferating generics.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-superluminal-perf-0.1
   (package
     (name "rust-superluminal-perf")
-- 
2.41.0

[bug#68819] [PATCH 48/49] gnu: Remove rust-buffering-nocopy-macro-0.1.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io (rust-buffering-nocopy-0.1): Delete variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f627940f78..71aa8fea52 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7720,25 +7720,6 @@ (define-public rust-buffering-nocopy-macro-0.2
     (description "This package provides a proc-macro crate for buffering.")
     (license license:bsd-3)))
 
-(define-public rust-buffering-nocopy-macro-0.1
-  (package
-    (inherit rust-buffering-nocopy-macro-0.2)
-    (name "rust-buffering-nocopy-macro")
-    (version "0.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "buffering_nocopy_macro" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "03b6wp4i3273jzw2nbnrnddlxyma3p465y2dszx6vc3ysq0fdlj7"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-0.4)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-syn" ,rust-syn-0.14))))))
-
 (define-public rust-bufstream-0.1
   (package
     (name "rust-bufstream")
-- 
2.41.0

[bug#68819] [PATCH 49/49] gnu: Remove rust-ordered-stream-0.1.

[Herman Rimm via Guix-patches via]

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

Change-Id: I9ee8e3ff018e50cc7f39bc1184b9d3996a236527
---
 gnu/packages/crates-io.scm | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 71aa8fea52..4ca6e722f5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42730,19 +42730,6 @@ (define-public rust-ordered-stream-0.2
 external events in Rust.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-ordered-stream-0.1
-  (package
-    (inherit rust-ordered-stream-0.2)
-    (name "rust-ordered-stream")
-    (version "0.1.4")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "ordered-stream" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "140c0h0ap30mcfhdk2xy1q9iqyb450wh11dglshh2y6vmjyj82in"))))))
-
 (define-public rust-ordermap-0.3
   (package
     (name "rust-ordermap")
-- 
2.41.0

[bug#68819] [PATCH 00/49 rust-team] Update i3status-rust to 0.32.3.

[Herman Rimm via Guix-patches via]

Hi,

I sent a a few duplicated patches at 10:52. Why don't all patches show
up at the same time on [1] or [2]?

Cheers,
Herman

[1]: https://lists.gnu.org/archive/html/guix-patches/2024-01/index.html
[2]: https://issues.guix.gnu.org/68819

bug#68819: [PATCH 00/49 rust-team] Update i3status-rust to 0.32.3.

[Efraim Flashner]

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

Patches pushed to the rust-team branch with a few changes.  I'll answer
your questions inline.

On Tue, Jan 30, 2024 at 04:03:34PM +0100, Herman Rimm wrote:
> Hi rust-team,
> 
> When I started using Guix, my i3status-rust config was for a newer
> version, now I got around to updating the package. I understand why
> noone had updated it, as it was quite tedious. Anyway, I added the
> dependencies required for the new version. Some notes:
> 
> I shortened synopses and punctuated descriptions, but mostly left the
> #:cargo-inputs indentation as guix import had generated it. I want guix
> import crate to generate appropriate indentation.
> 
> rust-arrow2 and rust-tera are patched and build with rust-chrono-tz-0.8
> so that it can replace rust-chrono-tz-0.6 in a single commit.
> 
> rust-zbus-3 and rust-zbus-macros-3 dependency are updated in a single
> commit, instead of relaxing rust-zbus-3 dependency versioning.

Probably could have updated rust-zbus-macros-3 first and then
rust-zbus-3, but if the two commits are next to each other its generally
fine.  Or doing both in one commit is also fine.

> Enabled tests on rust-notmuch.
> 
> Although ordered-stream-0.2 is not adjacent to ordered-stream-0.1, the
> latter is removed in a later commit.
> 
> Lastly, i3status-rust is updated and any dependencies that become unused
> are removed recursively.
> 
> Assorted questions:
> 
> 1. Should rust-from-variants-impl-0.6 be public?

Yes, we have (almost?) all the rust packages as public.

> 2. I updated wayrs-client to 1.0, because adding a #[macro_use] made
> the wayrs-scanner-0.12 generate! macro available, so wayrs-client 0.12
> would build in isolation, but not as a dependency of i3status-rust.
> Adding #[macro_export] to the macro in wayrs-scanner-0.12 did not have
> any effect. Does this issue seem familiar?

I tried to build i3status-rust with the 0.12 versions but ran into build
issues so I left it as you have it.  That issue specifically I don't
remember seeing, but I haven't played around with it as much as I could
have.

> 3. rust-async-io-2 and rust-async-net-2 form a cyclical dependency,
> should they be added as separate packages anyway?

I would generally do it as two separate commits, even though each
depends on the other.  Doing both in one commit is technically more
correct.

> 4. When to #:skip-build?

I generally do it when a package actually doesn't build (like if it only
builds on macOS or on Windows) or if we can't get all the dependencies
packaged, like rust-clap-derive-4 (I think) which has a dependency which
wants a newer version of nushell.  Most of the time I leave a comment
about cutting the dependency chain.  There was a period where
intermediate crates which were imported defaulted to '#:skip-build? #t'
but it made it harder to check that the inputs were correct.

> 5. Why is a rust package name defined when inheriting the same name?

We use the name field as part of the source file-name, and if we leave
it as inherited then the name field shows up as undeclared.

> Cheers,
> Herman
> 
> Herman Rimm (49):
>   gnu: Add rust-async-once-cell-0.5.
>   gnu: Add rust-backon-0.4.
>   gnu: Add rust-calibright-0.1.
>   gnu: Add rust-neli-proc-macros-0.1.
>   gnu: Add rust-neli-0.6.
>   gnu: Add rust-neli-wifi-0.6.
>   gnu: Add rust-chrono-tz-build-0.2.
>   gnu: Replace rust-chrono-tz-0.6 with rust-chrono-tz-0.8.
>   gnu: Add rust-from-variants-impl-0.6.
>   gnu: Add rust-from-variants-0.6.
>   gnu: Add rust-notmuch-0.8.
>   gnu: rust-gethostname-0.2: Update to 0.2.3.
>   gnu: Add rust-maildir-0.6.
>   gnu: Add rust-libsensors-sys-0.2.
>   gnu: Add rust-sensors-0.2.
>   gnu: Add rust-signal-hook-tokio-0.3.
>   gnu: rust-swayipc-types-1: Update to 1.3.1.
>   gnu: Add rust-async-pidfd-0.1.
>   gnu: rust-parking-2: Update to 2.2.0.
>   gnu: Add rust-futures-lite-2.
>   gnu: Add rust-swayipc-async-2.
>   gnu: Add rust-proc-macro-crate-3.
>   gnu: Add rust-wayrs-proto-parser-2
>   gnu: Add rust-wayrs-scanner-0.13.
>   gnu: Add rust-wayrs-client-1.
>   gnu: Add rust-wayrs-protocols-0.13.
>   gnu: Add rust-event-listener-4.
>   gnu: Add rust-event-listener-strategy-0.4.
>   gnu: Add rust-async-channel-2.
>   gnu: Add rust-async-lock-3.
>   gnu: Add rust-async-io-2 and rust-async-net-2 cyclical dependency.
>   gnu: Add rust-ordered-stream-0.2.
>   gnu: Add rust-xdg-home-1.
>   gnu: Add rust-async-signal-0.2.
>   gnu: Add rust-event-listener-3.
>   gnu: rust-async-process-1: Update to 1.8.1.
>   gnu: rust-async-fs-1: Update to 1.6.0.
>   gnu: rust-zbus-3: Update to 3.14.1.
>   gnu: Add rust-pandoc-0.8.
>   gnu: i3status-rust: Update to 0.32.3.

These ones I left for now in case another package later needs them.

>   gnu: Deprecate rust-nl80211-0.0.2.
>   gnu: Remove rust-neli-0.4.
>   gnu: Remove rust-notmuch-0.6.
>   gnu: Remove rust-cpuprofiler-0.0.
>   gnu: Remove rust-progress-0.2.
>   gnu: Remove rust-buffering-0.3.
>   gnu: Remove rust-supercow-0.1.
>   gnu: Remove rust-buffering-nocopy-macro-0.1.
>   gnu: Remove rust-ordered-stream-0.1.
> 
>  gnu/local.mk                                  |    1 -
>  gnu/packages/crates-graphics.scm              |   88 ++
>  gnu/packages/crates-io.scm                    | 1133 ++++++++++++-----
>  ...status-rust-enable-unstable-features.patch |   20 -
>  gnu/packages/rust-apps.scm                    |  100 +-
>  5 files changed, 959 insertions(+), 383 deletions(-)
>  delete mode 100644 gnu/packages/patches/i3status-rust-enable-unstable-features.patch
> 
> 
> base-commit: 36315bde09efa660d38198f666b4e1582cb71db3
> -- 
> 2.41.0
> 
> 
> 

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

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