unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH 02/12] import: utils: Symbols from 'license->symbol' have a license: prefix.
@ 2016-08-05 18:37 David Craven
  2016-08-05 18:37 ` [PATCH 03/12] gnu: python: Import guix licenses with #:prefix license: David Craven
                   ` (10 more replies)
  0 siblings, 11 replies; 69+ messages in thread
From: David Craven @ 2016-08-05 18:37 UTC (permalink / raw)
  To: guix-devel; +Cc: David Craven

* guix/import/utils.scm (define-module): guix licenses import uses a prefix.
  (string->licenses): Add license: prefix to licenses.
  (license->symbol): Add license: prefix to licenses. Return a symbol with the
  prefix license:.
---
 guix/import/utils.scm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 44e004b..93cd0f0 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)
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 69+ messages in thread

end of thread, other threads:[~2016-10-24 21:15 UTC | newest]

Thread overview: 69+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-05 18:37 [PATCH 02/12] import: utils: Symbols from 'license->symbol' have a license: prefix David Craven
2016-08-05 18:37 ` [PATCH 03/12] gnu: python: Import guix licenses with #:prefix license: David Craven
2016-08-05 18:37 ` [PATCH 04/12] gnu: python: Add python-binaryornot David Craven
2016-08-08 20:37   ` Leo Famulari
2016-08-22 12:05     ` David Craven
2016-08-22 12:14       ` David Craven
2016-08-22 13:20         ` [PATCH 01/11] import: utils: Symbols from 'license->symbol' have a license: prefix David Craven
2016-08-22 13:20           ` [PATCH 02/11] gnu: python: Import guix licenses with #:prefix license: David Craven
2016-08-26 20:55             ` David Craven
2016-08-22 13:20           ` [PATCH 03/11] gnu: Add python-binaryornot David Craven
2016-08-22 13:20           ` [PATCH 04/11] gnu: Add python-nltk David Craven
2016-08-27  8:39             ` Danny Milosavljevic
2016-10-24 21:15             ` Leo Famulari
2016-08-22 13:20           ` [PATCH 05/11] gnu: Add python-pymongo David Craven
2016-08-22 13:20           ` [PATCH 06/11] gnu: Add python-sh David Craven
2016-08-27  8:42             ` Danny Milosavljevic
2016-08-28 12:28               ` David Craven
2016-08-29 10:31                 ` Guix with U-Boot Danny Milosavljevic
2016-08-29 11:25                   ` David Craven
2016-08-29 14:12                     ` David Craven
2016-08-29 14:19                       ` Danny Milosavljevic
2016-08-29 16:51                         ` David Craven
2016-08-29 17:20                           ` Danny Milosavljevic
2016-08-29 17:52                             ` Danny Milosavljevic
2016-08-29 18:10                               ` Danny Milosavljevic
2016-08-29 17:38                           ` Danny Milosavljevic
2016-08-29 18:16                           ` Danny Milosavljevic
2016-08-29 18:20                             ` David Craven
2016-08-29 18:56                               ` David Craven
2016-08-29 19:04                                 ` Danny Milosavljevic
2016-08-29 18:57                               ` How does install-grub work? Danny Milosavljevic
2016-08-29 20:29                                 ` David Craven
2016-08-29 20:50                                   ` Danny Milosavljevic
2016-08-29 20:54                                     ` David Craven
2016-08-29 21:19                                       ` David Craven
2016-08-29 21:57                                         ` Danny Milosavljevic
2016-08-29 22:00                                           ` David Craven
2016-08-29 22:14                                             ` Danny Milosavljevic
2016-08-30 15:33                                               ` David Craven
2016-08-29 21:45                                       ` Danny Milosavljevic
2016-08-29 22:04                                         ` Danny Milosavljevic
2016-08-22 13:20           ` [PATCH 07/11] gnu: Add python-schematics David Craven
2016-08-22 13:20           ` [PATCH 08/11] gnu: Add python-publicsuffix David Craven
2016-08-22 13:20           ` [PATCH 09/11] gnu: Add python-publicsuffix2 David Craven
2016-08-22 13:20           ` [PATCH 10/11] gnu: Add python-url David Craven
2016-08-22 13:20           ` [PATCH 11/11] gnu: Add python-ipaddress David Craven
2016-08-05 18:37 ` [PATCH 05/12] gnu: python: Add python-nltk David Craven
2016-08-05 18:37 ` [PATCH 06/12] gnu: python: Add python-pymongo David Craven
2016-08-08 20:36   ` Leo Famulari
2016-08-08 20:39     ` Leo Famulari
2016-08-05 18:37 ` [PATCH 07/12] gnu: python: Add python-sh David Craven
2016-08-05 18:37 ` [PATCH 08/12] gnu: python: Add python-schematics David Craven
2016-08-05 18:37 ` [PATCH 09/12] gnu: python: Add python-publicsuffix David Craven
2016-08-05 18:37 ` [PATCH 10/12] gnu: python: Add python-publicsuffix2 David Craven
2016-08-05 18:37 ` [PATCH 11/12] gnu: python: Add python-url David Craven
2016-08-05 18:37 ` [PATCH 12/12] gnu: python: Add python-ipaddress David Craven
2016-08-05 18:50   ` Leo Famulari
2016-08-06 12:52     ` David Craven
2016-08-06 15:57       ` Danny Milosavljevic
2016-08-07  0:20       ` Leo Famulari
2016-08-27  6:43 ` [PATCH 02/12] import: utils: Symbols from 'license->symbol' have a license: prefix Ricardo Wurmus
2016-08-27  8:31   ` David Craven
2016-08-30 19:07     ` Eric Bavier
2016-09-16  5:03       ` Eric Bavier
2016-09-16  7:29         ` David Craven
2016-09-16 15:40           ` Eric Bavier
2016-09-16 15:47             ` David Craven
2016-09-16 17:02               ` Eric Bavier
2016-09-19 13:06                 ` Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).