From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Bavier Subject: [PATCH 4/4] import: cpan: Sort inputs, use mirror url, adjust licenses. Date: Thu, 12 Feb 2015 09:58:15 -0600 Message-ID: <1423756695-13378-5-git-send-email-bavier@member.fsf.org> References: <1423756695-13378-1-git-send-email-bavier@member.fsf.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLwA6-0003wf-1k for guix-devel@gnu.org; Thu, 12 Feb 2015 10:58:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLwA4-0006bv-SB for guix-devel@gnu.org; Thu, 12 Feb 2015 10:58:42 -0500 Received: from mail.centurylink.net ([205.219.233.9]:12161 helo=smtp.centurylink.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLwA4-0006Zb-KE for guix-devel@gnu.org; Thu, 12 Feb 2015 10:58:40 -0500 In-Reply-To: <1423756695-13378-1-git-send-email-bavier@member.fsf.org> 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * guix/import/cpan.scm (string->license): Add artistic2.0. Use '(package-license perl) for "perl_5" as in our convention. (cpan-module->sexp)[convert-inputs]: Sort returned list of inputs. [source-url]: Substitute cpan mirror url. --- guix/import/cpan.scm | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index c1b0006..3dc6eda 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -49,7 +49,7 @@ ;; apache_1_1 ("apache_2_0" 'asl2.0) ;; artistic_1_0 - ;; artistic_2_0 + ("artistic_2_0" 'artistic2.0) ("bsd" 'bsd-3) ("freebsd" 'bsd-2) ;; gfdl_1_2 @@ -63,7 +63,7 @@ ;; mozilla_1_0 ("mozilla_1_1" 'mpl1.1) ("openssl" 'openssl) - ("perl_5" 'gpl1+) ;and Artistic 1 + ("perl_5" '(package-license perl)) ;GPL1+ and Artistic 1 ("qpl_1_0" 'qpl) ;; ssleay ;; sun @@ -141,17 +141,22 @@ META." (#f '()) ((inputs ...) - (delete-duplicates - ;; Listed dependencies may include core modules. Filter those out. - (filter-map (match-lambda - (("perl" . _) ;implicit dependency - #f) - ((module . _) - (and (not (core-module? module)) - (let ((name (guix-name (module->dist-name module)))) - (list name - (list 'unquote (string->symbol name))))))) - inputs))))) + (sort + (delete-duplicates + ;; Listed dependencies may include core modules. Filter those out. + (filter-map (match-lambda + (("perl" . _) ;implicit dependency + #f) + ((module . _) + (and (not (core-module? module)) + (let ((name (guix-name (module->dist-name module)))) + (list name + (list 'unquote (string->symbol name))))))) + inputs)) + (lambda args + (match args + (((a _ ...) (b _ ...)) + (string