From patchwork Fri Mar 8 02:37:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Covrig X-Patchwork-Id: 61480 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 6E1DF27BBEA; Fri, 8 Mar 2024 02:41:58 +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,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 5A50D27BBE9 for ; Fri, 8 Mar 2024 02:41:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riQAw-0004Li-Qy; Thu, 07 Mar 2024 21:41:34 -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 1riQAu-0004JK-SR for guix-patches@gnu.org; Thu, 07 Mar 2024 21:41:32 -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 1riQAt-0000rn-Lj for guix-patches@gnu.org; Thu, 07 Mar 2024 21:41:32 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1riQBP-000458-4s for guix-patches@gnu.org; Thu, 07 Mar 2024 21:42:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69620] [PATCH rust-team v2 2/2] gnu: rust-rocket: Upgraded and enabled full build Resent-From: Aaron Covrig Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Mar 2024 02:42:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69620 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69620@debbugs.gnu.org Cc: Aaron Covrig Received: via spool by 69620-submit@debbugs.gnu.org id=B69620.170986568615624 (code B ref 69620); Fri, 08 Mar 2024 02:42:03 +0000 Received: (at 69620) by debbugs.gnu.org; 8 Mar 2024 02:41:26 +0000 Received: from localhost ([127.0.0.1]:55615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riQAn-00043v-9b for submit@debbugs.gnu.org; Thu, 07 Mar 2024 21:41:26 -0500 Received: from mail-yb1-f172.google.com ([209.85.219.172]:49278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riQAl-00043N-FO for 69620@debbugs.gnu.org; Thu, 07 Mar 2024 21:41:24 -0500 Received: by mail-yb1-f172.google.com with SMTP id 3f1490d57ef6-db4364ecd6aso531006276.2 for <69620@debbugs.gnu.org>; Thu, 07 Mar 2024 18:40:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1709865586; x=1710470386; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9yc7bOMGRtzl0FuwRCimvjiqULdjPm+OnMUtULa9oFo=; b=ZiSV+k9My+Xgyl8nhgrgZAJujoMqx9zW4DcTDhlklh0MoSfqiU5JeVaxgxcRwUnZHG UehSaH8VNBsg1PV0dDLu2sAHP6dcLOn1jXx9uAANZ9dvS9y0IfzokNqMSLav02VyneMl CRIOWRG/99YF9p4aWoeHA68zK2fd0woqwAtEo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709865586; x=1710470386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9yc7bOMGRtzl0FuwRCimvjiqULdjPm+OnMUtULa9oFo=; b=M0Gm1ifdUPKZHYPag4kG+HRoLk8i0SYVdjfSIoOd4HJRpbuIsieNbw7nRk59ZpFYtx QsS1nfMgpEGmc8Iby26vvt7nkSXacR+mUcGO0xvePVhAn/sf7KCkYDtq0rWEIH4ft1Ap Q2hreMMlbgdzzYFNWlEaQHutjgA+JynFeaVmrWO1lYsdBKaB+xojOURS5MLLHBUtjnwg SqXkc32IC95pWSpSN2eq5h7z45mKqI9FMl/240HNK6+zHcX/jvn3Hr2CJKGt92GYSg64 hxDYgMjiYZk3GAdW5wy0F04xxf0DbU9YTbhqlyGeHxzieHXq8QT/MQbaElMOlbYyv1+j /wPQ== X-Gm-Message-State: AOJu0YwR5C2WKFDw7KYp28zm2HHTxmHffIdooB0n8hz/KW0vuX69VcVQ 8LlXqXMEMDvYyWFoTJyvx5yzQxQoK5qCcumPaVlmmtZitKujDLoODjgFXQ86aR8FETFkyMpjYMn Gy7FIT1KB9+ljEy1CeT0RaEvsbR3Pyae+AOIrE+USl6yG2Fx4mqPp5orO3VpGXbaFyEfl0FCyFn edwhSG0JR5ErYNrpg8Y96CkTdWxtC7f37mE8vCtM3njg== X-Google-Smtp-Source: AGHT+IFyvyq2m21Qiuu3qTryuJnFsK6pJC+jvKYP9egPAvEgPYCh4rBbBddyQVOO/s9sRGhtCYw/jQ== X-Received: by 2002:a25:2690:0:b0:dc6:ff12:13d7 with SMTP id m138-20020a252690000000b00dc6ff1213d7mr14067398ybm.60.1709865585682; Thu, 07 Mar 2024 18:39:45 -0800 (PST) Received: from localhost.localdomain (99-122-31-181.lightspeed.chtgtn.sbcglobal.net. [99.122.31.181]) by smtp.gmail.com with ESMTPSA id a12-20020a25870c000000b00dcc45635f27sm3754529ybl.18.2024.03.07.18.39.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 18:39:45 -0800 (PST) Date: Thu, 7 Mar 2024 21:37:28 -0500 Message-ID: <20240308023728.166810-3-aaron.covrig.us@ieee.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240308023728.166810-1-aaron.covrig.us@ieee.org> References: <20240308023728.166810-1-aaron.covrig.us@ieee.org> 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: Aaron Covrig X-ACL-Warn: , Aaron Covrig via Guix-patches X-Patchwork-Original-From: Aaron Covrig via Guix-patches via From: Aaron Covrig 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-hyper-sync-rustls-0.3) : Upgraded to version 0.3.0-rc17 (and maintained v0.3.0-rc4 as latest has breaking changes) * gnu/packages/crates-web.scm (rust-rocket) : Upgraded to v0.4.11 and changed to full build * gnu/packages/crates-web.scm (rust-rocket-codegen) : Upgraded to v0.4.11 and changed to build * gnu/packages/crates-web.scm (rust-rocket-http) : Upgraded to v0.4.11 and changed to build with tests --- gnu/packages/crates-web.scm | 171 ++++++++++++++++++++++++------------ 1 file changed, 114 insertions(+), 57 deletions(-) diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm index 60c735efa7..58436084ed 100644 --- a/gnu/packages/crates-web.scm +++ b/gnu/packages/crates-web.scm @@ -42,6 +42,7 @@ (define-module (gnu packages crates-web) #:use-module (gnu packages crates-windows) #:use-module (gnu packages curl) #:use-module (gnu packages gtk) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls) #:use-module (gnu packages webkit)) @@ -3178,33 +3179,53 @@ (define-public rust-hyper-rustls-0.21 (define-public rust-hyper-sync-rustls-0.3 (package (name "rust-hyper-sync-rustls") - (version "0.3.0-rc.4") + (version "0.3.0-rc.17") (source (origin (method url-fetch) (uri (crate-uri "hyper-sync-rustls" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16zirxhsk26kz5jxxxs37wxsm02id97h57kkqs512fj1j0x486kd")))) + (base32 "1az37mc4dgxgpqc745r495nm2dwx48amw2w6c8mnwj00xb219c2c")))) (build-system cargo-build-system) (arguments - `(#:cargo-test-flags - '("--release" "--" - ;; not all files included - "--skip=client" - "--skip=server") - #:cargo-inputs - (("rust-hyper" ,rust-hyper-0.10) - ("rust-rustls" ,rust-rustls-0.14) - ("rust-webpki" ,rust-webpki-0.18) - ("rust-webpki-roots" ,rust-webpki-roots-0.15)) - #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.5)))) + `(#:cargo-test-flags '("--release" "--" + ;; skip tests client/server tests + "--skip=client" "--skip=server") + #:cargo-inputs (("rust-hyper" ,rust-hyper-0.10) + ("rust-rustls" ,rust-rustls-0.17) + ("rust-webpki" ,rust-webpki-0.21) + ("rust-webpki-roots" ,rust-webpki-roots-0.19)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7)))) + (native-inputs (list perl)) (home-page "https://github.com/SergioBenitez/hyper-sync-rustls") (synopsis "Glue code for Rustls and synchronous Hyper") (description "This package provides glue code for Rustls and synchronous Hyper.") (license (list license:expat license:asl2.0)))) +(define-public rust-hyper-sync-rustls-0.3-rc4 + (package + (inherit rust-hyper-sync-rustls-0.3) + (name "rust-hyper-sync-rustls") + (version "0.3.0-rc.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "hyper-sync-rustls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16zirxhsk26kz5jxxxs37wxsm02id97h57kkqs512fj1j0x486kd")))) + (arguments + `(#:cargo-test-flags '("--release" "--" + ;; not all files included + "--skip=client" "--skip=server") + #:cargo-inputs (("rust-hyper" ,rust-hyper-0.10) + ("rust-rustls" ,rust-rustls-0.14) + ("rust-webpki" ,rust-webpki-0.18) + ("rust-webpki-roots" ,rust-webpki-roots-0.15)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.5)))))) + (define-public rust-hyper-timeout-0.4 (package (name "rust-hyper-timeout") @@ -3659,32 +3680,50 @@ (define-public rust-reqwest-0.10 (define-public rust-rocket-0.4 (package (name "rust-rocket") - (version "0.4.7") + (version "0.4.11") (source (origin (method url-fetch) (uri (crate-uri "rocket" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "04ybnhjw92zaan92lsmx6mkhqc9cpsg3885svb3wzyj39pyzvsvz")))) + (base32 "0pimz9v0737dvz487j0kij7kasjyahaxd7ba2bcc3p6513fdkfc3")) + (modules '((guix build utils))) + (snippet '(begin + ;; enable nightly/dev in build.rs for RUSTC_BOOTSTRAP build + (substitute* "build.rs" + (("if !channel.supports_features") + "/* if !channel.supports_features") + (("if !version.at_least") + "*/ \nif !version.at_least")) + ;; Add missing development dependency (for tests) + (substitute* "Cargo.toml" + (("\\[features\\]" all) + (string-append "[dev-dependencies.lazy_static]" "\n" + "version = \"1\"" "\n" all))) #t)))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-atty" ,rust-atty-0.2) - ("rust-base64" ,rust-base64-0.12) - ("rust-log" ,rust-log-0.4) - ("rust-memchr" ,rust-memchr-2) - ("rust-num-cpus" ,rust-num-cpus-1) - ("rust-pear" ,rust-pear-0.1) - ("rust-rocket-codegen" ,rust-rocket-codegen-0.4) - ("rust-rocket-http" ,rust-rocket-http-0.4) - ("rust-state" ,rust-state-0.4) - ("rust-time" ,rust-time-0.1) - ("rust-toml" ,rust-toml-0.4) - ("rust-version-check" ,rust-version-check-0.9) - ("rust-yansi" ,rust-yansi-0.5) - ("rust-yansi" ,rust-yansi-0.5)))) + `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) + ("rust-base64" ,rust-base64-0.12) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-pear" ,rust-pear-0.1) + ("rust-rocket-codegen" ,rust-rocket-codegen-0.4) + ("rust-rocket-http" ,rust-rocket-http-0.4) + ("rust-state" ,rust-state-0.4) + ("rust-time" ,rust-time-0.1) + ("rust-toml" ,rust-toml-0.4) + ("rust-version-check" ,rust-version-check-0.9) + ("rust-yansi" ,rust-yansi-0.5) + ("rust-yansi" ,rust-yansi-0.5)) + ;; Adding in missing dev dependency + #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1)) + #:phases (modify-phases %standard-phases + ;; Enable using nightly/dev features + (add-after 'unpack 'enable-unstable-features + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1")))))) (home-page "https://rocket.rs") (synopsis "Web framework with focus on ease-of-use, expressibility, and speed") @@ -3696,25 +3735,38 @@ (define-public rust-rocket-0.4 (define-public rust-rocket-codegen-0.4 (package (name "rust-rocket-codegen") - (version "0.4.7") + (version "0.4.11") (source (origin (method url-fetch) (uri (crate-uri "rocket_codegen" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "18s2dll8c4sd26s8cfr6cizj5z55xwnk6r6x7b2wvcf8n9ajrb6f")))) + (base32 "1zl4f99s4df8fpkps53qn77030baww4x7zflggwql290b1xh6418")) + (modules '((guix build utils))) + (snippet '(begin + (substitute* "build.rs" + ;; enable nightly/dev in build.rs for RUSTC_BOOTSTRAP build + (("if !channel.supports_features") + "/* if !channel.supports_features") + (("if !version.at_least") + "*/ \nif !version.at_least")))))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-devise" ,rust-devise-0.2) - ("rust-glob" ,rust-glob-0.3) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-quote" ,rust-quote-0.6) - ("rust-rocket-http" ,rust-rocket-http-0.4) - ("rust-version-check" ,rust-version-check-0.9) - ("rust-yansi" ,rust-yansi-0.5)))) + `(#:tests? #f ;Tests depend on multiple undeclared crates + #:cargo-inputs (("rust-devise" ,rust-devise-0.2) + ("rust-glob" ,rust-glob-0.3) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-quote" ,rust-quote-0.6) + ("rust-rocket-http" ,rust-rocket-http-0.4)) + #:cargo-development-inputs (("rust-version-check" ,rust-version-check-0.9) + ("rust-yansi" ,rust-yansi-0.5) + ("rust-rocket" ,rust-rocket-0.4)) ;For tests + #:phases (modify-phases %standard-phases + ;; Enable using nightly/dev features + (add-after 'unpack 'enable-unstable-features + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1")))))) (home-page "https://rocket.rs") (synopsis "Procedural macros for the Rocket web framework") (description @@ -3724,29 +3776,34 @@ (define-public rust-rocket-codegen-0.4 (define-public rust-rocket-http-0.4 (package (name "rust-rocket-http") - (version "0.4.7") + (version "0.4.11") (source (origin (method url-fetch) (uri (crate-uri "rocket_http" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ga98nbcga8amg4xhrfkn1wljnqx9h0vv7mnay9g66vsxl042dnf")))) + (base32 "17xiivj4cp3anm4rxxpd8g58kzday1y2pgdys2i23wz1538wpy9b")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-cookie" ,rust-cookie-0.11) - ("rust-hyper" ,rust-hyper-0.10) - ("rust-hyper-sync-rustls" ,rust-hyper-sync-rustls-0.3) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-pear" ,rust-pear-0.1) - ("rust-percent-encoding" ,rust-percent-encoding-1) - ("rust-rustls" ,rust-rustls-0.14) - ("rust-smallvec" ,rust-smallvec-1) - ("rust-state" ,rust-state-0.4) - ("rust-time" ,rust-time-0.1) - ("rust-unicode-xid" ,rust-unicode-xid-0.1)))) + `(#:cargo-test-flags ;doctests depend on undeclared crates + '("--lib" "--bins" "--tests" "--release") + #:cargo-inputs (("rust-cookie" ,rust-cookie-0.11) + ("rust-hyper" ,rust-hyper-0.10) + ("rust-hyper-sync-rustls" ,rust-hyper-sync-rustls-0.3-rc4) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-pear" ,rust-pear-0.1) + ("rust-percent-encoding" ,rust-percent-encoding-1) + ("rust-rustls" ,rust-rustls-0.14) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-state" ,rust-state-0.4) + ("rust-time" ,rust-time-0.1) + ("rust-unicode-xid" ,rust-unicode-xid-0.1)) + #:phases (modify-phases %standard-phases + ;; Enable using nightly/dev features + (add-after 'unpack 'enable-unstable-features + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1")))))) (home-page "https://rocket.rs") (synopsis "HTTP requests, responses and headers tooling for Rocket") (description