From patchwork Mon Apr 28 16:23:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42124 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 A603727BC4D; Mon, 28 Apr 2025 17:34:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, 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 01EAE27BC4A for ; Mon, 28 Apr 2025 17:34:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9RPs-0007xh-Py; Mon, 28 Apr 2025 12:33:12 -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 1u9RPF-0007ex-7E for guix-patches@gnu.org; Mon, 28 Apr 2025 12:32:38 -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 1u9RP5-0004RH-7q for guix-patches@gnu.org; Mon, 28 Apr 2025 12:32:30 -0400 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=II/0aICbto6f5AzvulfBj9UzCwqQYB8mkTvtqOdcotM=; b=drR4tkFt0jjmtqWfALuTuaw61VjfbprV4+yLJhpFP52DSDI4YrT/VtEj9jYafQvUU/rdiAEtI5k3R/nBi/C/lU8IGUYuUD33bGN/gMEnzfL/W/270+MtKv7dqiMwXVslJ9c110PY96gz1FwmjkXjFKkhGgWszwxrR3erbs+vlk6I7wLyO6T/4aTH8vjVM16D7cIkpjamBrfHOisZQbgrt398JEuoHzTvYbsgUHm4l88YDevGbs2mq38D7l6g0NAGVxuMsujnYfrUG6zCNBWze7J5SnDRMk7vz6m0m59O6hvkAhwz2t09DNkPvR93CfuFhOTN4zQSFAepY8oA1LQRoA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9ROu-0003Ih-SL; Mon, 28 Apr 2025 12:32:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77093] [PATCH v4 rust-team 07/22] build/cargo: Pass =?utf-8?b?4oCYLS1vZmZsaW5l4oCZ?= to cargo. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: divya@subvertising.org, efraim@flashner.co.il, hako@ultrarare.space, steve@futurile.net, guix-patches@gnu.org Resent-Date: Mon, 28 Apr 2025 16:32:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77093 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77093@debbugs.gnu.org Cc: Hilton Chain , Divya Ranjan Pattanaik , Efraim Flashner , Hilton Chain , Steve George X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik , Efraim Flashner , Hilton Chain , Steve George Received: via spool by 77093-submit@debbugs.gnu.org id=B77093.174585789812260 (code B ref 77093); Mon, 28 Apr 2025 16:32:12 +0000 Received: (at 77093) by debbugs.gnu.org; 28 Apr 2025 16:31:38 +0000 Received: from localhost ([127.0.0.1]:32837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9ROL-0003BJ-Od for submit@debbugs.gnu.org; Mon, 28 Apr 2025 12:31:38 -0400 Received: from mail.boiledscript.com ([49.12.134.184]:38432) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u9ROC-00039K-PS for 77093@debbugs.gnu.org; Mon, 28 Apr 2025 12:31:29 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1745857887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=II/0aICbto6f5AzvulfBj9UzCwqQYB8mkTvtqOdcotM=; b=Astqu4Tqeyyo9lL1whXRbHpRlkuQss5kKaYWajiNTu9fdhWt0iWLovpd8sxbJP4Aa86dUt VDonQ6klNatDnCWBhfp3uQjrpj59UQWCrTop6z/cSYTTn4NOv6upPekZLc5uFSnTvoYCfi BHqQHyXPxsgj4awi1rjA1mjV/Jvt2sAKfqAwU944yOtiEvM92FN+Q5b4IqVC0QQS5/G3wZ YEKVNdMCE0C4Dv+DHYBE4zRfmvWYGAHs9OClctQhlmzviaAMy8JHbutV4yFW1pvpWmmiDF cPo3Ihbl8BXTBuo5MJCrcYup3SkemOYDik7aHXDKIecvTq1VF+NVQE7lEe+EYA== Date: Tue, 29 Apr 2025 00:23:04 +0800 Message-ID: <500c1663df6bc2a8431b9c84e8656f49a4ce8214.1745855744.git.hako@ultrarare.space> 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: , 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 This will make error messages more helpful. * guix/build/cargo-build-system.scm (build, check, package, install): Pass ‘--offline’ to cargo. Change-Id: Ic95f603b793319f99c9c1fbce43f773bfc8126c0 --- guix/build/cargo-build-system.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 5ef6b23abd..41f54f42b7 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -246,7 +246,7 @@ (define* (build #:key "Build a given Cargo package." (or skip-build? (apply invoke - `("cargo" "build" + `("cargo" "build" "--offline" ,@(if parallel-build? (list "-j" (number->string (parallel-job-count))) (list "-j" "1")) @@ -264,7 +264,7 @@ (define* (check #:key "Run tests for a given Cargo package." (when tests? (apply invoke - `("cargo" "test" + `("cargo" "test" "--offline" ,@(if parallel-build? (list "-j" (number->string (parallel-job-count))) (list "-j" "1")) @@ -303,7 +303,7 @@ (define* (package #:key ;;error: invalid inclusion of reserved file name Cargo.toml.orig in package source (when (file-exists? "Cargo.toml.orig") (delete-file "Cargo.toml.orig")) - (apply invoke `("cargo" "package" ,@cargo-package-flags)) + (apply invoke `("cargo" "package" "--offline" ,@cargo-package-flags)) ;; Then unpack the crate, reset the timestamp of all contained files, and ;; repack them. This is necessary to ensure that they are reproducible. @@ -356,7 +356,8 @@ (define* (install #:key ;; otherwise cargo will raise an error. (or skip-build? (not (has-executable-target?)) - (invoke "cargo" "install" "--no-track" "--path" "." "--root" out + (invoke "cargo" "install" "--offline" "--no-track" + "--path" "." "--root" out "--features" (string-join features))) (when install-source?