Browse Source

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.
wip-deploy
David Craven 6 years ago
parent
commit
a34b236c17
No known key found for this signature in database GPG Key ID: C5E051C79C0BECDB
  1. 26
      guix/import/utils.scm
  2. 2
      tests/gem.scm
  3. 4
      tests/pypi.scm

26
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)

2
tests/gem.scm

@ -71,7 +71,7 @@
('synopsis "A cool gem")
('description "This package provides a cool gem")
('home-page "https://example.com")
('license ('list 'expat 'asl2.0)))
('license ('list 'license:expat 'license:asl2.0)))
#t)
(x
(pk 'fail x #f)))))

4
tests/pypi.scm

@ -130,7 +130,7 @@ baz > 13.37")
('home-page "http://example.com")
('synopsis "summary")
('description "summary")
('license 'lgpl2.0))
('license 'license:lgpl2.0))
(string=? (bytevector->nix-base32-string
test-source-hash)
hash))
@ -190,7 +190,7 @@ baz > 13.37")
('home-page "http://example.com")
('synopsis "summary")
('description "summary")
('license 'lgpl2.0))
('license 'license:lgpl2.0))
(string=? (bytevector->nix-base32-string
test-source-hash)
hash))

Loading…
Cancel
Save