[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#77093] [PATCH rust-team 05/18] build/cargo: Set default value of ar
From: |
Hilton Chain |
Subject: |
[bug#77093] [PATCH rust-team 05/18] build/cargo: Set default value of arguments for build phases. |
Date: |
Tue, 18 Mar 2025 15:24:18 +0800 |
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 bcee10837e..fdc9ae89c8 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")
@@ -381,9 +382,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."
--
2.48.1
- [bug#77093] [PATCH rust-team 00/18] New Rust packaging workflow based on lockfile importer., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 03/18] build-system: cargo: Support packaging Cargo workspace., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 01/18] build/cargo: Pass ‘--offline’ to cargo., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 02/18] build/cargo: Print out all non-empty binary files., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 04/18] build-system: cargo: Support installing Cargo workspace., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 05/18] build/cargo: Set default value of arguments for build phases.,
Hilton Chain <=
- [bug#77093] [PATCH rust-team 07/18] build/cargo: Support non-workspace directory source inputs., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 06/18] build/cargo: Don't try to unpack sanity-check.py., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 08/18] build/cargo: Use system jemalloc., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 09/18] scripts: import: Document argument for ‘--insert’ option in help message., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 10/18] scripts: import: Add two newlines for ‘--insert’ option., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 12/18] scripts: import: Pass "--insert" to importers., Hilton Chain, 2025/03/18