me
/
guix
Archived
1
0
Fork 0
Code

guix: import: crate: Fix incorrect returned values. 

* guix/import/crate.scm (crate->guix-package): Return compatible values with
'recursive-import'.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Simon Tournier 2023-04-24 17:51:17 +02:00 committed by Ludovic Courtès
parent 643692895f
commit 7304694f51
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/import/crate.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -293,7 +294,7 @@ look up the development dependencs for the given crate."
(match-lambda* (((name _) ...)
(apply string-ci<? name)))))
(and crate version*
(if (and crate version*)
(let* ((dependencies (crate-version-dependencies version*))
(dep-crates dev-dep-crates (partition normal-dependency? dependencies))
(cargo-inputs (sort-map-dependencies dep-crates))
@ -318,7 +319,8 @@ look up the development dependencs for the given crate."
#:description (crate-description crate)
#:license (and=> (crate-version-license version*)
string->license))
(append cargo-inputs cargo-development-inputs)))))
(append cargo-inputs cargo-development-inputs)))
(values #f '())))
(define* (crate-recursive-import crate-name #:key version)
(recursive-import crate-name