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

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