From patchwork Fri Jan 31 21:09:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 38023 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 2E29827BBEB; Fri, 31 Jan 2025 21:14:35 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 CDD9827BBE9 for ; Fri, 31 Jan 2025 21:14:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tdyL0-0004k5-Lh; Fri, 31 Jan 2025 16:14:06 -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 1tdyKx-0004hx-Jx for guix-patches@gnu.org; Fri, 31 Jan 2025 16:14:03 -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 1tdyKx-0000DR-BJ for guix-patches@gnu.org; Fri, 31 Jan 2025 16:14:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=zx0hg1NzoRUWtuHKYKuh4SCJOslZc1Kyh4M7QgajTQg=; b=PcEpVvfQdbreyddEm7CBPgD1uU8x1z85Qyps7VsyDB+hmhv8Ws17h2x51TADLHD/zx/oLUYLMnnbOFAtpvvdh5+JVqYwt9SbczQWZwC/G7Vv2+GPl1I7R1mYfwSmVv4ecwiXemrhptoypZGhN+Lo4D05S22K2F/qyH84d2/15PPm+B8b+A3PBAYKXiy5UV+a/zGxh3G2NXvzPuWuh+u605umnhCneB+2SXPkOa/LbzfCihzDF58xGieEjXvnXt+svIOhicLG81w+dB/H//olgtM0T6Uz+WNzOZrmaQ406b6DrFhOFqugBPVx4f6grJbbE4X/fGOsJ9uONfJfw6L/Fg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tdyKx-0005LT-3S; Fri, 31 Jan 2025 16:14:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75980] [PATCH rust-team 014/106] gnu: rust-actix-http-1: Add cargo-development-inputs. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: divya@subvertising.org, efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 31 Jan 2025 21:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75980 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75980@debbugs.gnu.org Cc: Divya Ranjan Pattanaik , Efraim Flashner X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik , Efraim Flashner Received: via spool by 75980-submit@debbugs.gnu.org id=B75980.173835800620287 (code B ref 75980); Fri, 31 Jan 2025 21:14:03 +0000 Received: (at 75980) by debbugs.gnu.org; 31 Jan 2025 21:13:26 +0000 Received: from localhost ([127.0.0.1]:54696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tdyKL-0005H4-3O for submit@debbugs.gnu.org; Fri, 31 Jan 2025 16:13:25 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47063 helo=email.rimm.ee) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tdyJN-00058C-Fw for 75980@debbugs.gnu.org; Fri, 31 Jan 2025 16:12:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1738357929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zx0hg1NzoRUWtuHKYKuh4SCJOslZc1Kyh4M7QgajTQg=; b=BtaFH4iQ9xWivdMs/IgeCdfz+4vJyWZf4TUdh6bNWtGQWu2fyb/gbhRUBurjpDPTXYncQT OuH/1R6Dkdk50942V63HQ/JJOhZJ8svPqB1p02Fkk/sh+KbySWHmplpAvl2oXqVA7CXUxA u5f4TLRwlwxOVvBXUhuMAVcX9nnMZq7SiTwPUaeX0NOEXrlTNxuhZKWr/Qd5+iiJh4Rrux ExwLtrrylXZIs2XCxbYO4HL4aFIjhUub1RGxEip43uYfm5V//eVygm1U5F+hE+TmVa5ifm HB9TdYYEM80Mt7lhvh8R8zMCJG2+UBf7CMAiWh/+JC9YAEQ6J22h/dxGN1TL+g== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id ce2ec9f4 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75980@debbugs.gnu.org>; Fri, 31 Jan 2025 21:12:09 +0000 (UTC) Date: Fri, 31 Jan 2025 22:09:35 +0100 Message-ID: <7b46388d729e29cdbe96ceb73546f931ea1fed4a.1738357371.git.herman@rimm.ee> X-Mailer: git-send-email 2.47.1 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-web.scm (rust-actix-http-1): Build without tests. Add rust-actix-connect-1, rust-actix-server-1, rust-actix-tls-1, rust-env-logger-0.6, rust-futures-0.3, rust-openssl-0.10, rust-rustls-0.16, rust-serde-derive-1. [source]: Use time instead of chrono. Change-Id: I68208f7a2dd9c98f4198f182d1623c0c09f21fc4 --- gnu/packages/crates-web.scm | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm index 754f542619d..98a1669d923 100644 --- a/gnu/packages/crates-web.scm +++ b/gnu/packages/crates-web.scm @@ -560,11 +560,18 @@ (define-public rust-actix-http-1 (uri (crate-uri "actix-http" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06chrs9asbxmxzgiw5sw7ky97yrin9g88nmd6w407a6y9z668rn1")))) - ;; XXX: The crate fails to't build with with the same error as - ;; rust-actix-connect. Skip build for now. - (arguments - `(#:skip-build? #true + (base32 "06chrs9asbxmxzgiw5sw7ky97yrin9g88nmd6w407a6y9z668rn1")) + (modules '((guix build utils))) + ;; Crate chrono stopped using the Duration struct of crate time. + ;; See: https://github.com/actix/actix-web/issues/3135 + (snippet #~(substitute* '("src/cookie/builder.rs" + "src/cookie/jar.rs" + "src/cookie/mod.rs" + "src/cookie/parse.rs") + (("use chrono::Duration") "use time::Duration"))))) + (arguments + ;; Cargo fails to compile two different actix-http v1.0.1. + `(#:tests? #f #:cargo-inputs (("rust-actix-codec" ,rust-actix-codec-0.2) ("rust-actix-connect" ,rust-actix-connect-1) @@ -608,7 +615,15 @@ (define-public rust-actix-http-1 ("rust-slab" ,rust-slab-0.4) ("rust-time" ,rust-time-0.1)) #:cargo-development-inputs - (("rust-actix-http-test" ,rust-actix-http-test-1)))))) + (("rust-actix-connect" ,rust-actix-connect-1) + ("rust-actix-http-test" ,rust-actix-http-test-1) + ("rust-actix-server" ,rust-actix-server-1) + ("rust-actix-tls" ,rust-actix-tls-1) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-futures" ,rust-futures-0.3) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-rustls" ,rust-rustls-0.16) + ("rust-serde-derive" ,rust-serde-derive-1)))))) (define-public rust-actix-http-0.2 (package