[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#70923] [PATCH 01/13] build-system: cargo: Accept unlabeled #:cargo-
From: |
Herman Rimm |
Subject: |
[bug#70923] [PATCH 01/13] build-system: cargo: Accept unlabeled #:cargo-inputs. |
Date: |
Mon, 13 May 2024 22:07:58 +0200 |
* guix/build-system/cargo.scm (crate-closure): Match unlabeled inputs.
Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1
---
guix/build-system/cargo.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index c029cc1dda..a918e25e7a 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -234,7 +234,17 @@ (define (crate-closure inputs)
(if (null? propagated)
(reverse result)
(loop (reverse (concatenate propagated)) result '() #f seen)))
- (((and input (label (? package? package))) rest ...)
+ (((? package? package) rest ...)
+ (if (and (not first?) (seen? seen package))
+ (loop rest result propagated first? seen)
+ (loop rest
+ (cons (list (package-name package) package) result)
+ (cons (package-cargo-inputs package)
+ propagated)
+ first?
+ (vhash-consq package package seen))))
+ ;; Match inputs with explicit labels for backward compatibility.
+ (((and input (_ (? package? package))) rest ...)
(if (and (not first?) (seen? seen package))
(loop rest result propagated first? seen)
(loop rest
--
2.41.0
- [bug#70923] [PATCH 00/13] Add (guix import utils) procedures., Herman Rimm, 2024/05/13
- [bug#70923] [PATCH 01/13] build-system: cargo: Accept unlabeled #:cargo-inputs.,
Herman Rimm <=
- [bug#70923] [PATCH 02/13] import: utils: Emit new-style package inputs., Herman Rimm, 2024/05/13
- [bug#70923] [PATCH 04/13] tests: elm: Adjust to new-style package inputs., Herman Rimm, 2024/05/13
- [bug#70923] [PATCH 08/13] import: elpa: Use maybe-propagated-inputs procedure., Herman Rimm, 2024/05/13
- [bug#70923] [PATCH 11/13] import: cpan: Use 'maybe-upstream-inputs' procedure., Herman Rimm, 2024/05/13
- [bug#70923] [PATCH 05/13] import: crate: Emit new-style package inputs., Herman Rimm, 2024/05/13
- [bug#70923] [PATCH 13/13] import: hexpm: Use (guix import utils) 'maybe-inputs' procedure., Herman Rimm, 2024/05/13
- [bug#70923] [PATCH 03/13] tests: go: Adjust to new-style package inputs., Herman Rimm, 2024/05/13
- [bug#70923] [PATCH 10/13] import: cran: Use 'maybe-list-field' procedure., Herman Rimm, 2024/05/13
- [bug#70923] [PATCH 09/13] import: hackage: Use 'maybe-list-field' procedure., Herman Rimm, 2024/05/13
- [bug#70923] [PATCH 06/13] import: utils: Add 'maybe-upstream-inputs' procedure., Herman Rimm, 2024/05/13