From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:44022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hUd0T-0004tp-4C for guix-patches@gnu.org; Sat, 25 May 2019 16:11:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hUd0S-0005tT-Ac for guix-patches@gnu.org; Sat, 25 May 2019 16:11:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36166) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hUd0S-0005tK-80 for guix-patches@gnu.org; Sat, 25 May 2019 16:11:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hUd0R-0001G9-WE for guix-patches@gnu.org; Sat, 25 May 2019 16:11:04 -0400 Subject: [bug#35906] [PATCH] guix import hackage: add two license types Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:43879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hUczT-0004X5-N2 for guix-patches@gnu.org; Sat, 25 May 2019 16:10:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hUczS-0005Cs-N4 for guix-patches@gnu.org; Sat, 25 May 2019 16:10:03 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:50886) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hUczS-0005AP-Gg for guix-patches@gnu.org; Sat, 25 May 2019 16:10:02 -0400 From: Robert Vollmert Date: Sat, 25 May 2019 22:09:51 +0200 Message-Id: <20190525200951.14580-1-rob@vllmrt.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35906@debbugs.gnu.org Cc: Robert Vollmert Now recognize "BSD-3-Clause" and "PublicDomain". * guix/import/hackage.scm (string->license): Add two licenses. --- guix/import/hackage.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index d6f5448cfc..c97b16197f 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -160,10 +160,12 @@ version." ("LGPL" "'lgpl??") ("BSD2" 'bsd-2) ("BSD3" 'bsd-3) + ("BSD-3-Clause" 'bsd-3) ("MIT" 'expat) ("ISC" 'isc) ("MPL" 'mpl2.0) ("Apache-2.0" 'asl2.0) + ("PublicDomain" 'public-domain) ((x) (string->license x)) ((lst ...) `(list ,@(map string->license lst))) (_ #f))) --=20 2.21.0