[PATCH rust-team] Add rust-zbus-4

  • Done
  • quality assurance status badge
Details
2 participants
  • Efraim Flashner
  • paul
Owner
unassigned
Submitted by
paul
Severity
normal
P
(address . guix-patches@gnu.org)
280ad8ad-5071-4481-836b-e0483569cd97@autistici.org
Hi Guix,

this is the second patchest required to build GNOME Authenticator in
Guix. It adds rust-zbus-4 and dependencies.

This patchset depends on the first one available at:


Thank you for your work and please let me know if I can help get the
review burden easier somehow!

Cheers

giacomo
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 01/25] gnu: rust-portable-atomic-util: Update to 0.2.3.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
65269a0deca6af0c84975fffc88ed3525e6aa074.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-portable-atomic-util-0.2): New
variable;
(rust-portable-atomic-util-0.1): inherit from rust-portable-atomic-util-0.2.

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

Toggle diff (63 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 73f45936b2..8c2ef6a394 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
;;; Copyright © 2019-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2019, 2024 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
@@ -56861,25 +56861,41 @@ (define-public rust-portable-atomic-1
128-bit atomics, atomic float, etc.")
(license (list license:asl2.0 license:expat))))
-(define-public rust-portable-atomic-util-0.1
+(define-public rust-portable-atomic-util-0.2
(package
(name "rust-portable-atomic-util")
- (version "0.1.5")
+ (version "0.2.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "portable-atomic-util" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "16s4ag42sjkkas49fnlj99kx9zxdfqwk7ii12js533dk4lb439x1"))))
+ (base32 "0v105n6yyvzwvfgsvfm5cqb818avlk3hbpfnahdljan5xjzdb9wh"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs (("rust-portable-atomic" ,rust-portable-atomic-1))))
+ `(#:cargo-inputs (("rust-build-context" ,rust-build-context-0.1)
+ ("rust-portable-atomic" ,rust-portable-atomic-1))))
(home-page "https://github.com/taiki-e/portable-atomic")
(synopsis "Synchronization primitives built with portable-atomic")
(description "Synchronization primitives built with portable-atomic.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-portable-atomic-util-0.1
+ (package
+ (inherit rust-portable-atomic-util-0.2)
+ (name "rust-portable-atomic-util")
+ (version "0.1.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "portable-atomic-util" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "16s4ag42sjkkas49fnlj99kx9zxdfqwk7ii12js533dk4lb439x1"))))
+ (arguments
+ `(#:cargo-inputs (("rust-portable-atomic" ,rust-portable-atomic-1))))))
+
(define-public rust-portaudio-rs-0.3
(package
(name "rust-portaudio-rs")

base-commit: 779061ae3af8eeb2021dcab1b900b6d7c02e555f
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 04/25] gnu: Add rust-async-broadcast-0.7.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
1692f3e692921f79ff49da8fb528fe8144cf96a6.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-async-broadcast-0.7): New variable;
(rust-async-broadcast-0.6): inherit from rust-async-broadcast-0.7.

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

Toggle diff (64 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 754e957172..1375b6263d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4791,8 +4791,36 @@ (define-public rust-async-attributes-1
Rust.")
(license (list license:expat license:asl2.0))))
+(define-public rust-async-broadcast-0.7
+ (package
+ (name "rust-async-broadcast")
+ (version "0.7.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-broadcast" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0zia7z1y31awmxma9c89zmvkbj7mdkf7highkmz5z3pa4lp0xk90"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-event-listener" ,rust-event-listener-5)
+ ("rust-event-listener-strategy" ,rust-event-listener-strategy-0.5)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-pin-project-lite" ,rust-pin-project-lite-0.2))
+ #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3)
+ ("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-easy-parallel" ,rust-easy-parallel-3)
+ ("rust-futures-lite" ,rust-futures-lite-1)
+ ("rust-futures-util" ,rust-futures-util-0.3))))
+ (home-page "https://github.com/smol-rs/async-broadcast")
+ (synopsis "Async broadcast channels")
+ (description "This package provides async broadcast channels in Rust.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-async-broadcast-0.6
(package
+ (inherit rust-async-broadcast-0.7)
(name "rust-async-broadcast")
(version "0.6.0")
(source
@@ -4802,7 +4830,6 @@ (define-public rust-async-broadcast-0.6
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0d1xk2pr5khk1radkbaf7pp7pbjkb18m43n2rgkfsfxk177pak9k"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-event-listener" ,rust-event-listener-3)
@@ -4812,11 +4839,7 @@ (define-public rust-async-broadcast-0.6
("rust-doc-comment" ,rust-doc-comment-0.3)
("rust-easy-parallel" ,rust-easy-parallel-3)
("rust-futures-lite" ,rust-futures-lite-1)
- ("rust-futures-util" ,rust-futures-util-0.3))))
- (home-page "https://github.com/smol-rs/async-broadcast")
- (synopsis "Async broadcast channels")
- (description "This package provides async broadcast channels in Rust.")
- (license (list license:expat license:asl2.0))))
+ ("rust-futures-util" ,rust-futures-util-0.3))))))
(define-public rust-async-broadcast-0.5
(package
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 05/25] gnu: Add rust-async-fs-2.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
d9272be75721ddafffad6135a9cc2bad65f082d0.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-async-fs-2): New variable;
(rust-async-fs-1): inherit from rust-async-fs-2.

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

Toggle diff (62 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1375b6263d..794afa90f8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5102,23 +5102,22 @@ (define-public rust-async-executor-1
(description "This library provides async executors.")
(license (list license:asl2.0 license:expat))))
-(define-public rust-async-fs-1
+(define-public rust-async-fs-2
(package
(name "rust-async-fs")
- (version "1.6.0")
+ (version "2.1.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "async-fs" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "01if2h77mry9cnm91ql2md595108i2c1bfy9gaivzvjfcl2gk717"))))
+ (base32 "0jp0p7lg9zqy2djgdmivbzx0yqmfn9sm2s9dkhaws3zlharhkkgb"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs (("rust-async-lock" ,rust-async-lock-2)
- ("rust-autocfg" ,rust-autocfg-1)
+ `(#:cargo-inputs (("rust-async-lock" ,rust-async-lock-3)
("rust-blocking" ,rust-blocking-1)
- ("rust-futures-lite" ,rust-futures-lite-1))
+ ("rust-futures-lite" ,rust-futures-lite-2))
#:cargo-development-inputs (("rust-libc" ,rust-libc-0.2)
("rust-winapi" ,rust-winapi-0.3))))
(home-page "https://github.com/smol-rs/async-fs")
@@ -5126,6 +5125,26 @@ (define-public rust-async-fs-1
(description "This package provides async filesystem primitives.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-async-fs-1
+ (package
+ (inherit rust-async-fs-2)
+ (name "rust-async-fs")
+ (version "1.6.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-fs" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "01if2h77mry9cnm91ql2md595108i2c1bfy9gaivzvjfcl2gk717"))))
+ (arguments
+ `(#:cargo-inputs (("rust-async-lock" ,rust-async-lock-2)
+ ("rust-autocfg" ,rust-autocfg-1)
+ ("rust-blocking" ,rust-blocking-1)
+ ("rust-futures-lite" ,rust-futures-lite-1))
+ #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2)
+ ("rust-winapi" ,rust-winapi-0.3))))))
+
(define-public rust-async-generic-1
(package
(name "rust-async-generic")
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 06/25] gnu: Add rust-flaky-test-0.2.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
bfca81b7f08d5d7c3f3e20054fc33359dcd8e5f9.1730925790.git.goodoldpaul@autistici.org
rust-flaky-test-0.2 and rust-flaky-test-impl-0.2 are mutally dependents,
so this patch introduces both instead of the usual pattern of one
package per commit

* gnu/packages/crates-io.scm (rust-flaky-test-0.2): New variable;
(rust-flaky-test-impl-0.2): new variable;
(rust-flaky-test-0.1): inherit from rust-flaky-test-0.2.

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

Toggle diff (88 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 794afa90f8..1b67dc047d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27506,29 +27506,75 @@ (define-public rust-flagset-0.4
enumeration-based bit flags in rust.")
(license license:asl2.0)))
-(define-public rust-flaky-test-0.1
+(define-public rust-flaky-test-impl-0.2
+ (package
+ (name "rust-flaky-test-impl")
+ (version "0.2.2")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "flaky_test_impl" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1glshs6wa5n229d4abqzijssy4nslyaiw3xlwpd2ymghq84mkqw5"))))
+ (build-system cargo-build-system)
+ (arguments
+ ;; Tests fail with
+ ;; 3 | use flaky_test::flaky_test;
+ ;; | ^^^^^^^^^^ use of undeclared crate or module `flaky_test`
+ `(#:tests? #f
+ #:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-flaky-test" ,rust-flaky-test-0.2))))
+ (home-page "https://github.com/denoland/flaky_test")
+ (synopsis "Implementation details of the @code{flaky_test} macro")
+ (description "This package provides mplementation details of the
+@code{flaky_test} macro.")
+ (license license:expat)))
+
+(define-public rust-flaky-test-0.2
(package
(name "rust-flaky-test")
- (version "0.1.0")
+ (version "0.2.2")
(source (origin
(method url-fetch)
(uri (crate-uri "flaky_test" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "14yvm0knhcx0xfwlykir2v198x5bpwf333yrdl2mmkv8n5gdx727"))))
+ "1nn8hddhl2vaxgfn0j87yrngr9bzlxlncgdd9vy53xyp4cgslv04"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-proc-macro2" ,rust-proc-macro2-1)
- ("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1))))
+ (("rust-flaky-test-impl" ,rust-flaky-test-impl-0.2)
+ ("rust-future-utils" ,rust-futures-util-0.3))))
(home-page "https://github.com/denoland/flaky_test")
(synopsis "Atttribute macro for running a flaky test multiple times")
(description "This package provides an atttribute macro for running a flaky
test multiple times.")
(license license:expat)))
+(define-public rust-flaky-test-0.1
+ (package
+ (inherit rust-flaky-test-0.2)
+ (name "rust-flaky-test")
+ (version "0.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "flaky_test" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "14yvm0knhcx0xfwlykir2v198x5bpwf333yrdl2mmkv8n5gdx727"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))))
+
(define-public rust-flame-0.2
(package
(name "rust-flame")
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 07/25] gnu: Add rust-smol-2.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
152d35b1212821170b78b60aba57a24086c53541.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-smol-2): New variable;
(rust-smol-1): inherit from rust-smol-2.

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

Toggle diff (65 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1b67dc047d..8520b10d29 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -74868,8 +74868,37 @@ (define-public rust-smawk-0.3
monotone matrix.")
(license license:expat)))
+(define-public rust-smol-2
+ (package
+ (name "rust-smol")
+ (version "2.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "smol" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "17srgkyzswns43cnqcfb1846a8nsna47qj7wrk1rj8c9c3id6fx3"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-async-channel" ,rust-async-channel-2)
+ ("rust-async-executor" ,rust-async-executor-1)
+ ("rust-async-fs" ,rust-async-fs-2)
+ ("rust-async-io" ,rust-async-io-2)
+ ("rust-async-lock" ,rust-async-lock-3)
+ ("rust-async-net" ,rust-async-net-2)
+ ("rust-async-process" ,rust-async-process-2)
+ ("rust-blocking" ,rust-blocking-1)
+ ("rust-futures-lite" ,rust-futures-lite-2))))
+ (home-page "https://github.com/stjepang/smol")
+ (synopsis "Small and fast async runtime")
+ (description "This package provides a small and fast async runtime.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-smol-1
(package
+ (inherit rust-smol-2)
(name "rust-smol")
(version "1.2.5")
(source
@@ -74879,7 +74908,6 @@ (define-public rust-smol-1
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1r45zng0hymqx1kb2dmxkapbin7f9rhgrdcssz0q7rzka59kpkw5"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
@@ -74892,11 +74920,7 @@ (define-public rust-smol-1
("rust-async-process" ,rust-async-process-1)
("rust-blocking" ,rust-blocking-1)
("rust-futures-lite" ,rust-futures-lite-1)
- ("rust-once-cell" ,rust-once-cell-1))))
- (home-page "https://github.com/stjepang/smol")
- (synopsis "Small and fast async runtime")
- (description "This package provides a small and fast async runtime.")
- (license (list license:asl2.0 license:expat))))
+ ("rust-once-cell" ,rust-once-cell-1))))))
(define-public rust-smol-0.1
(package
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 08/25] gnu: Add rust-async-task-4.7.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
49a7d40788bc669c691d15191052aaff3cc6ddf9.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-async-task-4.7): New variable;
(rust-async-task-4): inherit from rust-async-task-4.

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

Toggle diff (70 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8520b10d29..6a76de8399 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5902,33 +5902,56 @@ (define-public rust-async-stream-impl-0.3
crate.")
(license license:expat)))
-(define-public rust-async-task-4
+(define-public rust-async-task-4.7
(package
(name "rust-async-task")
- (version "4.4.0")
+ (version "4.7.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "async-task" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1bis5aqnjw3gxridzpq2cwrlj4y8alrfqy19rly6ag2vh50spizc"))))
+ (base32 "1pp3avr4ri2nbh7s6y9ws0397nkx1zymmcr14sq761ljarh3axcb"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-development-inputs
+ `(#:cargo-inputs (("rust-portable-atomic" ,rust-portable-atomic-1))
+ #:cargo-development-inputs
(("rust-atomic-waker" ,rust-atomic-waker-1)
("rust-easy-parallel" ,rust-easy-parallel-3)
- ("rust-flaky-test" ,rust-flaky-test-0.1)
- ("rust-flume" ,rust-flume-0.10)
+ ("rust-flaky-test" ,rust-flaky-test-0.2)
+ ("rust-flume" ,rust-flume-0.11)
("rust-futures-lite" ,rust-futures-lite-1)
("rust-once-cell" ,rust-once-cell-1)
- ("rust-smol" ,rust-smol-1))))
+ ("rust-smol" ,rust-smol-2))))
(home-page "https://github.com/stjepang/async-task")
(synopsis "Task abstraction for building executors")
(description
"This package provides a task abstraction for building executors.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-async-task-4
+ (package
+ (inherit rust-async-task-4.7)
+ (name "rust-async-task")
+ (version "4.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-task" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1bis5aqnjw3gxridzpq2cwrlj4y8alrfqy19rly6ag2vh50spizc"))))
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-atomic-waker" ,rust-atomic-waker-1)
+ ("rust-easy-parallel" ,rust-easy-parallel-3)
+ ("rust-flaky-test" ,rust-flaky-test-0.1)
+ ("rust-flume" ,rust-flume-0.10)
+ ("rust-futures-lite" ,rust-futures-lite-1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-smol" ,rust-smol-1))))))
+
(define-public rust-async-task-3
(package
(inherit rust-async-task-4)
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 02/25] gnu: Add rust-event-listener-5.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
ca60a7962ca5525d573723c04b3eefb3a9a55733.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-event-listener-5): New variable;
(rust-event-listener-4): inherit from rust-event-listener-5.

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

Toggle diff (79 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8c2ef6a394..b781b2c46c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25430,25 +25430,31 @@ (define-public rust-evdev-sys-0.2
bindings are available in the @code{evdev} crate.")
(license (list license:expat license:asl2.0))))
-(define-public rust-event-listener-4
+(define-public rust-event-listener-5
(package
(name "rust-event-listener")
- (version "4.0.3")
+ (version "5.3.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "event-listener" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0vk4smw1vf871vi76af1zn7w69jg3zmpjddpby2qq91bkg21bck7"))))
+ (base32 "1fkm6q4hjn61wl52xyqyyxai0x9w0ngrzi0wf1qsf8vhsadvwck0"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "Cargo.toml"
+ ;; Patch try-lock version
+ (("0\\.2\\.5") "0.2.4"))))))
(build-system cargo-build-system)
(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-inputs (("rust-concurrent-queue" ,rust-concurrent-queue-2)
+ ("rust-loom" ,rust-loom-0.7)
+ ("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.2))
#:cargo-development-inputs
(("rust-criterion" ,rust-criterion-0.5)
("rust-futures-lite" ,rust-futures-lite-2)
@@ -25462,6 +25468,31 @@ (define-public rust-event-listener-4
blocking data structures.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-event-listener-4
+ (package
+ (inherit rust-event-listener-5)
+ (name "rust-event-listener")
+ (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 "0vk4smw1vf871vi76af1zn7w69jg3zmpjddpby2qq91bkg21bck7"))))
+ (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.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))))))
+
(define-public rust-event-listener-3
(package
(inherit rust-event-listener-4)
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 09/25] gnu: Add rust-async-process-2.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
6fb2c7372a12fdf174da49a5950d4d4d80f2163b.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-async-process-2): New variable;
(rust-async-process-1): inherit from rust-async-process-2.

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

Toggle diff (88 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6a76de8399..1233a0d9b4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5581,17 +5581,17 @@ (define-public rust-async-priority-channel-0.1
delivered in order of priority.")
(license (list license:asl2.0 license:expat))))
-(define-public rust-async-process-1
+(define-public rust-async-process-2
(package
(name "rust-async-process")
- (version "1.8.1")
+ (version "2.3.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "async-process" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "126s968lvhg9rlwsnxp7wfzkfn7rl87p0dlvqqlibn081ax3hr7a"))))
+ (base32 "1fr6cpqdw7hrmzns1983lgx86cg8vyz7nlrn0h0125iqq8fmy9b3"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-test-flags
@@ -5601,15 +5601,17 @@ (define-public rust-async-process-1
"--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)
+ #:cargo-inputs (("rust-async-channel" ,rust-async-channel-2)
+ ("rust-async-io" ,rust-async-io-2)
+ ("rust-async-lock" ,rust-async-lock-3)
("rust-async-signal" ,rust-async-signal-0.2)
+ ("rust-async-task" ,rust-async-task-4.7)
("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-event-listener" ,rust-event-listener-5)
+ ("rust-futures-lite" ,rust-futures-lite-2)
("rust-rustix" ,rust-rustix-0.38)
- ("rust-windows-sys" ,rust-windows-sys-0.48))
+ ("rust-tracing" ,rust-tracing-0.1))
#: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")
@@ -5623,6 +5625,37 @@ (define-public rust-async-process-1
a running Child leaks its resources.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-async-process-1
+ (package
+ (inherit rust-async-process-2)
+ (name "rust-async-process")
+ (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 "126s968lvhg9rlwsnxp7wfzkfn7rl87p0dlvqqlibn081ax3hr7a"))))
+ (arguments
+ `(#: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))))))
+
(define-public rust-async-ready-3
(package
(name "rust-async-ready")
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 10/25] gnu: Add rust-tokio-vsock-0.4.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
7ebe562efaa82e466897c70646987e04e99154b9.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-tokio-vsock-0.4): New variable;
(rust-tokio-vsock-0.3): inherit from rust-tokio-vsock-0.4.

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

Toggle diff (67 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1233a0d9b4..bec4e4d5e5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -86151,8 +86151,38 @@ (define-public rust-tokio-util-0.2
("rust-tokio" ,rust-tokio-0.2)
("rust-tokio-test" ,rust-tokio-test-0.2))))))
+(define-public rust-tokio-vsock-0.4
+ (package
+ (name "rust-tokio-vsock")
+ (version "0.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tokio-vsock" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1p88jaypkjicj5rfkj7hmx1jcs2v7cbgyzil084zk4dwn4amr8aj"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-tokio" ,rust-tokio-1)
+ ("rust-tonic" ,rust-tonic-0.8)
+ ("rust-vsock" ,rust-vsock-0.3))
+ #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8)
+ ("rust-sha2" ,rust-sha2-0.9)
+ ("rust-tokio" ,rust-tokio-1))))
+ (home-page "https://github.com/rust-vsock/tokio-vsock")
+ (synopsis "Asynchronous Virtio socket support for Rust")
+ (description
+ "This package provides asynchronous Virtio socket support for Rust.")
+ (license license:asl2.0)))
+
(define-public rust-tokio-vsock-0.3
(package
+ (inherit rust-tokio-vsock-0.4)
(name "rust-tokio-vsock")
(version "0.3.4")
(source (origin
@@ -86162,7 +86192,6 @@ (define-public rust-tokio-vsock-0.3
(sha256
(base32
"1g1fhsibfdgsqayjr9gxkd5npgxh8rj36pcb9pi1c7ci51l5acwv"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-test-flags
'("--release" "--" "--skip=test_vsock_server")
@@ -86176,12 +86205,7 @@ (define-public rust-tokio-vsock-0.3
#:cargo-development-inputs
(("rust-rand" ,rust-rand-0.8)
("rust-sha2" ,rust-sha2-0.9)
- ("rust-tokio" ,rust-tokio-1))))
- (home-page "https://github.com/rust-vsock/tokio-vsock")
- (synopsis "Asynchronous Virtio socket support for Rust")
- (description
- "This package provides asynchronous Virtio socket support for Rust.")
- (license license:asl2.0)))
+ ("rust-tokio" ,rust-tokio-1))))))
(define-public rust-toml-0.8
(package
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 03/25] gnu: Add rust-event-listener-strategy-0.5.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
ac4abb928450ade61231dd8dd26fe892a7193d11.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-event-listener-strategy-0.5): New
variable;
(rust-event-listener-strategy-0.4): inherit from rust-event-listener-strategy-0.5.

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

Toggle diff (57 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b781b2c46c..754e957172 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25535,20 +25535,20 @@ (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
+(define-public rust-event-listener-strategy-0.5
(package
(name "rust-event-listener-strategy")
- (version "0.4.0")
+ (version "0.5.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "event-listener-strategy" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1lwprdjqp2ibbxhgm9khw7s7y7k4xiqj5i5yprqiks6mnrq4v3lm"))))
+ (base32 "18f5ri227khkayhv3ndv7yl4rnasgwksl2jhwgafcxzr7324s88g"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs (("rust-event-listener" ,rust-event-listener-4)
+ `(#:cargo-inputs (("rust-event-listener" ,rust-event-listener-5)
("rust-pin-project-lite" ,rust-pin-project-lite-0.2))
#:cargo-development-inputs
(("rust-futures-lite" ,rust-futures-lite-2)
@@ -25558,6 +25558,25 @@ (define-public rust-event-listener-strategy-0.4
(description "This package provides block and poll on event_listener.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-event-listener-strategy-0.4
+ (package
+ (inherit rust-event-listener-strategy-0.5)
+ (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"))))
+ (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))))))
+
(define-public rust-event-listener-strategy-0.1
(package
(inherit rust-event-listener-strategy-0.4)
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 11/25] gnu: Add rust-vsock-0.5.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
d5206ec85be9bbdb5fa4dafdf80daa862e7de827.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-vsock-0.5): New variable;
(rust-vsock-0.3): inherit from rust-vsock-0.5.

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

Toggle diff (61 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bec4e4d5e5..80f9f7f8cb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -91430,8 +91430,33 @@ (define-public rust-void-1
"The uninhabited void type for use in statically impossible cases.")
(license license:expat)))
+(define-public rust-vsock-0.5
+ (package
+ (name "rust-vsock")
+ (version "0.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "vsock" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1276xvg0jadqvxw26m2018fbsi8lvgx3i5x0hvy4gwbjwq04v2sf"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; Tests not runnable from the build environment.
+ #:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+ ("rust-nix" ,rust-nix-0.29))
+ #:cargo-development-inputs
+ (("rust-rand" ,rust-rand-0.8)
+ ("rust-sha2" ,rust-sha2-0.10))))
+ (home-page "https://github.com/rust-vsock/vsock-rs")
+ (synopsis "Virtio socket support for Rust")
+ (description "This package provdies virtio socket support for Rust.")
+ (license license:asl2.0)))
+
(define-public rust-vsock-0.3
(package
+ (inherit rust-vsock-0.5)
(name "rust-vsock")
(version "0.3.0")
(source (origin
@@ -91441,7 +91466,6 @@ (define-public rust-vsock-0.3
(sha256
(base32
"0mwwcjk2yd3fi5ryv5xhd7569bmcj0dlsmi4bh4jh6qypzq1v3jc"))))
- (build-system cargo-build-system)
(arguments
`(#:tests? #f ; Tests not runnable from the build environment.
#:cargo-inputs
@@ -91449,11 +91473,7 @@ (define-public rust-vsock-0.3
("rust-nix" ,rust-nix-0.24))
#:cargo-development-inputs
(("rust-rand" ,rust-rand-0.8)
- ("rust-sha2" ,rust-sha2-0.10))))
- (home-page "https://github.com/rust-vsock/vsock-rs")
- (synopsis "Virtio socket support for Rust")
- (description "This package provdies virtio socket support for Rust.")
- (license license:asl2.0)))
+ ("rust-sha2" ,rust-sha2-0.10))))))
(define-public rust-vsock-0.2
(package
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 12/25] gnu: Add rust-zvariant-utils-2.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
04e415a2742783815418bd4154516ab5c2a0112a.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-zvariant-utils-2): New variable;
(rust-zvariant-utils-1): inherit from rust-zvariant-utils-2.

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

Toggle diff (65 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 80f9f7f8cb..c36fbb05b6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -95497,8 +95497,40 @@ (define-public rust-zvariant-derive-2
("rust-serde-repr" ,rust-serde-repr-0.1)
("rust-zvariant" ,rust-zvariant-2))))))
+(define-public rust-zvariant-utils-2
+ (package
+ (name "rust-zvariant-utils")
+ (version "2.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "zvariant_utils" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0h43h3jcw8rmjr390rdqnhkb9nn3913pgkvb75am1frxrkvwy6y5"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "Cargo.toml"
+ ;; Patch proc-macro2 version
+ (("1\\.0\\.81") "1.0.79")
+ ;; Patch quote version
+ (("1\\.0\\.36") "1.0.35")
+ ;; Patch syn version
+ (("2\\.0\\.64") "2.0.48"))))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-2))))
+ (home-page "https://github.com/dbus2/zbus/")
+ (synopsis "Utilities used internally by the zvariant crate")
+ (description "Various utilities used internally by the zvariant crate.")
+ (license license:expat)))
+
(define-public rust-zvariant-utils-1
(package
+ (inherit rust-zvariant-utils-2)
(name "rust-zvariant-utils")
(version "1.0.1")
(source (origin
@@ -95508,16 +95540,11 @@ (define-public rust-zvariant-utils-1
(sha256
(base32
"00625h3240rixvfhq6yhws1d4bwf3vrf74v8s69b97aq27cg0d3j"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1))))
- (home-page "https://github.com/dbus2/zbus/")
- (synopsis "Utilities used internally by the zvariant crate")
- (description "Various utilities used internally by the zvariant crate.")
- (license license:expat)))
+ ("rust-syn" ,rust-syn-1))))))
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:42 +0100
[PATCH rust-team 13/25] gnu: Add rust-zbus-macros-4.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
c6a4551e2aea50b0c19c896f189b130270bcae90.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-zbus-macros-4): New variable;
(rust-zbus-macros-3): inherit from rust-zbus-macros-4.

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

Toggle diff (79 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c36fbb05b6..96ce2603a6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -94618,8 +94618,51 @@ (define-public rust-zbus-1
("rust-ntest" ,rust-ntest-0.7)
("rust-zbus-polkit" ,rust-zbus-polkit-1))))))
+(define-public rust-zbus-macros-4
+ (package
+ (name "rust-zbus-macros")
+ (version "4.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "zbus_macros" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0glqn6ddgv4ra734p343a41rrxb0phy1v13dljzhpsc1f10bjz96"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "Cargo.toml"
+ ;; Patch proc-macro2 version
+ (("1\\.0\\.81") "1.0.79")
+ ;; Patch quote version
+ (("1\\.0\\.36") "1.0.35")
+ ;; Patch syn version
+ (("2\\.0\\.64") "2.0.48")
+ ;; Patch async-io version
+ (("2\\.3\\.2") "2.3.1"))))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; Tests need a running dbus instance.
+ #: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-zvariant-utils" ,rust-zvariant-utils-2))
+ #:cargo-development-inputs
+ (("rust-async-io" ,rust-async-io-2)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-rustversion" ,rust-rustversion-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-trybuild" ,rust-trybuild-1))))
+ (home-page "https://github.com/dbus2/zbus/")
+ (synopsis "proc-macros for zbus")
+ (description "This package provides proc-macros for zbus.")
+ (license license:expat)))
+
(define-public rust-zbus-macros-3
(package
+ (inherit rust-zbus-macros-4)
(name "rust-zbus-macros")
(version "3.14.1")
(source
@@ -94629,7 +94672,6 @@ (define-public rust-zbus-macros-3
(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)
@@ -94643,11 +94685,7 @@ (define-public rust-zbus-macros-3
("rust-futures-util" ,rust-futures-util-0.3)
("rust-rustversion" ,rust-rustversion-1)
("rust-serde" ,rust-serde-1)
- ("rust-trybuild" ,rust-trybuild-1))))
- (home-page "https://github.com/dbus2/zbus/")
- (synopsis "proc-macros for zbus")
- (description "This package provides proc-macros for zbus.")
- (license license:expat)))
+ ("rust-trybuild" ,rust-trybuild-1))))))
(define-public rust-zbus-macros-1
(package
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:43 +0100
[PATCH rust-team 14/25] gnu: Add rust-endi-1.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
61927fc744d2c0b3d9ee7aacb7f2c7d2585a054d.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-endi-1): New variable.

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

Toggle diff (30 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 96ce2603a6..654f8bebef 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24233,6 +24233,23 @@ (define-public rust-encoding-rs-io-0.1
"Streaming transcoding for encoding_rs.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-endi-1
+ (package
+ (name "rust-endi")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "endi" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1gxp388g2zzbncp3rdn60wxkr49xbhhx94nl9p4a6c41w4ma7n53"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/zeenix/endi")
+ (synopsis "simple endian-handling library")
+ (description "This package provides a simple endian-handling library.")
+ (license license:expat)))
+
(define-public rust-endian-type-0.1
(package
(name "rust-endian-type")
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:43 +0100
[PATCH rust-team 20/25] gnu: Add rust-async-executor-1.11.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
d9c25babcb4776312f84963ce68fee5e7752820a.1730925791.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-async-executor-1.11): New variable;
(rust-async-executor-1): inherit from rust-async-executor-1.11.

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

Toggle diff (74 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 454756d3bc..fad2244133 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5070,17 +5070,17 @@ (define-public rust-async-dup-1
AsyncSeek if the inner type does.")
(license (list license:asl2.0 license:expat))))
-(define-public rust-async-executor-1
+(define-public rust-async-executor-1.11
(package
(name "rust-async-executor")
- (version "1.5.1")
+ (version "1.11.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "async-executor" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1yrs723d4djhia5mimc85blrvly0kl8bj260b5vz0r4559gxr8vg"))))
+ (base32 "16mj0v0ahpidhvyl739gh8dlnzp4qhi8p3ynk48kbcvq743040mi"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -5091,9 +5091,9 @@ (define-public rust-async-executor-1
("rust-futures-lite" ,rust-futures-lite-1)
("rust-slab" ,rust-slab-0.4))
#:cargo-development-inputs
- (("rust-async-channel" ,rust-async-channel-1)
+ (("rust-async-channel" ,rust-async-channel-2)
("rust-async-io" ,rust-async-io-1)
- ("rust-criterion" ,rust-criterion-0.4)
+ ("rust-criterion" ,rust-criterion-0.5)
("rust-easy-parallel" ,rust-easy-parallel-3)
("rust-num-cpus" ,rust-num-cpus-1)
("rust-once-cell" ,rust-once-cell-1))))
@@ -5102,6 +5102,34 @@ (define-public rust-async-executor-1
(description "This library provides async executors.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-async-executor-1
+ (package
+ (inherit rust-async-executor-1.11)
+ (name "rust-async-executor")
+ (version "1.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-executor" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1yrs723d4djhia5mimc85blrvly0kl8bj260b5vz0r4559gxr8vg"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-async-lock" ,rust-async-lock-2)
+ ("rust-async-task" ,rust-async-task-4)
+ ("rust-concurrent-queue" ,rust-concurrent-queue-2)
+ ("rust-fastrand" ,rust-fastrand-1)
+ ("rust-futures-lite" ,rust-futures-lite-1)
+ ("rust-slab" ,rust-slab-0.4))
+ #:cargo-development-inputs
+ (("rust-async-channel" ,rust-async-channel-1)
+ ("rust-async-io" ,rust-async-io-1)
+ ("rust-criterion" ,rust-criterion-0.4)
+ ("rust-easy-parallel" ,rust-easy-parallel-3)
+ ("rust-num-cpus" ,rust-num-cpus-1)
+ ("rust-once-cell" ,rust-once-cell-1))))))
+
(define-public rust-async-fs-2
(package
(name "rust-async-fs")
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:43 +0100
[PATCH rust-team 15/25] gnu: Add rust-zvariant-derive-4.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
7db089ae9ac73ea84103e56a6bc5a195d8fa73a8.1730925790.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-zvariant-derive-4): New variable;
(rust-zvariant-derive-3): inherit from rust-zvariant-derive-4.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 654f8bebef..455f3b3215 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -95497,8 +95497,52 @@ (define-public rust-zvariant-2
("rust-serde-json" ,rust-serde-json-1)
("rust-serde-repr" ,rust-serde-repr-0.1))))))
+(define-public rust-zvariant-derive-4
+ (package
+ (name "rust-zvariant-derive")
+ (version "4.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "zvariant_derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0jf408h0s83krxwm7wl62fnssin1kcklmb1bcn83ls6sddabmqkk"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "Cargo.toml"
+ ;; Patch proc-macro2 version
+ (("1\\.0\\.81") "1.0.79")
+ ;; Patch quote version
+ (("1\\.0\\.36") "1.0.35")
+ ;; Patch syn version
+ (("2\\.0\\.64") "2.0.48")
+ ;; Patch enumflags2 version
+ (("0\\.7\\.9") "0.7.7")
+ ;; Patch serde_repr version
+ (("0\\.1\\.19") "0.1.18"))))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; Needs unstable features.
+ #: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-zvariant-utils" ,rust-zvariant-utils-2))
+ #:cargo-development-inputs
+ (("rust-byteorder" ,rust-byteorder-1)
+ ("rust-enumflags2" ,rust-enumflags2-0.7)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-repr" ,rust-serde-repr-0.1))))
+ (home-page "https://github.com/dbus2/zbus/")
+ (synopsis "D-Bus & GVariant encoding & decoding")
+ (description "D-Bus & GVariant encoding & decoding")
+ (license license:expat)))
+
(define-public rust-zvariant-derive-3
(package
+ (inherit rust-zvariant-derive-4)
(name "rust-zvariant-derive")
(version "3.15.0")
(source (origin
@@ -95508,7 +95552,6 @@ (define-public rust-zvariant-derive-3
(sha256
(base32
"1kcfgpqshggr5v7dwldjggix79zcyj7fizw7dkh6w39iziyplkck"))))
- (build-system cargo-build-system)
(arguments
`(#:tests? #f ; Needs unstable features.
#:cargo-inputs
@@ -95521,11 +95564,7 @@ (define-public rust-zvariant-derive-3
(("rust-byteorder" ,rust-byteorder-1)
("rust-enumflags2" ,rust-enumflags2-0.7)
("rust-serde" ,rust-serde-1)
- ("rust-serde-repr" ,rust-serde-repr-0.1))))
- (home-page "https://github.com/dbus2/zbus/")
- (synopsis "D-Bus & GVariant encoding & decoding")
- (description "D-Bus & GVariant encoding & decoding")
- (license license:expat)))
+ ("rust-serde-repr" ,rust-serde-repr-0.1))))))
(define-public rust-zvariant-derive-2
(package
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:43 +0100
[PATCH rust-team 21/25] gnu: Add rust-blocking-1.6.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
1a817abc6cecb9fe22a2ca509e75b20f3bb00153.1730925791.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-blocking-1.6): New variable;
(rust-blocking-1): inherit from rust-blocking-1.6.

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

Toggle diff (68 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fad2244133..8328234c65 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9041,8 +9041,38 @@ (define-public rust-block-padding-0.1
`(#:cargo-inputs
(("rust-byte-tools" ,rust-byte-tools-0.3))))))
+(define-public rust-blocking-1.6
+ (package
+ (name "rust-blocking")
+ (version "1.6.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "blocking" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1si99l8zp7c4zq87y35ayjgc5c9b60jb8h0k14zfcs679z2l2gvh"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-async-channel" ,rust-async-channel-2)
+ ("rust-async-task" ,rust-async-task-4)
+ ("rust-futures-io" ,rust-futures-io-0.3)
+ ("rust-futures-lite" ,rust-futures-lite-2)
+ ("rust-piper" ,rust-piper-0.2)
+ ("rust-tracing" ,rust-tracing-0.1))
+ #:cargo-development-inputs
+ (("rust-futures-lite" ,rust-futures-lite-1))))
+ (home-page "https://github.com/smol-rs/blocking")
+ (synopsis "Thread pool for isolating blocking I/O in async programs")
+ (description
+ "This package provides a thread pool for isolating blocking I/O in async
+programs.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-blocking-1
(package
+ (inherit rust-blocking-1.6)
(name "rust-blocking")
(version "1.4.1")
(source
@@ -9052,7 +9082,6 @@ (define-public rust-blocking-1
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0aiy8y524jvxl942hh5naxjjn7b5rjapsjqb6vfv6x45sk8a8dlc"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-async-channel" ,rust-async-channel-1)
@@ -9064,13 +9093,7 @@ (define-public rust-blocking-1
("rust-piper" ,rust-piper-0.2)
("rust-tracing" ,rust-tracing-0.1))
#:cargo-development-inputs
- (("rust-futures-lite" ,rust-futures-lite-1))))
- (home-page "https://github.com/smol-rs/blocking")
- (synopsis "Thread pool for isolating blocking I/O in async programs")
- (description
- "This package provides a thread pool for isolating blocking I/O in async
-programs.")
- (license (list license:asl2.0 license:expat))))
+ (("rust-futures-lite" ,rust-futures-lite-1))))))
(define-public rust-blocking-0.6
(package
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:43 +0100
[PATCH rust-team 22/25] gnu: Add rust-xdg-home-1.1.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
8d3d69d4d6a460799aff3a7e7825ce7715ac2f30.1730925791.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-xdg-home-1.1): New variable;
(rust-xdg-home-1): inherit from rust-xdg-home-1.1.

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

Toggle diff (55 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8328234c65..3d2856f275 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -94021,17 +94021,17 @@ (define-public rust-xdg-2
(license (list license:asl2.0
license:expat))))
-(define-public rust-xdg-home-1
+(define-public rust-xdg-home-1.1
(package
(name "rust-xdg-home")
- (version "1.0.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "xdg-home" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1kbd1ks8bvpsay6lgk60yaf1w13daaf75ghmslan031ss4y20s97"))))
+ (base32 "13mkcfgngnc1fpdg5737hvhjkp95bc9w2ngqdjnri0ybqcjs7r91"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-nix" ,rust-nix-0.26)
@@ -94046,6 +94046,27 @@ (define-public rust-xdg-home-1
(description "The user's home directory as per the XDG Specification.")
(license license:expat)))
+(define-public rust-xdg-home-1
+ (package
+ (inherit rust-xdg-home-1.1)
+ (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"))))
+ (arguments
+ `(#:cargo-inputs (("rust-nix" ,rust-nix-0.26)
+ ("rust-winapi" ,rust-winapi-0.3))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda _
+ (setenv "HOME" (getcwd)))))))))
+
(define-public rust-xflags-macros-0.2
(package
(name "rust-xflags-macros")
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:43 +0100
[PATCH rust-team 16/25] gnu: Add rust-uuid-macro-internal-1.8.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
e094bf56156a1bd772094b32383870b48287dcf2.1730925791.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-uuid-macro-internal-1.8): New
variable;
(rust-uuid-macro-internal-1): inherit from rust-uuid-macro-internal-1.8.

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

Toggle diff (52 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 455f3b3215..ca412c691a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -90713,17 +90713,17 @@ (define-public rust-uuid-0.5
("rust-serde" ,rust-serde-1)
("rust-sha1" ,rust-sha1-0.2))))))
-(define-public rust-uuid-macro-internal-1
+(define-public rust-uuid-macro-internal-1.8
(package
(name "rust-uuid-macro-internal")
- (version "1.6.1")
+ (version "1.8.0")
(source (origin
(method url-fetch)
(uri (crate-uri "uuid-macro-internal" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0pl474ljbn40f08a8asy26bhdlwz4cr1k88h0w80l15q7lzpz7pl"))))
+ "18n10d9himcn2a5lwc3hw8178j6hdk1pidxkk9nf71z6rfkvx0cq"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -90738,6 +90738,24 @@ (define-public rust-uuid-macro-internal-1
;; The user can choose either license.
(license (list license:asl2.0 license:expat))))
+(define-public rust-uuid-macro-internal-1
+ (package
+ (inherit rust-uuid-macro-internal-1.8)
+ (name "rust-uuid-macro-internal")
+ (version "1.6.1")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "uuid-macro-internal" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0pl474ljbn40f08a8asy26bhdlwz4cr1k88h0w80l15q7lzpz7pl"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-2))))))
+
(define-public rust-uutils-term-grid-0.6
(package
(name "rust-uutils-term-grid")
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:43 +0100
[PATCH rust-team 17/25] gnu: Add rust-uuid-1.8.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
99f2fd6a0b517ef51994978f10abc81ee5f5d396.1730925791.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-uuid-1.8): New variable;
(rust-uuid-1): inherit from rust-uuid-1.8.

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

Toggle diff (83 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ca412c691a..74cc7ff8eb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -90586,17 +90586,17 @@ (define-public rust-uuhelp-parser-0.0.25
of help files.")
(license license:expat)))
-(define-public rust-uuid-1
+(define-public rust-uuid-1.8
(package
(name "rust-uuid")
- (version "1.6.1")
+ (version "1.8.0")
(source (origin
(method url-fetch)
(uri (crate-uri "uuid" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0q45jxahvysldn3iy04m8xmr8hgig80855y9gq9di8x72v7myfay"))))
+ "1h7wks153j08xmdk06wnza3is8pn6j37hihd3kfv95xsxrzwz0x1"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -90610,7 +90610,7 @@ (define-public rust-uuid-1
("rust-serde" ,rust-serde-1)
("rust-sha1-smol" ,rust-sha1-smol-1)
("rust-slog" ,rust-slog-2)
- ("rust-uuid-macro-internal" ,rust-uuid-macro-internal-1)
+ ("rust-uuid-macro-internal" ,rust-uuid-macro-internal-1.8)
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
("rust-zerocopy" ,rust-zerocopy-0.6))
#:cargo-development-inputs
@@ -90630,6 +90630,46 @@ (define-public rust-uuid-1
;; The user can choose either license.
(license (list license:asl2.0 license:expat))))
+(define-public rust-uuid-1
+ (package
+ (inherit rust-uuid-1.8)
+ (name "rust-uuid")
+ (version "1.6.1")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "uuid" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0q45jxahvysldn3iy04m8xmr8hgig80855y9gq9di8x72v7myfay"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-arbitrary" ,rust-arbitrary-1)
+ ("rust-atomic" ,rust-atomic-0.5)
+ ("rust-borsh" ,rust-borsh-0.10)
+ ("rust-bytemuck" ,rust-bytemuck-1)
+ ("rust-getrandom" ,rust-getrandom-0.2)
+ ("rust-md-5" ,rust-md-5-0.10)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-sha1-smol" ,rust-sha1-smol-1)
+ ("rust-slog" ,rust-slog-2)
+ ("rust-uuid-macro-internal" ,rust-uuid-macro-internal-1)
+ ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+ ("rust-zerocopy" ,rust-zerocopy-0.6))
+ #:cargo-development-inputs
+ (("rust-bincode" ,rust-bincode-1)
+ ("rust-rustversion" ,rust-rustversion-1)
+ ("rust-serde-derive" ,rust-serde-derive-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-serde-test" ,rust-serde-test-1)
+ ("rust-trybuild" ,rust-trybuild-1)
+ ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+ ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
+ ("rust-windows-sys" ,rust-windows-sys-0.48))))
+ (home-page "https://github.com/uuid-rs/uuid")
+ (synopsis "Library to generate and parse UUIDs")))
+
(define-public rust-uuid-0.8
(package
(inherit rust-uuid-1)
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:43 +0100
[PATCH rust-team 23/25] gnu: Add rust-zbus-xml-4.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
e4688c0d00f14d26f7cd849f169a5ce1d02c24b6.1730925791.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-zbus-xml-4): New variable.

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

Toggle diff (38 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3d2856f275..6639ab701b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -94923,6 +94923,31 @@ (define-public rust-zbus-polkit-1
(description "@code{PolicyKit} binding.")
(license license:expat)))
+(define-public rust-zbus-xml-4
+ (package
+ (name "rust-zbus-xml")
+ (version "4.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "zbus_xml" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0cx2yg4p0vkrgn5ccz6ds2wqzcy9wrwyjv5xnjmzcm5ra92kfgxb"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-quick-xml" ,rust-quick-xml-0.30)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-static-assertions" ,rust-static-assertions-1)
+ ("rust-zbus-names" ,rust-zbus-names-3)
+ ("rust-zvariant" ,rust-zvariant-4))
+ #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3))))
+ (home-page "https://github.com/dbus2/zbus/")
+ (synopsis "API to handle D-Bus introspection XML")
+ (description
+ "This package provides API to handle D-Bus introspection XML.")
+ (license license:expat)))
+
(define-public rust-zerocopy-0.7
(package
(name "rust-zerocopy")
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:43 +0100
[PATCH rust-team 24/25] gnu: Add rust-async-recursion-1.1.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
48b11742050afece4b81194cfeb650496301dd08.1730925791.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-async-recursion-1.1): New variable;
(rust-async-recursion-1): inherit from rust-async-recursion-1.1.

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

Toggle diff (64 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6639ab701b..ebebe0f525 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5705,8 +5705,36 @@ (define-public rust-async-ready-3
futures.")
(license (list license:expat license:asl2.0))))
+(define-public rust-async-recursion-1.1
+ (package
+ (name "rust-async-recursion")
+ (version "1.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-recursion" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "04ac4zh8qz2xjc79lmfi4jlqj5f92xjvfaqvbzwkizyqd4pl4hrv"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; TODO: Tests unexpectedly pass.
+ #:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-2))
+ #:cargo-development-inputs
+ (("rust-futures-executor" ,rust-futures-executor-0.3)
+ ("rust-macrotest" ,rust-macrotest-1)
+ ("rust-trybuild" ,rust-trybuild-1))))
+ (home-page "https://github.com/dcchut/async-recursion")
+ (synopsis "Recursion for async functions")
+ (description "This package provides Recursion for async functions.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-async-recursion-1
(package
+ (inherit rust-async-recursion-1.1)
(name "rust-async-recursion")
(version "1.0.4")
(source (origin
@@ -5716,7 +5744,6 @@ (define-public rust-async-recursion-1
(sha256
(base32
"1fhwz7jqgsakbjsr2nrsvgs245l1m5dkzir6f9fxw4ngwrywx5qf"))))
- (build-system cargo-build-system)
(arguments
`(#:tests? #f ; TODO: Tests unexpectedly pass.
#:cargo-inputs
@@ -5725,11 +5752,7 @@ (define-public rust-async-recursion-1
("rust-syn" ,rust-syn-2))
#:cargo-development-inputs
(("rust-futures-executor" ,rust-futures-executor-0.3)
- ("rust-trybuild" ,rust-trybuild-1))))
- (home-page "https://github.com/dcchut/async-recursion")
- (synopsis "Recursion for async functions")
- (description "This package provides recursion for async functions in Rust.")
- (license (list license:expat license:asl2.0))))
+ ("rust-trybuild" ,rust-trybuild-1))))))
(define-public rust-async-session-3
(package
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:43 +0100
[PATCH rust-team 18/25] gnu: Add rust-zvariant-4.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
f6ed389cbad6d29095bafd909970a08758158b6d.1730925791.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-zvariant-4): New variable;
(rust-zvariant-3): inherit from rust-zvariant-4.

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

Toggle diff (90 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 74cc7ff8eb..a3cfe55325 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -95484,8 +95484,58 @@ (define-public rust-zune-inflate-0.2
in Pure Rust.")
(license (list license:expat license:asl2.0))))
+(define-public rust-zvariant-4
+ (package
+ (name "rust-zvariant")
+ (version "4.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "zvariant" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1zl1ika7zd9bxkd0bqc78h9bykvk6xc98965iz1p3i51p452k110"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "Cargo.toml"
+ ;; Patch enumflags2 version
+ (("0\\.7\\.9") "0.7.7")
+ ;; Patch serde_repr version
+ (("0\\.1\\.19") "0.1.18"))))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; overflow evaluating the requirement `PhantomData<Vec<u8>>:
+ #:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.7)
+ ("rust-chrono" ,rust-chrono-0.4)
+ ("rust-endi" ,rust-endi-1)
+ ("rust-enumflags2" ,rust-enumflags2-0.7)
+ ("rust-heapless" ,rust-heapless-0.8)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+ ("rust-static-assertions" ,rust-static-assertions-1)
+ ("rust-time" ,rust-time-0.3)
+ ("rust-url" ,rust-url-2)
+ ("rust-uuid" ,rust-uuid-1.8)
+ ("rust-zvariant-derive" ,rust-zvariant-derive-4))
+ #:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.5)
+ ("rust-glib" ,rust-glib-0.20)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-serde-repr" ,rust-serde-repr-0.1))))
+ (native-inputs
+ (list pkg-config))
+ (inputs
+ (list glib))
+ (home-page "https://github.com/dbus2/zbus/")
+ (synopsis "D-Bus & GVariant encoding & decoding")
+ (description "D-Bus & GVariant encoding & decoding")
+ (license license:expat)))
+
(define-public rust-zvariant-3
(package
+ (inherit rust-zvariant-4)
(name "rust-zvariant")
(version "3.15.0")
(source (origin
@@ -95495,7 +95545,6 @@ (define-public rust-zvariant-3
(sha256
(base32
"131kaczf10psc8clzlndcc52dym5vi4g22kqf0qwaq6rw2z93cj4"))))
- (build-system cargo-build-system)
(arguments
`(#:tests? #f ; overflow evaluating the requirement `PhantomData<Vec<u8>>:
#:cargo-inputs
@@ -95516,15 +95565,7 @@ (define-public rust-zvariant-3
("rust-glib" ,rust-glib-0.17)
("rust-rand" ,rust-rand-0.8)
("rust-serde-json" ,rust-serde-json-1)
- ("rust-serde-repr" ,rust-serde-repr-0.1))))
- (native-inputs
- (list pkg-config))
- (inputs
- (list glib))
- (home-page "https://github.com/dbus2/zbus/")
- (synopsis "D-Bus & GVariant encoding & decoding")
- (description "D-Bus & GVariant encoding & decoding")
- (license license:expat)))
+ ("rust-serde-repr" ,rust-serde-repr-0.1))))))
(define-public rust-zvariant-2
(package
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:43 +0100
[PATCH rust-team 19/25] gnu: Add rust-zbus-names-3.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
3e9255c59e16f6c2e795e087afbc7b7184d16fd0.1730925791.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-zbus-names-3): New variable;
(rust-zbus-names-2): inherit from rust-zbus-names-3.

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

Toggle diff (55 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a3cfe55325..454756d3bc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -94788,8 +94788,30 @@ (define-public rust-zbus-macros-1
("rust-zbus" ,rust-zbus-1)
("rust-zvariant" ,rust-zvariant-2))))))
+(define-public rust-zbus-names-3
+ (package
+ (name "rust-zbus-names")
+ (version "3.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "zbus_names" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0v1f0ajwafj47bf11yp0xdgp26r93lslr9nb2v6624h2gppiz6sb"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-serde" ,rust-serde-1)
+ ("rust-static-assertions" ,rust-static-assertions-1)
+ ("rust-zvariant" ,rust-zvariant-4))))
+ (home-page "https://github.com/dbus2/zbus/")
+ (synopsis "Collection of D-Bus bus names types")
+ (description "This package provides a collection of D-Bus bus names types.")
+ (license license:expat)))
+
(define-public rust-zbus-names-2
(package
+ (inherit rust-zbus-names-3)
(name "rust-zbus-names")
(version "2.6.0")
(source (origin
@@ -94799,16 +94821,11 @@ (define-public rust-zbus-names-2
(sha256
(base32
"1adl0acl39flk4jnrv7axg29kpwm7cy15w2wf0yy59mxdmvvp07v"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-serde" ,rust-serde-1)
("rust-static-assertions" ,rust-static-assertions-1)
- ("rust-zvariant" ,rust-zvariant-3))))
- (home-page "https://github.com/dbus2/zbus/")
- (synopsis "Collection of D-Bus bus names types")
- (description "This package provides a collection of D-Bus bus names types.")
- (license license:expat)))
+ ("rust-zvariant" ,rust-zvariant-3))))))
(define-public rust-zbus-polkit-1
(package
--
2.46.0
G
G
Giacomo Leidi wrote on 6 Nov 21:43 +0100
[PATCH rust-team 25/25] gnu: Add rust-zbus-4.
(address . 74232@debbugs.gnu.org)(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)
baf5c3f0614bd7fd6e60d216e2c202a7761ef522.1730925791.git.goodoldpaul@autistici.org
* gnu/packages/crates-io.scm (rust-zbus-4): New variable;
(rust-zbus-3): inherit from rust-zbus-4.

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

Toggle diff (115 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ebebe0f525..55a2203451 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -94685,8 +94685,87 @@ (define-public rust-zbase32-0.1
(description "This package provides an implementation of zbase32.")
(license license:lgpl3+)))
+(define-public rust-zbus-4
+ (package
+ (name "rust-zbus")
+ (version "4.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "zbus" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "09f7916lp7haxv1y5zgcg99ny15whi6dn3waf1afcafxx8mh35xv"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "Cargo.toml"
+ ;; Patch async-io version
+ (("2\\.3\\.2") "2.3.1")
+ ;; Patch async-trait version
+ (("0\\.1\\.80") "0.1.77")
+ ;; Patch enumflags2 version
+ (("0\\.7\\.9") "0.7.7")
+ ;; Patch serde_repr version
+ (("0\\.1\\.19") "0.1.18")
+ ;; Patch ntest version
+ (("0\\.9\\.2") "0.9.0")
+ ;; Patch test-log version
+ (("0\\.2\\.16") "0.2.11"))))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; Not all files included.
+ #:cargo-inputs (("rust-async-broadcast" ,rust-async-broadcast-0.7)
+ ("rust-async-executor" ,rust-async-executor-1.11)
+ ("rust-async-fs" ,rust-async-fs-2)
+ ("rust-async-io" ,rust-async-io-2)
+ ("rust-async-lock" ,rust-async-lock-3)
+ ("rust-async-process" ,rust-async-process-2)
+ ("rust-async-recursion" ,rust-async-recursion-1.1)
+ ("rust-async-task" ,rust-async-task-4)
+ ("rust-async-trait" ,rust-async-trait-0.1)
+ ("rust-blocking" ,rust-blocking-1.6)
+ ("rust-enumflags2" ,rust-enumflags2-0.7)
+ ("rust-event-listener" ,rust-event-listener-5)
+ ("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-nix" ,rust-nix-0.29)
+ ("rust-ordered-stream" ,rust-ordered-stream-0.2)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-repr" ,rust-serde-repr-0.1)
+ ("rust-sha1" ,rust-sha1-0.10)
+ ("rust-static-assertions" ,rust-static-assertions-1)
+ ("rust-tokio" ,rust-tokio-1)
+ ("rust-tokio-vsock" ,rust-tokio-vsock-0.4)
+ ("rust-tracing" ,rust-tracing-0.1)
+ ("rust-uds-windows" ,rust-uds-windows-1)
+ ("rust-vsock" ,rust-vsock-0.5)
+ ("rust-windows-sys" ,rust-windows-sys-0.52)
+ ("rust-xdg-home" ,rust-xdg-home-1.1)
+ ("rust-zbus-macros" ,rust-zbus-macros-4)
+ ("rust-zbus-names" ,rust-zbus-names-3)
+ ("rust-zbus-xml" ,rust-zbus-xml-4)
+ ("rust-zvariant" ,rust-zvariant-4))
+ #:cargo-development-inputs
+ (("rust-async-std" ,rust-async-std-1)
+ ("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-ntest" ,rust-ntest-0.9)
+ ("rust-tempfile" ,rust-tempfile-3)
+ ("rust-test-log" ,rust-test-log-0.2)
+ ("rust-tokio" ,rust-tokio-1)
+ ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+ (home-page "https://github.com/dbus2/zbus/")
+ (synopsis "API for D-Bus communication")
+ (description "This package provides an API for D-Bus communication.")
+ (license license:expat)))
+
(define-public rust-zbus-3
(package
+ (inherit rust-zbus-4)
(name "rust-zbus")
(version "3.14.1")
(source
@@ -94696,7 +94775,6 @@ (define-public rust-zbus-3
(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
@@ -94746,11 +94824,7 @@ (define-public rust-zbus-3
("rust-tempfile" ,rust-tempfile-3)
("rust-test-log" ,rust-test-log-0.2)
("rust-tokio" ,rust-tokio-1)
- ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
- (home-page "https://github.com/dbus2/zbus/")
- (synopsis "API for D-Bus communication")
- (description "This package provides an API for D-Bus communication.")
- (license license:expat)))
+ ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))))
(define-public rust-zbus-1
(package
--
2.46.0
E
E
Efraim Flashner wrote on 11 Nov 11:08 +0100
Re: [bug#74232] [PATCH rust-team 01/25] gnu: rust-portable-atomic-util: Update to 0.2.3.
(name . Giacomo Leidi)(address . goodoldpaul@autistici.org)(address . 74232-done@debbugs.gnu.org)
ZzHXhwzIf0Q3bUW1@3900XT
Thanks! Patches pushed to the rust-team branch.

--
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
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmcx14YACgkQQarn3Mo9
g1EzxhAArwkqf9kxTic6tpLe3AFykOwsrETbyO137NMgbZqJLr4jhCsiRaIy+K2a
O9Vfb611XnETzM1nwhq48xfVhlvo/GWWtCHxqh9iMHQZ9ZP+fwdUmkgqXF7o+tZ7
4LMK9cUwxRLMAn3BOIj96EQ7wEeMHrIQkKiTSYhwWiptLoj3ai1ul3rqSYCaXCTN
m2CcG69bX9KGySaE8akDXW/ozLjG/FESAeIJcPnUiszQfVV8Pc23YQ50tO2j0Y4X
Yf4CSOzNgRBjXJOe1FHWtFolPLuzHM3Hq2k1MYd1fidQ4zHAVnmjbQGalcddxjJv
y3rLFOiVWjg5z3pMYJDxHqgmqIBkjVsRy3ceqK/37u/RI/K09IYFjq4EtaoiJJFw
U5X9+8Kf58e2tmUm++SWDvCxXsxe1RHH8xzodDVIIAu7tgd2XpgDpWCZooHA4HDN
Y9ivLIuiyBhlWei1C3rIQCx2lvxeprZB9GKRkocgiHrh7A2pBnl4tcGJd/pH4kpb
+P6KfwHHi4TBxHvjj363pCr4U6cqFzy5wZZtAC4EaZCjZ/tDodtNpjzbUT9nk8kC
3JP9zjwPuv/vatvU9FuFEW1+0bThqdh+pgvAP7F+MLkMoqeYdOKslXOioGycm3g8
jhDjfqM3ZkRBdKpK53F04C4zv5xLVNylXpvahqyk7etrQYTY/cQ=
=kOoh
-----END PGP SIGNATURE-----


Closed
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 74232@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 74232
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch