From patchwork Sun Mar 24 15:20:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Covrig X-Patchwork-Id: 62235 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 5B20327BBE9; Sun, 24 Mar 2024 15:40: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,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 BE7BB27BBE2 for ; Sun, 24 Mar 2024 15:40:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1roPxO-0001c1-KN; Sun, 24 Mar 2024 11:40:22 -0400 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 1roPxM-0001bn-MN for guix-patches@gnu.org; Sun, 24 Mar 2024 11:40:20 -0400 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 1roPxM-00013C-BB for guix-patches@gnu.org; Sun, 24 Mar 2024 11:40:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1roPy1-0000DT-U3 for guix-patches@gnu.org; Sun, 24 Mar 2024 11:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69620] [rust-team v3 8/9] gnu: Bumps rust-rocket-0.4 to 0.4.11 Resent-From: Aaron Covrig Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Mar 2024 15:41:01 +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.1711294823760 (code B ref 69620); Sun, 24 Mar 2024 15:41:01 +0000 Received: (at 69620) by debbugs.gnu.org; 24 Mar 2024 15:40:23 +0000 Received: from localhost ([127.0.0.1]:39095 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roPxL-0000C7-8n for submit@debbugs.gnu.org; Sun, 24 Mar 2024 11:40:23 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:43298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roPpT-0008Jn-TM for 69620@debbugs.gnu.org; Sun, 24 Mar 2024 11:32:16 -0400 Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-78a4b264305so64211385a.1 for <69620@debbugs.gnu.org>; Sun, 24 Mar 2024 08:31:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1711294224; x=1711899024; 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=5Yms+TUFMjpiKAzYYDfCLPawZXzI3qJD4Z2NrnkQO9k=; b=g3J9Z3FalpJpMZqbq5m0Db9g1yeyq34+mRPB/Rlcx0gYi+Ap/29VEsC0VA/cp+anwq n/XrcdXknZJ1EusPr7LTyKO3vivM3lx6Mdog3xxaDcdV5qSr1fVrCkOd6194my+Xu1cC UzUqGKYgYjA3eBITK6frb/8owlHNdh7NLIiyU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711294224; x=1711899024; 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=5Yms+TUFMjpiKAzYYDfCLPawZXzI3qJD4Z2NrnkQO9k=; b=H4MYSWPF6lbNAJIaNVxrdYH2YCRJQvEbSNLA1GvUOGpBxNfdlLN8BworZWKRpAXKw+ M9QrLMMthPeuIIR6eC/FYr9oWtoy74oSvhhYFtj08EmK2uFSJxIo3C73RrlpdRS6CN7T L/aGstSIF8FTFIZgu6wJTdqzn+1gAXE4xIweKNAul9VB+N6UlDYMwggtdpDRUAsFRcy2 Xo5AO0kUZuu+A03NI2YGYXDwj9xqJqsDYUgxo07K/rIkO97dA2hwGLkMkgBzmoZYusBT I1mJrpc/EbDiiOuRDvRsDjkkXvxeG2ZiufPLf07Uh32xHM/zEJD0QKPB9drwVWbWVRgX t48w== X-Gm-Message-State: AOJu0YxdVjUJpnhMjO9blKMby0abH6OSR5qNBZQLdINrywoO20WtEOOo HabUW4udLDwjgNB/G+NXzIQqb0m1Mg1x1rwZYztjbni3JaLA557juBoRw765EPMGUu6sS6CIQol 1j5d9cYlWHgC8zmP5dixJaREeFQl9LTh0FSaA0KPQ+wavrLV4j+7KQ7RIloSWtXxnV/l4/eQCtD str48Xg1gYRx+To5f8Qn3BDyRDV7uy0ZuAYZBPB/A= X-Google-Smtp-Source: AGHT+IFjnsd7WYTNP5XGuouoefqJojyRE3f1DJz0+cdM5sJgmSq8SXEgzPL6ft64qQUxpDPshne28w== X-Received: by 2002:a05:620a:3905:b0:78a:3319:f42a with SMTP id qr5-20020a05620a390500b0078a3319f42amr6503685qkn.39.1711293737371; Sun, 24 Mar 2024 08:22:17 -0700 (PDT) Received: from mobile-dev.fios-router.home (pool-71-244-152-222.bltmmd.fios.verizon.net. [71.244.152.222]) by smtp.gmail.com with ESMTPSA id wg9-20020a05620a568900b00789ed16d039sm1414907qkn.54.2024.03.24.08.22.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 08:22:17 -0700 (PDT) Date: Sun, 24 Mar 2024 11:20:00 -0400 Message-ID: <20240324152001.148236-10-aaron.covrig.us@ieee.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240324152001.148236-2-aaron.covrig.us@ieee.org> References: <20240324152001.148236-2-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-rocket-0.4): Bumps to 0.4.11 and enables building --- gnu/packages/crates-web.scm | 56 ++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm index fbdce9e9f6..bf848a9f54 100644 --- a/gnu/packages/crates-web.scm +++ b/gnu/packages/crates-web.scm @@ -4634,31 +4634,49 @@ (define-public rust-rocket-0.4 (package (inherit rust-rocket-0.5) (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")))) - (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)))))) + (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)))) + (arguments + `(#: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")))))))) (define-public rust-rocket-codegen-0.5 (package