From patchwork Sun Feb 18 21:02:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 60759 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 5B05E27BBE9; Sun, 18 Feb 2024 21:35:43 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,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 90C9527BBED for ; Sun, 18 Feb 2024 21:35:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbooD-00022c-KY; Sun, 18 Feb 2024 16:34:49 -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 1rbooB-000207-EX for guix-patches@gnu.org; Sun, 18 Feb 2024 16:34:47 -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 1rbooB-0003bM-6X for guix-patches@gnu.org; Sun, 18 Feb 2024 16:34:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbooV-0004iw-S6; Sun, 18 Feb 2024 16:35:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69257] [PATCH 061/228] gnu: Add rust-tower-http-0.5. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 21:35:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69257 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69257@debbugs.gnu.org Cc: Herman Rimm , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 69257-submit@debbugs.gnu.org id=B69257.170829207517962 (code B ref 69257); Sun, 18 Feb 2024 21:35:07 +0000 Received: (at 69257) by debbugs.gnu.org; 18 Feb 2024 21:34:35 +0000 Received: from localhost ([127.0.0.1]:39742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbony-0004fY-42 for submit@debbugs.gnu.org; Sun, 18 Feb 2024 16:34:35 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:56735 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboO3-0002uT-6i for 69257@debbugs.gnu.org; Sun, 18 Feb 2024 16:07:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1708290438; 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=Z8Z8qanZVONIs+4GyYdRHO0vwRkKiDjwMwHZ6v2UiDM=; b=iIQHmhk5KIzSX6AUdTxgmZrw1aVexH+pRSL7us7TZVO/iuEN3YqyxHyLcPVOX1enRXXve9 is7DjXl5MNVh9KuCS5lYfsm4eR0HHMUOjyrmU/DACqkeMYdhQb6yR9NacxDxyS9NijIAJa +wOgwy7FlZzjYJtQkCFlmbGYzktFwH+e3GVLQDjSNjSe8RT0D5P7ahLSRgOUbWQY2K+bS9 +ZjxAjzT0cN9pqDXk0aOoCUXACh2nS6ZQN1d0cv4Ku3NCmjxjQPRD0WUF3D7U1HTHf7dEY 6jUTG4hrcrIvebwn/3kDQ23d9V+G8xNNX100y1e6yqbVK9fiHSRRpgv0tjHJ8Q== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 33d9a26e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 18 Feb 2024 21:07:18 +0000 (UTC) Date: Sun, 18 Feb 2024 22:02:59 +0100 Message-ID: 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-web.scm (rust-tower-http-0.5): Add variable. (rust-tower-http-0.4): Inherit from rust-tower-http-0.5. Change-Id: I03d03c7ce34b0fbd38c0bdef08b691a9ee4c8e81 --- gnu/packages/crates-web.scm | 73 +++++++++++++++++++++++++++++++++---- 1 file changed, 66 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm index 0e4f2c5536..3c7ba43903 100644 --- a/gnu/packages/crates-web.scm +++ b/gnu/packages/crates-web.scm @@ -4012,8 +4012,73 @@ (define-public rust-tower-0.4 robust clients and servers.") (license license:expat))) +(define-public rust-tower-http-0.5 + (package + (name "rust-tower-http") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tower-http" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bmgfh1hr92blw7kv2636ykd0gf3h0aqdd89kvjk6b2fg8kr788d")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove disabled doctests with unresolved imports. + (substitute* "src/lib.rs" (("//!.*") "")) + (substitute* "src/classify/status_in_range_is_error.rs" + (("///.*") "")))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-compression" ,rust-async-compression-0.4) + ("rust-base64" ,rust-base64-0.21) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-bytes" ,rust-bytes-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-1) + ("rust-http-body" ,rust-http-body-1) + ("rust-http-body-util" ,rust-http-body-util-0.1) + ("rust-http-range-header" ,rust-http-range-header-0.4) + ("rust-httpdate" ,rust-httpdate-1) + ("rust-iri-string" ,rust-iri-string-0.7) + ("rust-mime" ,rust-mime-0.3) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tower" ,rust-tower-0.4) + ("rust-tower-layer" ,rust-tower-layer-0.3) + ("rust-tower-service" ,rust-tower-service-0.3) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-uuid" ,rust-uuid-1)) + #:cargo-development-inputs + (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-brotli" ,rust-brotli-3) + ("rust-bytes" ,rust-bytes-1) + ("rust-flate2" ,rust-flate2-1) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-hyper-util" ,rust-hyper-util-0.1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sync-wrapper" ,rust-sync-wrapper-0.1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tower" ,rust-tower-0.4) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) + ("rust-uuid" ,rust-uuid-1) + ("rust-zstd" ,rust-zstd-0.12)))) + (home-page "https://github.com/tower-rs/tower-http") + (synopsis "Tower middleware and utilities for HTTP clients and servers") + (description + "This package provides Tower middleware and utilities for HTTP +clients and servers.") + (license license:expat))) + (define-public rust-tower-http-0.4 (package + (inherit rust-tower-http-0.5) (name "rust-tower-http") (version "0.4.4") (source @@ -4023,7 +4088,6 @@ (define-public rust-tower-http-0.4 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0h0i2flrw25zwxv72sifq4v5mwcb030spksy7r2a4xl2d4fvpib1")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags (list "--release" ;; Not the doc tests. @@ -4062,12 +4126,7 @@ (define-public rust-tower-http-0.4 ("rust-tower" ,rust-tower-0.4) ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) ("rust-uuid" ,rust-uuid-1) - ("rust-zstd" ,rust-zstd-0.12)))) - (home-page "https://github.com/tower-rs/tower-http") - (synopsis "Tower middleware and utilities for HTTP clients and servers") - (description "This package provides the tower middleware and utilities for -HTTP clients and servers.") - (license license:expat))) + ("rust-zstd" ,rust-zstd-0.12)))))) (define-public rust-tower-layer-0.3 (package