diff mbox series

[bug#62202,09/21] import: juliahub: Improve dependency management.

Message ID 20230315125130.23041-9-ngraves@ngraves.fr
State New
Headers show
Series Juliahub import script. | expand

Commit Message

Nicolas Graves March 15, 2023, 12:51 p.m. UTC 
---
 guix/import/juliahub.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)
diff mbox series

Patch

diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm
index b1eeb736a8..fc25ba1d42 100644
--- a/guix/import/juliahub.scm
+++ b/guix/import/juliahub.scm
@@ -168,22 +168,20 @@  (define* (juliahub-fetch name #:key (version #f))
          json->juliahub-package))
 
 (define (make-julia-sexp name source home-page synopsis description
-                         dependencies test-dependencies-names licenses)
+                         direct-dependencies test-dependencies-names licenses)
   "Return the `package' s-expression for a Julia package with the given NAME,
-VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES,
+VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DIRECT-DEPENDENCIES,
 TEST-DEPENDENCIES-NAMES and LICENSES."
   `(package
      (name ,(julia-name->guix-name name))
      (version ,version)
      (source ,source)
      (build-system julia-build-system)
-     ,@(let ((direct-dependencies
-              (filter julia-dependency-direct? dependencies)))
-         (if (null? direct-dependencies)
-             '()
-             `((propagated-inputs
-                (list ,@(map (compose julia-name->guix-name juliahub-dependency-name)
-                             direct-dependencies))))))
+     ,@(if (null? direct-dependencies)
+           '()
+           `((propagated-inputs
+              (list ,@(map (compose julia-name->guix-name juliahub-dependency-name)
+                           direct-dependencies)))))
      ,@(if (null? test-dependencies-names)
            '()
            `((native-inputs
@@ -211,9 +209,12 @@  (define* (juliahub->guix-package package-name
                        `(tag-or-commit
                          . ,(string-append
                              "v" (juliahub-package-version package))))))
-          (let* ((dependencies-names
+          (let* ((direct-dependencies
+                  (filter juliahub-dependency-direct?
+                          (juliahub-package-dependencies package)))
+                 (dependencies-names
                   (map juliahub-dependency-name
-                       (juliahub-package-direct-dependencies package)))
+                       direct-dependencies))
                  (licenses
                   (map spdx-string->license
                        (list (juliahub-package-license package))))
@@ -224,7 +225,7 @@  (define* (juliahub->guix-package package-name
                      (juliahub-package-homepage package)
                      (juliahub-package-description package)
                      (beautify-description (juliahub-package-readme package))
-                     (juliahub-package-direct-dependencies package)
+                     direct-dependencies
                      test-dependencies-names
                      licenses)
                     (append dependencies-names test-dependencies-names))))