amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system: cargo: Accept unlabeled #:cargo-inputs.

Browse source 
* guix/build-system/cargo.scm (crate-closure): Match unlabeled inputs.

Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Herman Rimm 2024-12-09 20:58:05 +01:00 • committed by Efraim Flashner
parent c623494fef
commit 3988966904
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
guix/build-system/cargo.scm
View file

@ -6,6 +6,7 @@
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -242,11 +243,14 @@ do not extract the conventional inputs)."
(if (null? propagated) (if (null? propagated)
(reverse result) (reverse result)
(loop (reverse (concatenate propagated)) result '() seen))) (loop (reverse (concatenate propagated)) result '() seen)))
(((and input (label (? package? package))) rest ...) ;; Match inputs with labels for backward compatibility.
(((or (_ (? package? package))
(? package? package))
rest ...)
(if (seen? seen package) (if (seen? seen package)
(loop rest result propagated seen) (loop rest result propagated seen)
(loop rest (loop rest
(cons input result) (cons package result)
(cons (package-cargo-inputs package) (cons (package-cargo-inputs package)
propagated) propagated)
(vhash-consq package package seen)))) (vhash-consq package package seen))))
@ -303,8 +307,8 @@ any dependent crates. This can be a benefits:
something that can always be extended or reworked in the future)." something that can always be extended or reworked in the future)."
(filter-map (filter-map
(match-lambda (match-lambda
((label (? package? p)) ((? package? p)
(list label (package-source p))) (list (package-name p) (package-source p)))
((label input) ((label input)
(list label input))) (list label input)))
(crate-closure (append cargo-inputs cargo-development-inputs)))) (crate-closure (append cargo-inputs cargo-development-inputs))))