From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Craven Subject: [PATCH 01/11] import: utils: Symbols from 'license->symbol' have a license: prefix. Date: Mon, 22 Aug 2016 15:20:08 +0200 Message-ID: <20160822132018.19828-1-david@craven.ch> References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bbp9a-0007wS-0B for guix-devel@gnu.org; Mon, 22 Aug 2016 09:20:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bbp9W-00056a-Lq for guix-devel@gnu.org; Mon, 22 Aug 2016 09:20:37 -0400 Received: from so254-10.mailgun.net ([198.61.254.10]:42169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bbp9V-00054q-9e for guix-devel@gnu.org; Mon, 22 Aug 2016 09:20:34 -0400 In-Reply-To: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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