GNU bug report logs - #63053
[PATCH 0/3] Fix "guix import crate"

Previous Next

Full log

View this message in rfc822 format

From: Simon Tournier <zimon.toutoune <at> gmail.com>
To: 63053 <at> debbugs.gnu.org
Cc: Simon Tournier <zimon.toutoune <at> gmail.com>, Christopher Baines <mail <at> cbaines.net>, Josselin Poiret <dev <at> jpoiret.xyz>, Ludovic Courtès <ludo <at> gnu.org>, Mathieu Othacehe <othacehe <at> gnu.org>, Ricardo Wurmus <rekado <at> elephly.net>, Simon Tournier <zimon.toutoune <at> gmail.com>, Tobias Geerinckx-Rice <me <at> tobias.gr>
Subject: [bug#63053] [PATCH 1/3] guix: import: crate: Fix incorrect returned values.
Date: Mon, 24 Apr 2023 17:51:17 +0200

* guix/import/crate.scm (crate->guix-package): Return compatible values with
'recursive-import'.
---
 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 <at> riseup.net>
 ;;; Copyright © 2021 Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
+;;; Copyright © 2023 Simon Tournier <zimon.toutoune <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -293,32 +294,33 @@ (define (sort-map-dependencies deps)
           (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
-- 
2.38.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.