From patchwork Tue Jan 30 15:25:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 59594 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 254B027BBEA; Tue, 30 Jan 2024 15:28:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4E03B27BBE2 for ; Tue, 30 Jan 2024 15:28:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rUq1s-0003fh-N6; Tue, 30 Jan 2024 10:28:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rUq1n-0003TI-H5 for guix-patches@gnu.org; Tue, 30 Jan 2024 10:27:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rUq1n-0006T9-73 for guix-patches@gnu.org; Tue, 30 Jan 2024 10:27:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rUq1w-0007ln-3n; Tue, 30 Jan 2024 10:28:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68819] [PATCH 31/49] gnu: Add rust-async-io-2 and rust-async-net-2 cyclical dependency. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Tue, 30 Jan 2024 15:28:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68819 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68819@debbugs.gnu.org Cc: Herman Rimm , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 68819-submit@debbugs.gnu.org id=B68819.170662846029644 (code B ref 68819); Tue, 30 Jan 2024 15:28:08 +0000 Received: (at 68819) by debbugs.gnu.org; 30 Jan 2024 15:27:40 +0000 Received: from localhost ([127.0.0.1]:36268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUq1U-0007hx-2G for submit@debbugs.gnu.org; Tue, 30 Jan 2024 10:27:40 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:52481 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUq0P-0007bV-1g for 68819@debbugs.gnu.org; Tue, 30 Jan 2024 10:26:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1706628379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pEdJkQQqnO/6WJ8/al8j2dgc9t6XQzEFOtDq62Zsf5s=; b=SRhKz0BCkXkBqs7qq0jjXrVnM6GRK+5+s7q7NJew4sRxk22lO/Zr2hZnrfYPRH0T/+AALc Axa3yoyjtXRXROY8PBYE6kU/C8HNAOyPuCrW4CToHSvXidLpAO6W1WBy1iF7q+14X+ZatU pJ/RuO0hLFu5GSUg0N1CCdHUXkQWYz+q2BxYV3A+qiM1B6ZbQp+Wd1OMH3Q+YaX62Josdi XFfJy5rq0bm00C7pvJPSumpaR30gVO1WucJ76KX7FuKk7dHWjJWLXTVBToVy3lprU7yPBL ZK9+4TluHsHnemCc5UAnMyhZzSF1usrD58rUwKSiD5NLKk1uDBS5iCBUStfGvA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id c660f3cf (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 30 Jan 2024 15:26:19 +0000 (UTC) Date: Tue, 30 Jan 2024 16:25:14 +0100 Message-ID: <6fd318fb29f9ef699bd6c6b898f1321556729945.1706619963.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-async-io-2, rust-async-net-2): Add variable. (rust-async-io-1): Inherit from rust-async-io-2. (rust-async-net-1): Inherit from rust-async-net-2. --- gnu/packages/crates-io.scm | 83 +++++++++++++++++++++++++++++++------- 1 file changed, 68 insertions(+), 15 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f808d92c12..947bbbf586 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3685,8 +3685,51 @@ (define-public rust-async-global-executor-2 @code{async-executor} and @code{async-io}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-async-io-2 + (package + (name "rust-async-io") + (version "2.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "async-io" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0i57lqp1i7h9c5k7ccspyjxlaq032rgalwq7p9p794aa08cynhgv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-lock" ,rust-async-lock-3) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-concurrent-queue" ,rust-concurrent-queue-2) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-lite" ,rust-futures-lite-2) + ("rust-parking" ,rust-parking-2) + ("rust-polling" ,rust-polling-3) + ("rust-rustix" ,rust-rustix-0.38) + ("rust-slab" ,rust-slab-0.4) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-windows-sys" ,rust-windows-sys-0.52)) + #:cargo-development-inputs (("rust-async-channel" ,rust-async-channel-2) + ("rust-async-net" ,rust-async-net-2) + ("rust-blocking" ,rust-blocking-1) + ("rust-criterion" ,rust-criterion-0.4) + ("rust-getrandom" ,rust-getrandom-0.2) + ("rust-inotify" ,rust-inotify-0.10) + ("rust-signal-hook" ,rust-signal-hook-0.3) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-timerfd" ,rust-timerfd-1) + ("rust-uds-windows" ,rust-uds-windows-1)))) + (home-page "https://github.com/smol-rs/async-io") + (synopsis "Async I/O and timers") + (description + "This crate provides two tools: Async, an adapter for standard +networking types (and many other types) to use in async programs, and +Timer, a future that expires at a point in time.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-async-io-1 (package + (inherit rust-async-io-2) (name "rust-async-io") (version "1.13.0") (source @@ -3696,7 +3739,6 @@ (define-public rust-async-io-1 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1byj7lpw0ahk6k63sbc9859v68f28hpaab41dxsjj1ggjdfv9i8g")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-async-lock" ,rust-async-lock-2) @@ -3721,14 +3763,7 @@ (define-public rust-async-io-1 ("rust-signal-hook" ,rust-signal-hook-0.3) ("rust-tempfile" ,rust-tempfile-3) ("rust-timerfd" ,rust-timerfd-1) - ("rust-uds-windows" ,rust-uds-windows-1)))) - (home-page "https://github.com/stjepang/async-io") - (synopsis "Async I/O and timers") - (description - "This crate provides two tools: Async, an adapter for standard networking -types (and many other types) to use in async programs, and Timer, a future -that expires at a point in time.") - (license (list license:asl2.0 license:expat)))) + ("rust-uds-windows" ,rust-uds-windows-1)))))) (define-public rust-async-lock-3 (package @@ -3888,8 +3923,31 @@ (define-public rust-async-mutex-1 @end itemize") (license (list license:asl2.0 license:expat)))) +(define-public rust-async-net-2 + (package + (name "rust-async-net") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "async-net" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xyc5a5vcp3a7h1q2lbfh79wz8136dig4q4x6g4w2ws8ml7h0j5r")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-io" ,rust-async-io-2) + ("rust-blocking" ,rust-blocking-1) + ("rust-futures-lite" ,rust-futures-lite-2)))) + (home-page "https://github.com/smol-rs/async-net") + (synopsis "Async networking primitives for TCP/UDP/Unix communication") + (description "This package provides async networking primitives for +TCP/UDP/Unix communication.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-async-net-1 (package + (inherit rust-async-net-2) (name "rust-async-net") (version "1.5.0") (source @@ -3905,12 +3963,7 @@ (define-public rust-async-net-1 (("rust-async-io" ,rust-async-io-1) ("rust-blocking" ,rust-blocking-1) ("rust-fastrand" ,rust-fastrand-1) - ("rust-futures-lite" ,rust-futures-lite-1)))) - (home-page "https://github.com/stjepang/async-net") - (synopsis "Async networking primitives for TCP/UDP/Unix communication") - (description - "Async networking primitives for TCP/UDP/Unix communication") - (license (list license:asl2.0 license:expat)))) + ("rust-futures-lite" ,rust-futures-lite-1)))))) (define-public rust-async-once-cell-0.5 (package