[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#66080] [PATCH v2 19/23] DRAFT import: juliahub: Fix license managem
From: |
Simon Tournier |
Subject: |
[bug#66080] [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@gnu.org>
Signed-off-by: Simon Tournier <zimon.toutoune@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
- [bug#62202] [PATCH v2 23/23] DRAFT guix: import: julia: Fix beautify., (continued)
- [bug#62202] [PATCH v2 23/23] DRAFT guix: import: julia: Fix beautify., Simon Tournier, 2023/09/18
- [bug#62202] [PATCH v2 06/23] DRAFT import: juliahub: Correct source parsing., Simon Tournier, 2023/09/18
- [bug#62202] [PATCH v2 18/23] DRAFT import: juliahub: Beautify description., Simon Tournier, 2023/09/18
- [bug#62202] [PATCH v2 15/23] DRAFT import: juliahub: Add support for versions for juliahub-fetch., Simon Tournier, 2023/09/18
- [bug#62202] [PATCH v2 05/23] DRAFT import: juliahub: Add support for native-inputs., Simon Tournier, 2023/09/18
- [bug#62202] [PATCH v2 09/23] DRAFT import: juliahub: Filter out julia stdlibs., Simon Tournier, 2023/09/18
- [bug#62202] [PATCH v2 14/23] DRAFT import: juliahub: Handle the case where we have a subdirectory., Simon Tournier, 2023/09/18
- [bug#62202] [PATCH v2 17/23] DRAFT import: juliahub: More robust toml regex parser., Simon Tournier, 2023/09/18
- [bug#62202] [PATCH v2 11/23] DRAFT import: juliahub: Improve dependency management., Simon Tournier, 2023/09/18
- [bug#62202] [PATCH v2 13/23] DRAFT import: juliahub: Improve test dependencies parsing., Simon Tournier, 2023/09/18
- [bug#66080] [PATCH v2 19/23] DRAFT import: juliahub: Fix license management.,
Simon Tournier <=
- [bug#62202] [PATCH v2 21/23] DRAFT import: juliahub: Fix undefined homepages., Simon Tournier, 2023/09/18