From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Thompson <dthompson2@worcester.edu>
Subject: Re: [PATCH 1/3] guix import pypi: add the Apache License 2.0
Date: Wed, 15 Oct 2014 19:24:55 -0400
Message-ID: <87oatcdigo.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me>
References: <1413413354-31144-1-git-send-email-tipecaml@gmail.com>
	<1413413354-31144-2-git-send-email-tipecaml@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56713)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dthompson2@worcester.edu>) id 1XeXwH-0000hg-Jm
	for guix-devel@gnu.org; Wed, 15 Oct 2014 19:25:12 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <dthompson2@worcester.edu>) id 1XeXwA-00057l-QB
	for guix-devel@gnu.org; Wed, 15 Oct 2014 19:25:05 -0400
Received: from na6sys009bog035.obsmtp.com ([74.125.150.109]:38280)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dthompson2@worcester.edu>) id 1XeXwA-000576-Gn
	for guix-devel@gnu.org; Wed, 15 Oct 2014 19:24:58 -0400
Received: by mail-qg0-f50.google.com with SMTP id q108so1776196qgd.9
	for <guix-devel@gnu.org>; Wed, 15 Oct 2014 16:24:57 -0700 (PDT)
In-Reply-To: <1413413354-31144-2-git-send-email-tipecaml@gmail.com>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=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: Cyril Roelandt <tipecaml@gmail.com>, guix-devel@gnu.org

Cyril Roelandt <tipecaml@gmail.com> writes:

> * guix/import/pypi.scm (string->license): add ASL2.0.
> ---
>  guix/import/pypi.scm | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
> index d0e776e..8f5e031 100644
> --- a/guix/import/pypi.scm
> +++ b/guix/import/pypi.scm
> @@ -85,6 +85,7 @@ recursively apply the procedure to the sub-list."
>     ((or "BSD" "BSD License") bsd-3)
>     ((or "MIT" "MIT license" "Expat license") expat)
>     ("Public domain" public-domain)
> +   ("Apache License, Version 2.0" asl2.0)
>     (_ #f)))
>  
>  (define (url-fetch url file-name)
> @@ -151,7 +152,8 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
>                              (,gpl3 . gpl3)
>                              (,bsd-3 . bsd-3)
>                              (,expat . expat)
> -                            (,public-domain . public-domain))
> +                            (,public-domain . public-domain)
> +                            (,asl2.0 . asl2.0))
>                            license))))
>  
>  (define (pypi->guix-package package-name)
> -- 
> 1.8.4.rc3
>
>

Looks good.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate