diff mbox series

[bug#62202,v2,14/23] DRAFT import: juliahub: Handle the case where we have a subdirectory.

Message ID cfb939c1da2ab7c3997297e91dd69712d715d2af.1695060058.git.zimon.toutoune@gmail.com
State New
Headers show
Series [bug#62202,v2,01/23] DRAFT guix: import: go: Add optional transform-version to vcs->origin. | expand

Commit Message

Simon Tournier Sept. 18, 2023, 6:03 p.m. UTC
From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>

Signed-off-by: Simon Tournier <zimon.toutoune@gmail.com>
 guix/import/juliahub.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
diff mbox series


diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm
index 2ea461b72aba..b646f9329562 100644
--- a/guix/import/juliahub.scm
+++ b/guix/import/juliahub.scm
@@ -233,14 +233,12 @@  (define (make-julia-sexp name source home-page synopsis description
                  ((license) (license->symbol license))
                  (_ `(list ,@(map license->symbol licenses)))))))
-;; TODO handle subdir case properly.
 (define* (juliahub->guix-package package-name
                                  #:key version #:allow-other-keys)
   "Fetch the metadata for PACKAGE-NAME from juliahub.org, and return the
 `package' s-expression corresponding to that package, or #f on failure.
 Optionally include a VERSION string to fetch a specific version juliahub."
-  (let* ((package-toml (ini-fetch (general-url name "Package.toml")))
+  (let* ((package-toml (ini-fetch (general-url package-name "Package.toml")))
          (subdir (assoc-ref package-toml 'subdir))
          (tag (latest-git-tag (assoc-ref package-toml 'repo)))
          (package (if version
@@ -264,7 +262,11 @@  (define* (juliahub->guix-package package-name
                   (map spdx-string->license
                        (list (juliahub-package-license package))))
-                 (test-dependencies-names (parse-test-dependencies directory)))
+                 (test-dependencies-names
+                  (if subdir
+                      (parse-test-dependencies
+                       (string-append subdir "/" directory))
+                      (parse-test-dependencies directory))))
             (values (make-julia-sexp