From patchwork Mon Apr 28 16:23:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42111 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 C854827BC4A; Mon, 28 Apr 2025 17:33:31 +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 8D0D627BC49 for ; Mon, 28 Apr 2025 17:33:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9RPu-0007xd-3Y; Mon, 28 Apr 2025 12:33:14 -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-0007ew-71 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 1u9RP6-0004RQ-41 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=E8orD5fkoLynauQpj2d1xWf3SVvVuqHu8HSQ2hsw6Cw=; b=EoHrszNg+eBuAoPosI0MJPMWLwUEjHS5YeSfhz8UGOCrtJvuCFvuqGuyb/jqLLTePxbYuSQdSSFRgbR0UYkfbnDf6sbsRsdz6lhr7kLvUgt+izIMpaJkc/rozS5fpGU9ZQRph67LTSkL7m37KRYY5vDa6Piqc95qCBfl9NM38wHQRRET2t2DQWjCuiKVeQcaLBpGLmpm+UAHmf+I3zwtKLrR90pLz4lJ+gULu7ghMRKClMaYtM8mT0+Rw8zw4p+3uvyb40l2O+pAQmdkmlfCKX0jopOcl8HnyT47DqtfkZCD/TEhYWT26K4mdvbBhIC+sqbDVfQ+xJp760c4yNaU7g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9ROw-0003J9-11; Mon, 28 Apr 2025 12:32:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77093] [PATCH v4 rust-team 11/22] build/cargo: Set default value of arguments for build phases. 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:13 +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.174585791912444 (code B ref 77093); Mon, 28 Apr 2025 16:32:13 +0000 Received: (at 77093) by debbugs.gnu.org; 28 Apr 2025 16:31:59 +0000 Received: from localhost ([127.0.0.1]:32855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9ROg-0003Ec-N2 for submit@debbugs.gnu.org; Mon, 28 Apr 2025 12:31:59 -0400 Received: from mail.boiledscript.com ([49.12.134.184]:50400) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u9ROL-0003BB-44 for 77093@debbugs.gnu.org; Mon, 28 Apr 2025 12:31:38 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1745857895; 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=E8orD5fkoLynauQpj2d1xWf3SVvVuqHu8HSQ2hsw6Cw=; b=Ai329bcGsAxnt3/9PsYzLJz9mspPW/g1V8HLoL77+EPfrfpJbXO/s0CcL+4jSpG972eU3j KhuwUoL0f1n+QjL3IHGBn+myhF0zr+1se9+PpD0maKu+pJPd5cpiqKHyTWiJJZPG/MEkbo zwjypXmZN2uO+2rNq/u7bcWjrLpwQ0hhfQhwO+m3VVZFRMSpDdEa/pNZiZ/HfMWXd7rPxd 85lL/YQyCvdR+IKte+i6B0d6pP/Jue3Y0MMlmWUMjjxiCpDriOL3ZwxEoZiyz5dZ5P90am PYPTbl19ZNvOo0sr2Xms37zL1tKKMFR8tkEe05a9MKAoumHENGQKDNgEv6hlqg== Date: Tue, 29 Apr 2025 00:23:08 +0800 Message-ID: <4f5f2b0684da8ffc8629a2a6e9630e194b6103cc.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 it easier to use these phases in other bulid systems. * guix/build/cargo-build-system.scm (unpack-rust-crates, configure, build) (package, install): Set default value for arguments specific to this build system. Change-Id: I1dde1b063d8eee57967903abd2fce94574211a0a --- guix/build/cargo-build-system.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index be96ab309f..d8433e1acd 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -77,7 +77,8 @@ (define (crate-src? path) " | cut -d/ -f2" " | grep -q '^Cargo.toml$'"))))) -(define* (unpack-rust-crates #:key inputs vendor-dir #:allow-other-keys) +(define* (unpack-rust-crates #:key inputs (vendor-dir "guix-vendor") + #:allow-other-keys) (define (inputs->rust-inputs inputs) "Filter using the label part from INPUTS." (filter (lambda (input) @@ -141,7 +142,7 @@ (define* (check-for-pregenerated-files #:key parallel-build? #:allow-other-keys) (define* (configure #:key inputs target system - cargo-target + (cargo-target #f) (vendor-dir "guix-vendor") #:allow-other-keys) "Vendor Cargo.toml dependencies as guix inputs." @@ -260,7 +261,7 @@ (define* (patch-cargo-checksums #:key (define* (build #:key parallel-build? - skip-build? + (skip-build? #f) (features '()) (cargo-build-flags '("--release")) #:allow-other-keys) @@ -300,8 +301,8 @@ (define* (check #:key (define* (package #:key source - skip-build? - install-source? + (skip-build? #f) + (install-source? #t) (cargo-package-crates '()) (cargo-package-flags '("--no-metadata" "--no-verify")) (vendor-dir "guix-vendor") @@ -376,9 +377,9 @@ (define* (package #:key (define* (install #:key inputs outputs - skip-build? - install-source? - features + (skip-build? #f) + (install-source? #t) + (features '()) (cargo-install-paths '()) #:allow-other-keys) "Install a given Cargo package."