From patchwork Tue Mar 18 07:24:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 40309 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 7ADE227BBE2; Tue, 18 Mar 2025 07:26:48 +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=-5.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 BE64127BBEA for ; Tue, 18 Mar 2025 07:26:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuRL1-0007BP-Ck; Tue, 18 Mar 2025 03:26:11 -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 1tuRKz-0007Ar-PM for guix-patches@gnu.org; Tue, 18 Mar 2025 03:26:09 -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 1tuRKz-0000ds-Fx for guix-patches@gnu.org; Tue, 18 Mar 2025 03:26:09 -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=fTJrKeLT9GSPYJTsuUaujgtn6qA4bB0llojftLqgAJM=; b=EVUJTqXOj+a1EfG+9RKPk2BImlgkKkm73hcY4msCIZ1G5Od60culKMrNwmcSiCnzL8ny2BJGVDDzf05XuiC2u9EcGpFHLQAip21iLf21N5mPwIWkzfN9ALXOEaBmQCU0XaZhd//+cn8gWUhiEo0LTlVRj0zx3Yrc61FYn1Uo+tKAhtNrLuGiFa8r5GEIgMzaGOMX+mEpeMVW4BpDRuHmqF9onD5T+9F/UkOpLoW0mngrvHlEUEZuiq58+OBeP5MjWqFuFjPJ6ELev0HHgSsGuogtMEdZ3OXpmYSlmxiWWuEB2f9Nt6FLO4IlfX/JyibBh9WgkxQcnf5yI/NwCA192g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tuRKu-0004ds-IX; Tue, 18 Mar 2025 03:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77093] [PATCH rust-team 01/18] build/cargo: Pass =?utf-8?b?4oCYLS1vZmZsaW5l4oCZ?= to cargo. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org Resent-Date: Tue, 18 Mar 2025 07:26:04 +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 , Hilton Chain , Divya Ranjan Pattanaik , Efraim Flashner , Steve George X-Debbugs-Original-Xcc: Hilton Chain , Divya Ranjan Pattanaik , Efraim Flashner , Steve George Received: via spool by 77093-submit@debbugs.gnu.org id=B77093.174228273817564 (code B ref 77093); Tue, 18 Mar 2025 07:26:04 +0000 Received: (at 77093) by debbugs.gnu.org; 18 Mar 2025 07:25:38 +0000 Received: from localhost ([127.0.0.1]:35857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuRKT-0004Z7-Ul for submit@debbugs.gnu.org; Tue, 18 Mar 2025 03:25:38 -0400 Received: from mx.boiledscript.com ([2a01:4f8:10b:392::42]:46470) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tuRKR-0004YQ-1S for 77093@debbugs.gnu.org; Tue, 18 Mar 2025 03:25:35 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1742282733; 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=fTJrKeLT9GSPYJTsuUaujgtn6qA4bB0llojftLqgAJM=; b=b7/g+ibWHvXhpUnpzttbkf6FJYNZVjwxskFtQFXhnCk/cZ86szVVA/dEk0dhOyxL3cJ7le q3ys8+05dw3JaXiPjyZ6a7TBs7ibkP7jt53oUHJlrm5je7vhdHwwI+kJYFsOPo1kCZpj7B GBP4KSyp1U/B9OtRUU32uLQBDV4fU1T9vo3UcBOTU6VUTnLv5BzMkO6ARE35gtWKoMbAZD iam9CwRTvMPLEwc0HWXJg3updFy5IuiLHgyZihDxCmKOLxhw4Lr0OBY7d4VYr5ZkJypyhn bq7wo33+8OAVVylVU0M20bIOK2iF6yFyZrUU7KUHjw8T2ZfEPZ7YeVDcPK2zjQ== Date: Tue, 18 Mar 2025 15:24:14 +0800 Message-ID: <73db5916ba93efd5f30d9e45945a0ccff88c330f.1742281797.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-MS-Reactions: disallow 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?