From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:54532)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1if20B-0007fD-JX
 for guix-patches@gnu.org; Wed, 11 Dec 2019 08:26:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1if20A-0003It-7u
 for guix-patches@gnu.org; Wed, 11 Dec 2019 08:26:03 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:51039)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1if20A-0003GV-4l
 for guix-patches@gnu.org; Wed, 11 Dec 2019 08:26:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1if1cx-00059z-JX
 for guix-patches@gnu.org; Wed, 11 Dec 2019 08:02:03 -0500
Subject: bug#37927: [bug#37928] [PATCH v2] import: crate: Better handle
 license expressions.
Resent-To: guix-patches@gnu.org
Resent-Message-ID: <handler.37927.D37927.157606930719736.done@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
References: <20191126201721.7370-1-brice@waegenei.re>
 <20191126201721.7370-2-brice@waegenei.re>
Date: Wed, 11 Dec 2019 12:24:04 +0100
In-Reply-To: <20191126201721.7370-2-brice@waegenei.re> (Brice Waegeneire's
 message of "Tue, 26 Nov 2019 21:17:21 +0100")
Message-ID: <87tv67jeaz.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Brice Waegeneire <brice@waegenei.re>
Cc: 37927-done@debbugs.gnu.org, 37928-done@debbugs.gnu.org

Hi Brice,

Brice Waegeneire <brice@waegenei.re> skribis:

> * guix/import/crate.scm (%dual-license-rx): Removed function.
> (crate->guix-package): Handle most of the multi-licensing cases.
> * tests/crate.scm (licenses): Add tests for some licenses.

Thanks for the updated patch!

> +(define (string->license string)
> +    (map
> +     spdx-string->license
> +     (filter (lambda (license)
> +               (and (not (string-null? license))
> +                   (not (any (lambda (elem) (string=3D? elem license))
> +                             '("AND" "OR" "WITH")))))
> +            (string-split string (string->char-set " /")))))

I changed that to use =E2=80=98filter-map=E2=80=99 instead and pushed as
263a267b75e472cb84428571580dabd99d5dff0c.

Thanks!

Ludo=E2=80=99.