From 7826f40ef96b5963f5ab12ac0e00c9390203c645 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 5 Nov 2023 17:01:21 +0200 Subject: gnu: rust-tokio-0.1: Fix build. * gnu/packages/crates-io.scm (rust-tokio-0.1)[arguments]: Add cargo-test-flags. [cargo-inputs]: Add rust-tracing-core-0.1. Remove rust-miow-0.3, rust-tokio-trace-core-0.2. [cargo-development-inputs]: Remove rust-tracing-core-0.1. Change-Id: Ide1a2e29c0e4f98440c2fecb0cd65806c0fc9471 --- gnu/packages/crates-io.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4e0ffae4f3..3395430f38 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -78490,14 +78490,21 @@ (define-public rust-tokio-0.1 (base32 "1xhaadfmm6m37f79xv5020gc3np9wqza3bq95ymp522qpfsw02as")) (snippet #~(begin (use-modules (guix build utils)) + ;; rust-flate2 doesn't have a 'tokio' feature. (substitute* "Cargo.toml" (("features = \\[\"tokio\"\\]") "")))))) (arguments - `(#:cargo-inputs + `(#:cargo-test-flags + '("--release" "--" + "--skip=block_on_timer" + "--skip=nested_enter::run_in_run" + "--skip=after_start_and_before_stop_is_called" + "--skip=from_block_on_all::spawn" + "--skip=runtime_tokio_run") + #:cargo-inputs (("rust-bytes" ,rust-bytes-0.4) ("rust-futures" ,rust-futures-0.1) ("rust-mio" ,rust-mio-0.6) - ("rust-miow" ,rust-miow-0.3) ("rust-num-cpus" ,rust-num-cpus-1) ("rust-tokio-codec" ,rust-tokio-codec-0.1) ("rust-tokio-current-thread" ,rust-tokio-current-thread-0.1) @@ -78509,9 +78516,9 @@ (define-public rust-tokio-0.1 ("rust-tokio-tcp" ,rust-tokio-tcp-0.1) ("rust-tokio-threadpool" ,rust-tokio-threadpool-0.1) ("rust-tokio-timer" ,rust-tokio-timer-0.2) - ("rust-tokio-trace-core" ,rust-tokio-trace-core-0.2) ("rust-tokio-udp" ,rust-tokio-udp-0.1) - ("rust-tokio-uds" ,rust-tokio-uds-0.2)) + ("rust-tokio-uds" ,rust-tokio-uds-0.2) + ("rust-tracing-core" ,rust-tracing-core-0.1)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.5) ("rust-flate2" ,rust-flate2-1) @@ -78523,8 +78530,7 @@ (define-public rust-tokio-0.1 ("rust-serde" ,rust-serde-1) ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1) - ("rust-time" ,rust-time-0.1) - ("rust-tracing-core" ,rust-tracing-core-0.1)))))) + ("rust-time" ,rust-time-0.1)))))) (define-public rust-tokio-buf-0.1 (package -- cgit v1.2.3