From patchwork Sat May 25 20:09:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Vollmert X-Patchwork-Id: 14080 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 84A4D1704B; Sat, 25 May 2019 21:11:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 31A3317016 for ; Sat, 25 May 2019 21:11:08 +0100 (BST) Received: from localhost ([127.0.0.1]:45905 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hUd0V-0004w7-Jr for patchwork@mira.cbaines.net; Sat, 25 May 2019 16:11:07 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#35906] [PATCH] guix import hackage: add two license types Resent-From: Robert Vollmert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 May 2019 20:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35906 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35906@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15588150154753 (code B ref -1); Sat, 25 May 2019 20:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 May 2019 20:10:15 +0000 Received: from localhost ([127.0.0.1]:49710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hUczf-0001Ea-2H for submit@debbugs.gnu.org; Sat, 25 May 2019 16:10:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hUczZ-0001EG-Ti for submit@debbugs.gnu.org; Sat, 25 May 2019 16:10:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:41229) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hUczU-0005Eh-R2 for submit@debbugs.gnu.org; Sat, 25 May 2019 16:10:04 -0400 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 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 8F7A94F32A; Sat, 25 May 2019 22:09:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id OZsO2Kn7nlnB; Sat, 25 May 2019 22:09:58 +0200 (CEST) From: Robert Vollmert Date: Sat, 25 May 2019 22:09:51 +0200 Message-Id: <20190525200951.14580-1-rob@vllmrt.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Vollmert Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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)))