From patchwork Tue Mar 18 14:26:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 40329 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 7628527BBEA; Tue, 18 Mar 2025 14:29:32 +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 2E97327BBE9 for ; Tue, 18 Mar 2025 14:29:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuXwc-0005Na-UZ; Tue, 18 Mar 2025 10:29:27 -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 1tuXwH-0005E4-1U for guix-patches@gnu.org; Tue, 18 Mar 2025 10:29:05 -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 1tuXwG-0001Rk-Nb for guix-patches@gnu.org; Tue, 18 Mar 2025 10:29:04 -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=lnQ3fNha3tTpiuYZ0UQT7xqK8VBIVtWVUs+XKQhkaWc=; b=ZrNlNx3S/3J3MByVhsanm9IiKDoKlvPbb+VzeNInjJKm3lqWX1q42ytw7AgbjhF9TiohtozJ05H7o9Bh0kFwAQ566AP+3wwALhk9cNnXbFGG1vRoIF/FiGTLTWW3461+gglUugctUSi8j/Tar/N2NAImXrkiDEaTOPgLzeN6E9mUINEnErny+98NVierW4Ot9oS250fIE/e2GY8yoczi2rsLU1LA+TPeTJlcdg8vEXlWxuNuKW/nZpm8Cpu9kxsJrvEl+zMBDTtKkPN65wzF5xryT3sTKhQ1wZqPhV53aR5jGaODpdQPIdXH+emL7XhOnhEzIJ3QktMIrlpPldqnTA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tuXwG-0004hR-8P; Tue, 18 Mar 2025 10:29:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77093] [PATCH rust-team v2 05/17] 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, steve@futurile.net, guix-patches@gnu.org Resent-Date: Tue, 18 Mar 2025 14:29: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 , Efraim Flashner , Divya Ranjan Pattanaik , Efraim Flashner , Steve George X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik , Efraim Flashner , Steve George Received: via spool by 77093-submit@debbugs.gnu.org id=B77093.174230810017657 (code B ref 77093); Tue, 18 Mar 2025 14:29:04 +0000 Received: (at 77093) by debbugs.gnu.org; 18 Mar 2025 14:28:20 +0000 Received: from localhost ([127.0.0.1]:41686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuXvW-0004aM-1l for submit@debbugs.gnu.org; Tue, 18 Mar 2025 10:28:20 -0400 Received: from mx.boiledscript.com ([2a01:4f8:10b:392::42]:57856) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tuXus-0004Sf-4F for 77093@debbugs.gnu.org; Tue, 18 Mar 2025 10:27:39 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1742308056; 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=lnQ3fNha3tTpiuYZ0UQT7xqK8VBIVtWVUs+XKQhkaWc=; b=KdEZAyyY7obD8DuLcmGAHnlUsXMEP4ty/m8aTfpMbBgrFHoiLs6P4wwePRLodql3z7Oh2x rHNWzXd2G/arkzanDgzEKRNhPIzqUCYgsa1lwxglr2MUHMPH+y690L5OqMXWFRlXmZifVX iZdvaGy0QGoD/UmbOipNbamUIXLPrECVfl8ZXjWQzlEpFj1dUSA5mgvnYxb4OX6dQxSiqy d7uT/uqGmKLJGpzh9LSTI35eM86eokfRULFAZJ6FJrUpnv8q0i422XjEsb0iO9e69cOqwG 0W7JUL6RoHQXyl7SKzq6ErulwPnkbhaGPan4++Jlsv4mi8TnWB4eWPdfctMgAA== Date: Tue, 18 Mar 2025 22:26:48 +0800 Message-ID: <7a65eca436b0880f9cd829d3f3703696a08386df.1742306960.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 makes 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 of arguments. 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 85f10a7ac4..85a9698680 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -76,7 +76,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) @@ -139,7 +140,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." @@ -258,7 +259,7 @@ (define* (patch-cargo-checksums #:key (define* (build #:key parallel-build? - skip-build? + (skip-build? #f) (features '()) (cargo-build-flags '("--release")) #:allow-other-keys) @@ -298,8 +299,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") @@ -375,9 +376,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."