[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/15: guix: import: crate: Fix incorrect returned values.
From: |
guix-commits |
Subject: |
05/15: guix: import: crate: Fix incorrect returned values. |
Date: |
Sun, 30 Apr 2023 17:22:13 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 7304694f51f3e99817ac3033fcd20545623e9a94
Author: Simon Tournier <zimon.toutoune@gmail.com>
AuthorDate: Mon Apr 24 17:51:17 2023 +0200
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>
---
guix/import/crate.scm | 54 ++++++++++++++++++++++++++-------------------------
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 514eca2229..6e10ebb5d4 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -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,32 +294,33 @@ look up the development dependencs for the given crate."
(match-lambda* (((name _) ...)
(apply string-ci<? name)))))
- (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))
- (cargo-development-inputs (if include-dev-deps?
- (sort-map-dependencies
dev-dep-crates)
- '())))
- (values
- (make-crate-sexp #:build? include-dev-deps?
- #:name crate-name
- #:version (crate-version-number version*)
- #:cargo-inputs cargo-inputs
- #:cargo-development-inputs cargo-development-inputs
- #:home-page
- (let ((home-page (crate-home-page crate)))
- (if (string? home-page)
- home-page
- (let ((repository (crate-repository crate)))
- (if (string? repository)
- repository
- ""))))
- #:synopsis (crate-description crate)
- #:description (crate-description crate)
- #:license (and=> (crate-version-license version*)
- string->license))
- (append cargo-inputs cargo-development-inputs)))))
+ (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))
+ (cargo-development-inputs (if include-dev-deps?
+ (sort-map-dependencies
dev-dep-crates)
+ '())))
+ (values
+ (make-crate-sexp #:build? include-dev-deps?
+ #:name crate-name
+ #:version (crate-version-number version*)
+ #:cargo-inputs cargo-inputs
+ #:cargo-development-inputs cargo-development-inputs
+ #:home-page
+ (let ((home-page (crate-home-page crate)))
+ (if (string? home-page)
+ home-page
+ (let ((repository (crate-repository crate)))
+ (if (string? repository)
+ repository
+ ""))))
+ #:synopsis (crate-description crate)
+ #:description (crate-description crate)
+ #:license (and=> (crate-version-license version*)
+ string->license))
+ (append cargo-inputs cargo-development-inputs)))
+ (values #f '())))
(define* (crate-recursive-import crate-name #:key version)
(recursive-import crate-name
- branch master updated (a27e0d4533 -> 08675129aa), guix-commits, 2023/04/30
- 05/15: guix: import: crate: Fix incorrect returned values.,
guix-commits <=
- 01/15: import: pypi: Adjust tests for new build system., guix-commits, 2023/04/30
- 02/15: gnu: Add diffpdf., guix-commits, 2023/04/30
- 07/15: scripts: import: crate: Handle non-existent package., guix-commits, 2023/04/30
- 04/15: gnu: Add chicken-srfi-18., guix-commits, 2023/04/30
- 08/15: system: guix: Use config's ACL file location., guix-commits, 2023/04/30
- 03/15: gnu: Add chicken-compile-file., guix-commits, 2023/04/30
- 09/15: installer: Filter out C.UTF-8 from the list of locales., guix-commits, 2023/04/30
- 11/15: gnu: mumi: Add guile-gnutls to inputs., guix-commits, 2023/04/30
- 12/15: gnu: slim: Fix build failure with GCC-11, guix-commits, 2023/04/30
- 14/15: gnu: plover: Fix build., guix-commits, 2023/04/30