summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorDavid Craven <david@craven.ch>2016-08-05 19:15:56 +0200
committerDavid Craven <david@craven.ch>2016-08-28 14:04:50 +0200
commita34b236c17f5f7a29c3ce05766071b57e8cdb271 (patch)
tree124cd95fb0aadda3fe469a339d86dc9f1f6da7a8 /guix
parent1ae27aac4cec9c16c878dbce85eef9e00c8e4240 (diff)
import: Importers return prefixed licenses.
* guix/import/utils.scm (define-module): Import licenses with license: prefix. (string->licenses): Use prefixed licenses. (license->symbol): Return symbols with the prefix license:. * guix/tests/pypi.scm (pypi->guix-package): Update test cases. * guix/tests/gem.scm (gem->guix-package): Update test case.
Diffstat (limited to 'guix')
-rw-r--r--guix/import/utils.scm26
1 files changed, 13 insertions, 13 deletions
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 44e004b084..93cd0f0fa5 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -22,7 +22,7 @@
#:use-module (srfi srfi-1)
#:use-module (guix hash)
#:use-module (guix base32)
- #:use-module (guix licenses)
+ #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module ((guix build download) #:prefix build:)
#:export (factorize-uri
@@ -112,12 +112,12 @@ recursively apply the procedure to the sub-list."
(define (string->license str)
"Convert the string STR into a license object."
(match str
- ("GNU LGPL" lgpl2.0)
- ("GPL" gpl3)
- ((or "BSD" "BSD License") bsd-3)
- ((or "MIT" "MIT license" "Expat license") expat)
- ("Public domain" public-domain)
- ((or "Apache License, Version 2.0" "Apache 2.0") asl2.0)
+ ("GNU LGPL" license:lgpl2.0)
+ ("GPL" license:gpl3)
+ ((or "BSD" "BSD License") license:bsd-3)
+ ((or "MIT" "MIT license" "Expat license") license:expat)
+ ("Public domain" license:public-domain)
+ ((or "Apache License, Version 2.0" "Apache 2.0") license:asl2.0)
(_ #f)))
(define (license->symbol license)
@@ -125,12 +125,12 @@ recursively apply the procedure to the sub-list."
to in the (guix licenses) module, or #f if there is no such known license."
;; TODO: Traverse list public variables in (guix licenses) instead so we
;; don't have to maintain a list manualy.
- (assoc-ref `((,lgpl2.0 . lgpl2.0)
- (,gpl3 . gpl3)
- (,bsd-3 . bsd-3)
- (,expat . expat)
- (,public-domain . public-domain)
- (,asl2.0 . asl2.0))
+ (assoc-ref `((,license:lgpl2.0 . license:lgpl2.0)
+ (,license:gpl3 . license:gpl3)
+ (,license:bsd-3 . license:bsd-3)
+ (,license:expat . license:expat)
+ (,license:public-domain . license:public-domain)
+ (,license:asl2.0 . license:asl2.0))
license))
(define (snake-case str)