GNU bug report logs - #66080
[PATCH v2 19/23] DRAFT import: juliahub: Fix license management.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 66080 in the body.
You can then email your comments to 66080 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Simon Tournier <zimon.toutoune <at> gmail.com>
To: 62202 <at> debbugs.gnu.org
Cc: Nicolas Graves via Guix-patches via <guix-patches <at> gnu.org>,
 Simon Tournier <zimon.toutoune <at> gmail.com>
Subject: [PATCH v2 19/23] DRAFT import: juliahub: Fix license management.
Date: Mon, 18 Sep 2023 20:03:26 +0200

From: Nicolas Graves via Guix-patches via <guix-patches <at> gnu.org>

Signed-off-by: Simon Tournier <zimon.toutoune <at> gmail.com>
---
 guix/import/juliahub.scm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm
index 338f0424414c..e4b26bea340a 100644
--- a/guix/import/juliahub.scm
+++ b/guix/import/juliahub.scm
@@ -248,10 +248,10 @@ (define* (juliahub-fetch name #:key (version #f))
     (and=> (json-fetch url) json->juliahub-package)))
 
 (define (make-julia-sexp name source home-page synopsis description
-                         direct-dependencies test-dependencies-names licenses)
+                         direct-dependencies test-dependencies-names license)
   "Return the `package' s-expression for a Julia package with the given NAME,
 VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DIRECT-DEPENDENCIES,
-TEST-DEPENDENCIES-NAMES and LICENSES."
+TEST-DEPENDENCIES-NAMES and LICENSE."
   `(package
      (name ,(julia-name->guix-name name))
      (version ,version)
@@ -270,10 +270,8 @@ (define (make-julia-sexp name source home-page synopsis description
      (synopsis ,synopsis)
      (description ,description)
      (home-page ,home-page)
-     (license ,(match licenses
-                 (() #f)
-                 ((license) (license->symbol license))
-                 (_ `(list ,@(map license->symbol licenses)))))))
+     (license
+      ,(if license (spdx-string->license license) #f))))
 
 (define* (juliahub->guix-package package-name
                                  #:key version #:allow-other-keys)
@@ -301,9 +299,6 @@ (define* (juliahub->guix-package package-name
                  (dependencies-names
                   (map juliahub-dependency-name
                        direct-dependencies))
-                 (licenses
-                  (map spdx-string->license
-                       (list (juliahub-package-license package))))
                  (test-dependencies-names
                   (if subdir
                       (parse-test-dependencies
@@ -319,7 +314,7 @@ (define* (juliahub->guix-package package-name
                       (juliahub-package-readme package))
                      direct-dependencies
                      test-dependencies-names
-                     licenses)
+                     (juliahub-package-license package))
                     (append dependencies-names test-dependencies-names))))
         (values #f '()))))
 
-- 
2.38.1

Previous Next

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