From patchwork Wed Mar 4 08:53:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 20507 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 482E527BBEA; Wed, 4 Mar 2020 08:54:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C623E27BBE4 for ; Wed, 4 Mar 2020 08:54:09 +0000 (GMT) Received: from localhost ([::1]:59122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Pn7-0001aA-Au for patchwork@mira.cbaines.net; Wed, 04 Mar 2020 03:54:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46018) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Pn1-0001a0-8J for guix-patches@gnu.org; Wed, 04 Mar 2020 03:54:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Pn0-0004sG-71 for guix-patches@gnu.org; Wed, 04 Mar 2020 03:54:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34365) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Pn0-0004re-3U for guix-patches@gnu.org; Wed, 04 Mar 2020 03:54:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j9Pn0-0007FV-0g for guix-patches@gnu.org; Wed, 04 Mar 2020 03:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39895] [PATCH] import: pypi: Add more licenses Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Mar 2020 08:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39895 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39895@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158331201327827 (code B ref -1); Wed, 04 Mar 2020 08:54:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Mar 2020 08:53:33 +0000 Received: from localhost ([127.0.0.1]:40338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9PmW-0007Ek-RJ for submit@debbugs.gnu.org; Wed, 04 Mar 2020 03:53:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:36548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9PmV-0007Ed-66 for submit@debbugs.gnu.org; Wed, 04 Mar 2020 03:53:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45605) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9PmT-0000zL-Jg for guix-patches@gnu.org; Wed, 04 Mar 2020 03:53:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9PmS-0003tq-Gf for guix-patches@gnu.org; Wed, 04 Mar 2020 03:53:29 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:34333) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9PmR-0003qx-SU for guix-patches@gnu.org; Wed, 04 Mar 2020 03:53:28 -0500 Received: by mail-wm1-x336.google.com with SMTP id i10so4208871wmd.1 for ; Wed, 04 Mar 2020 00:53:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leibniz-psychology-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=/nvYLBbepMruMt2YB+0ArhXVdwbJrJyQ1pMx3AqsrCo=; b=tPLCqDRpFcT4U6s0NFo6JmylI6ZijmE/wD8Qz6rxnZhhveA7oCdGKnrN3E52UsTYcr yF5VBmbiuWHEMrb0nxsxRJ/uIgp3QOkSmMbOKAoQygEMdapxdYn9pbTXPponjmkAQfJZ kAuIK+sLOBa5GptNvoVim/ORxo5iGrz1ME/g2PArdmXHo3Bpk4HuehSMeXSwvsZesGk+ SNm3s8k9Z1RmuZ6rDROL6BppR0AKKUsksbJ/If1mkeH3nxYHbFfg9toqKDVsYE4UoWX2 6aC/khRpDHfDBONwwTJT7OtKfAo7MbN233zDJb7g2Cj0F7TYH/proKq/JNhItoYOHyQ8 mVCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=/nvYLBbepMruMt2YB+0ArhXVdwbJrJyQ1pMx3AqsrCo=; b=Xthz+jOJT7I88LRKWYE6h56+96cXrKCdhJJzVVpahJAvD8m9p4o9NvZqDyxUkzUvsP igFRGXBSc8phABXcezTcrirY0fDaZ3naM3cpMJDj7khZxzu2fcQXwj1i8XM0Kh7VSUu2 RDnW4GyF11WWt+P0YYmR6QNnNykejTxshk9ZF0r2A0cYukqHhSLNSisFvfKY/RbbB/KR xL580BDWeRvykF5QMLesTVv2B0ZGKHAHyfsAxv4jAs+CsLoNf8HB6UDmDDBLM20hBTaF nF3rPJBcZ54GUltsVPBketGO9Hg/soTb+GGcNK2G3ND4uH/a5g+cVVtK8LsWVL6sjAcu kMzw== X-Gm-Message-State: ANhLgQ0o/YBw2vCZbiXkfhZz9kGrV5F8zeI+Fsbgfg6n3bhDeMwMbzl4 NYP3i2YbsDpg0gLmP70lIKjraOSsCZvTb06GlW3nXmhrqglHhBjr7N7odADnWRqkFhJ3hc3arfa jk6wNU13mDLrjPX04YHfpP/meGYBwJGqaJyIxmTRxSk4OdeX+sYksvgt9p30gLEJELpBYAtljGa CoPTlfFkI= X-Google-Smtp-Source: ADFU+vuiodX9l+/MWNQPzyXBR4pCI6qYu/0rByHbrQyIFSH9QrIjH2WTU37s4hZidlJIj3uMv5wbNw== X-Received: by 2002:a1c:59c6:: with SMTP id n189mr2519162wmb.178.1583312006163; Wed, 04 Mar 2020 00:53:26 -0800 (PST) Received: from localhost (zpidlx9.uni-trier.de. [136.199.85.49]) by smtp.gmail.com with ESMTPSA id c26sm3003797wmb.8.2020.03.04.00.53.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 00:53:25 -0800 (PST) Date: Wed, 4 Mar 2020 09:53:26 +0100 From: Lars-Dominik Braun Message-ID: <20200304085326.GA17022@zpidnp36> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, the following patch adds a few more string to license conversions for the pypi importer that I’ve encountered “in the wild”. Lars From 16fce0c5e7c67b08b910740310b2e86e203bc261 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 4 Mar 2020 09:42:17 +0100 Subject: [PATCH] import: pypi: Add more licenses * guix/import/pypi.scm (string->license): Add BSD 2-clause and MPL 2.0, add more strings for BSD 3-clause and MIT license --- guix/import/pypi.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 6897f42be3..5a1f570515 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -439,10 +439,12 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (match str ("GNU LGPL" license:lgpl2.0) ("GPL" license:gpl3) - ((or "BSD" "BSD License") license:bsd-3) - ((or "MIT" "MIT license" "Expat license") license:expat) + ((or "BSD" "BSD-3" "BSD License") license:bsd-3) + ("BSD-2-Clause" license:bsd-2) + ((or "MIT" "MIT license" "MIT License" "Expat license") license:expat) ("Public domain" license:public-domain) ((or "Apache License, Version 2.0" "Apache 2.0") license:asl2.0) + ("MPL 2.0" license:mpl2.0) (_ #f))) (define (pypi-package? package) -- 2.20.1