[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62202] [PATCH 17/21] import: juliahub: Fix license management.
From: |
Nicolas Graves |
Subject: |
[bug#62202] [PATCH 17/21] import: juliahub: Fix license management. |
Date: |
Wed, 15 Mar 2023 13:51:26 +0100 |
---
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 338f042441..e4b26bea34 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.39.2
- [bug#62202] [PATCH 08/21] import: juliahub: Simplify juliahub dependency management., (continued)
- [bug#62202] [PATCH 08/21] import: juliahub: Simplify juliahub dependency management., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 10/21] import: juliahub: Add functions to parse the git repo for a git tag., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 07/21] import: juliahub: Filter out julia stdlibs., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 12/21] import: juliahub: Handle the case where we have a subdirectory., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 13/21] import: juliahub: Add support for versions for juliahub-fetch., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 16/21] import: juliahub: Beautify description., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 18/21] import: juliahub: Fix version management., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 14/21] import: juliahub: Filter out stdlibs from test-dependencies., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 15/21] import: juliahub: More robust toml regex parser., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 20/21] import: utils: Rule out texinfo common syntax from @ escape., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 17/21] import: juliahub: Fix license management.,
Nicolas Graves <=
- [bug#62202] [PATCH 21/21] import: juliahub: output package names as symbols., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 19/21] import: juliahub: Fix undefined homepages., Nicolas Graves, 2023/03/15