From unknown Sat Aug 09 09:38:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#37927] Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Oct 2019 20:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37927 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 37927@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15720352625191 (code B ref -1); Fri, 25 Oct 2019 20:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Oct 2019 20:27:42 +0000 Received: from localhost ([127.0.0.1]:39407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO6BR-0001Le-Gp for submit@debbugs.gnu.org; Fri, 25 Oct 2019 16:27:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:59021) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO6BQ-0001LR-CN for submit@debbugs.gnu.org; Fri, 25 Oct 2019 16:27:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34599) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO6BN-0007BS-Hk for guix-patches@gnu.org; Fri, 25 Oct 2019 16:27:39 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO6BK-0003wl-Ud for guix-patches@gnu.org; Fri, 25 Oct 2019 16:27:36 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:52557) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iO6BI-0003tr-S1 for guix-patches@gnu.org; Fri, 25 Oct 2019 16:27:34 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id A0F21FF805 for ; Fri, 25 Oct 2019 20:27:28 +0000 (UTC) From: Brice Waegeneire Date: Fri, 25 Oct 2019 22:27:12 +0200 Message-Id: <20191025202713.7739-1-brice@waegenei.re> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.70.183.199 X-Spam-Score: 0.4 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) This patch should allow correctly importing most of the licenses from crates.io. Before it, importing recursively ripgrep would result in ~140 missing licenses; now none seems missing. From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 28 10:40:45 2019 Received: (at control) by debbugs.gnu.org; 28 Oct 2019 14:40:45 +0000 Received: from localhost ([127.0.0.1]:46085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iP6CJ-0001Cg-CW for submit@debbugs.gnu.org; Mon, 28 Oct 2019 10:40:45 -0400 Received: from mail-wr1-f44.google.com ([209.85.221.44]:43237) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iP6CH-0001CS-CJ for control@debbugs.gnu.org; Mon, 28 Oct 2019 10:40:41 -0400 Received: by mail-wr1-f44.google.com with SMTP id n1so2702570wra.10 for ; Mon, 28 Oct 2019 07:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:to:from:subject; bh=WfBK0xar/eM4agiXG3pue9i331ApUEy2BsswkoiyF6A=; b=d+tgpwpkFsjbCXcKzXM75QX1upunF5NwkVBjzM9xopUqefZHHffLvoO5sxkNgaOd2W c4+/fOvUSPZ2mjc0C90Mm/PrxMcOv8SyhgK5C3pxNXGkzI+RjjX18AOWx/nT+NYHzcFR NEOW3WOxYLCYBqApyMq6S2ARhBkCWkW9ujL9fH4yVJ7Dtyg+JNPGQjLjLXkUGvLy8YmT C1tj6bnmxCLstHLiUUpLJEHbi1KzyB0wbO2NoBhzVpHPN7dhMSaTmM1VPgGts13kLxpy qV5DPIsGec23VjtUIwgMO5dtaYNBppueT+5uavWPltZHWM2tLcLf/+flzIlrRFrdL74Q E8xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:to:from:subject; bh=WfBK0xar/eM4agiXG3pue9i331ApUEy2BsswkoiyF6A=; b=B1aZlCDSJ/N9QehYuFREk7cZB2DiI4qgIEHc3M5nyhldtkok5rFSDkOCzVi8C84vjL Ko16DznV0bvRm8EKCnh2bBgK01DSXm0CvgUkfda4osBvZ16bdfA3Fw/VyVYJ0fS+3vvE T6GKgocUK+rjLUu5liBoqmb+YQCF8bXNmt4KNOlklKDeXbPfsUYUkyNsT3KIF/uT/3WA q+TwPa0sCIizlEqKKYhNdlZTffBsEEMr3+vD7CaH6sQHUaVp0TBwCuzWnV4gmf00tzIN 6CE0qj8K/cTefOzOsuEaeJ1v3sX8UsDs2UczaKqSPswDlCZeXmebMCstolHLBF7Gcog0 vR1Q== X-Gm-Message-State: APjAAAUHWLdjBfF4lADaa4PwIm+Xt1i2CXLklb40SzH4YKa5tA8oBUWX AlVKbs6k8vxStJkgYCa1xby9rgUY X-Google-Smtp-Source: APXvYqzsubgVYPNnKsWaqtwvHAYqMDO5D05moZsZp7hICR21GtZmX3Fh2OePZvnREuuOqIw3y4ELsA== X-Received: by 2002:adf:c401:: with SMTP id v1mr14759833wrf.375.1572273635120; Mon, 28 Oct 2019 07:40:35 -0700 (PDT) Received: from meru (lfbn-ann-1-367-71.w86-200.abo.wanadoo.fr. [86.200.83.71]) by smtp.gmail.com with ESMTPSA id x8sm12072276wrr.43.2019.10.28.07.40.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2019 07:40:34 -0700 (PDT) Date: Mon, 28 Oct 2019 15:40:32 +0100 Message-Id: <87sgndj5lr.fsf@gmail.com> To: control@debbugs.gnu.org From: Mathieu Othacehe Subject: control message for bug #37927 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) merge 37927 37928 quit From unknown Sat Aug 09 09:38:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#37927] [bug#37928] [PATCH] import: crate: Fix licenses. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Nov 2019 22:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37927 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brice Waegeneire Cc: 37927@debbugs.gnu.org, 37928@debbugs.gnu.org Received: via spool by 37927-submit@debbugs.gnu.org id=B37927.157290645927240 (code B ref 37927); Mon, 04 Nov 2019 22:28:01 +0000 Received: (at 37927) by debbugs.gnu.org; 4 Nov 2019 22:27:39 +0000 Received: from localhost ([127.0.0.1]:37676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRkp1-00075H-4E for submit@debbugs.gnu.org; Mon, 04 Nov 2019 17:27:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50179) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRkow-00074q-Br; Mon, 04 Nov 2019 17:27:37 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39206) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iRkoq-0006aB-HZ; Mon, 04 Nov 2019 17:27:28 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36208 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iRkoo-0002M7-Uq; Mon, 04 Nov 2019 17:27:27 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20191025202713.7739-1-brice@waegenei.re> <20191025202713.7739-2-brice@waegenei.re> Date: Mon, 04 Nov 2019 23:27:24 +0100 In-Reply-To: <20191025202713.7739-2-brice@waegenei.re> (Brice Waegeneire's message of "Fri, 25 Oct 2019 22:27:13 +0200") Message-ID: <87mudb46r7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Brice, Brice Waegeneire skribis: > * guix/import/crate.scm (%dual-license-rx): Removed function. > (crate->guix-package): Handle most of the multi-licensing cases. Nice! > (define* (crate->guix-package crate-name #:optional version) > "Fetch the metadata for CRATE-NAME from crates.io, and return the > `package' s-expression corresponding to that package, or #f on failure. > When VERSION is specified, attempt to fetch that version; otherwise fetc= h the > latest version of CRATE-NAME." > (define (string->license string) > - (match (regexp-exec %dual-license-rx string) > - (#f (list (spdx-string->license string))) > - (m (list (spdx-string->license (match:substring m 1)) > - (spdx-string->license (match:substring m 2)))))) > + (filter > + (lambda (word) > + (and (not (string-null? word)) > + (not (any (lambda (elem) (string=3D? elem word)) > + '("AND" "OR" "WITH"))) )) > + (string-split string (string->char-set " /")))) It would be great to have tests for that in tests/crate.scm. To that end, I think you could lift =E2=80=98string->license=E2=80=99 to the top le= vel (that is, outside =E2=80=98crate->guix-package=E2=80=99), and then have a few tests a= long these lines: (define string->license (@@ (guix import crate) string->license)) (test-equal "GPL OR LGPL" (list license:gpl3+ license:lgpl3+) (string->license "GPL OR LGPL")) (See .) Let me know if anything is unclear. Could you send an updated patch? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 04 17:28:16 2019 Received: (at control) by debbugs.gnu.org; 4 Nov 2019 22:28:16 +0000 Received: from localhost ([127.0.0.1]:37683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRkpc-00076s-0B for submit@debbugs.gnu.org; Mon, 04 Nov 2019 17:28:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRkpV-00076U-AO for control@debbugs.gnu.org; Mon, 04 Nov 2019 17:28:15 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iRkpQ-00073m-6G for control@debbugs.gnu.org; Mon, 04 Nov 2019 17:28:04 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36210 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iRkpO-0003KB-Pv for control@debbugs.gnu.org; Mon, 04 Nov 2019 17:28:03 -0500 Date: Mon, 04 Nov 2019 23:28:01 +0100 Message-Id: <87lfsv46q6.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #37927 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) retitle 37927 Better handle license expressions in 'guix import crate' quit From unknown Sat Aug 09 09:38:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#37927] [bug#37928] [PATCH] import: crate: Fix licenses. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Nov 2019 16:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37927 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brice Waegeneire Cc: 37927@debbugs.gnu.org Received: via spool by 37927-submit@debbugs.gnu.org id=B37927.157392224429669 (code B ref 37927); Sat, 16 Nov 2019 16:38:02 +0000 Received: (at 37927) by debbugs.gnu.org; 16 Nov 2019 16:37:24 +0000 Received: from localhost ([127.0.0.1]:39650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iW14e-0007iS-BP for submit@debbugs.gnu.org; Sat, 16 Nov 2019 11:37:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iW14X-0007i9-E3 for 37927@debbugs.gnu.org; Sat, 16 Nov 2019 11:37:20 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50985) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iW14S-0006Yv-0l; Sat, 16 Nov 2019 11:37:12 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=47212 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iW14R-0000sN-9v; Sat, 16 Nov 2019 11:37:11 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20191025202713.7739-1-brice@waegenei.re> <20191025202713.7739-2-brice@waegenei.re> <87mudb46r7.fsf@gnu.org> Date: Sat, 16 Nov 2019 17:37:09 +0100 In-Reply-To: <87mudb46r7.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Mon, 04 Nov 2019 23:27:24 +0100") Message-ID: <87bltbwzey.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Brice, Did you have a chance to look into this? (See for context.) Thanks in advance. :-) Ludo=E2=80=99. Ludovic Court=C3=A8s skribis: > Hi Brice, > > Brice Waegeneire skribis: > >> * guix/import/crate.scm (%dual-license-rx): Removed function. >> (crate->guix-package): Handle most of the multi-licensing cases. > > Nice! > >> (define* (crate->guix-package crate-name #:optional version) >> "Fetch the metadata for CRATE-NAME from crates.io, and return the >> `package' s-expression corresponding to that package, or #f on failure. >> When VERSION is specified, attempt to fetch that version; otherwise fet= ch the >> latest version of CRATE-NAME." >> (define (string->license string) >> - (match (regexp-exec %dual-license-rx string) >> - (#f (list (spdx-string->license string))) >> - (m (list (spdx-string->license (match:substring m 1)) >> - (spdx-string->license (match:substring m 2)))))) >> + (filter >> + (lambda (word) >> + (and (not (string-null? word)) >> + (not (any (lambda (elem) (string=3D? elem word)) >> + '("AND" "OR" "WITH"))) )) >> + (string-split string (string->char-set " /")))) > > It would be great to have tests for that in tests/crate.scm. To that > end, I think you could lift =E2=80=98string->license=E2=80=99 to the top = level (that is, > outside =E2=80=98crate->guix-package=E2=80=99), and then have a few tests= along these > lines: > > (define string->license > (@@ (guix import crate) string->license)) > > (test-equal "GPL OR LGPL" > (list license:gpl3+ license:lgpl3+) > (string->license "GPL OR LGPL")) > > (See > .) > > Let me know if anything is unclear. > > Could you send an updated patch? > > Thanks, > Ludo=E2=80=99. From unknown Sat Aug 09 09:38:10 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Brice Waegeneire Subject: bug#37927: closed (Re: [bug#37928] [PATCH v2] import: crate: Better handle license expressions.) Message-ID: References: <87tv67jeaz.fsf@gnu.org> <20191025202713.7739-1-brice@waegenei.re> X-Gnu-PR-Message: they-closed 37927 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 37927@debbugs.gnu.org Date: Wed, 11 Dec 2019 13:02:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1576069323-19832-1" This is a multi-part message in MIME format... ------------=_1576069323-19832-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #37927: Better handle license expressions in 'guix import crate' which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 37927@debbugs.gnu.org. --=20 37927: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D37927 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1576069323-19832-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 37927-done) by debbugs.gnu.org; 11 Dec 2019 13:01:47 +0000 Received: from localhost ([127.0.0.1]:56994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1if1ch-00058F-08 for submit@debbugs.gnu.org; Wed, 11 Dec 2019 08:01:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1if1cc-00057Y-CO; Wed, 11 Dec 2019 08:01:42 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1if1cW-0004mR-3D; Wed, 11 Dec 2019 08:01:36 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59864 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1if06A-0001AM-Ch; Wed, 11 Dec 2019 06:24:06 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Brice Waegeneire Subject: Re: [bug#37928] [PATCH v2] import: crate: Better handle license expressions. 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> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 37927-done Cc: 37927-done@debbugs.gnu.org, 37928-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Brice, Brice Waegeneire 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. ------------=_1576069323-19832-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 25 Oct 2019 20:27:42 +0000 Received: from localhost ([127.0.0.1]:39407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO6BR-0001Le-Gp for submit@debbugs.gnu.org; Fri, 25 Oct 2019 16:27:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:59021) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO6BQ-0001LR-CN for submit@debbugs.gnu.org; Fri, 25 Oct 2019 16:27:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34599) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO6BN-0007BS-Hk for guix-patches@gnu.org; Fri, 25 Oct 2019 16:27:39 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO6BK-0003wl-Ud for guix-patches@gnu.org; Fri, 25 Oct 2019 16:27:36 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:52557) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iO6BI-0003tr-S1 for guix-patches@gnu.org; Fri, 25 Oct 2019 16:27:34 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id A0F21FF805 for ; Fri, 25 Oct 2019 20:27:28 +0000 (UTC) From: Brice Waegeneire To: guix-patches@gnu.org Subject: Date: Fri, 25 Oct 2019 22:27:12 +0200 Message-Id: <20191025202713.7739-1-brice@waegenei.re> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.70.183.199 X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) This patch should allow correctly importing most of the licenses from crates.io. Before it, importing recursively ripgrep would result in ~140 missing licenses; now none seems missing. ------------=_1576069323-19832-1-- From unknown Sat Aug 09 09:38:10 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Brice Waegeneire Subject: bug#37928: closed (Re: [bug#37928] [PATCH v2] import: crate: Better handle license expressions.) Message-ID: References: <87tv67jeaz.fsf@gnu.org> <20191025202713.7739-2-brice@waegenei.re> X-Gnu-PR-Message: they-closed 37928 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 37928@debbugs.gnu.org Date: Wed, 11 Dec 2019 13:02:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1576069323-19832-3" This is a multi-part message in MIME format... ------------=_1576069323-19832-3 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #37927: Better handle license expressions in 'guix import crate' which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 37928@debbugs.gnu.org. --=20 37927: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D37927 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1576069323-19832-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 37927-done) by debbugs.gnu.org; 11 Dec 2019 13:01:47 +0000 Received: from localhost ([127.0.0.1]:56994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1if1ch-00058F-08 for submit@debbugs.gnu.org; Wed, 11 Dec 2019 08:01:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1if1cc-00057Y-CO; Wed, 11 Dec 2019 08:01:42 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1if1cW-0004mR-3D; Wed, 11 Dec 2019 08:01:36 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59864 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1if06A-0001AM-Ch; Wed, 11 Dec 2019 06:24:06 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Brice Waegeneire Subject: Re: [bug#37928] [PATCH v2] import: crate: Better handle license expressions. 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> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 37927-done Cc: 37927-done@debbugs.gnu.org, 37928-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Brice, Brice Waegeneire 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. ------------=_1576069323-19832-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 25 Oct 2019 20:27:42 +0000 Received: from localhost ([127.0.0.1]:39409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO6BS-0001Lg-3e for submit@debbugs.gnu.org; Fri, 25 Oct 2019 16:27:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:39004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO6BQ-0001LS-GQ for submit@debbugs.gnu.org; Fri, 25 Oct 2019 16:27:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34611) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO6BP-0007FH-83 for guix-patches@gnu.org; Fri, 25 Oct 2019 16:27:40 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO6BN-0003xU-1Q for guix-patches@gnu.org; Fri, 25 Oct 2019 16:27:39 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:47827) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iO6BL-0003uV-1m for guix-patches@gnu.org; Fri, 25 Oct 2019 16:27:36 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 1855960004 for ; Fri, 25 Oct 2019 20:27:31 +0000 (UTC) From: Brice Waegeneire To: guix-patches@gnu.org Subject: [PATCH] import: crate: Fix licenses. Date: Fri, 25 Oct 2019 22:27:13 +0200 Message-Id: <20191025202713.7739-2-brice@waegenei.re> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20191025202713.7739-1-brice@waegenei.re> References: <20191025202713.7739-1-brice@waegenei.re> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.70.183.195 X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * guix/import/crate.scm (%dual-license-rx): Removed function. (crate->guix-package): Handle most of the multi-licensing cases. --- guix/import/crate.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 8dc014d232..e08028db15 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -178,21 +178,18 @@ and LICENSE." (close-port port) pkg)) -(define %dual-license-rx - ;; Dual licensing is represented by a string such as "MIT OR Apache-2.0". - ;; This regexp matches that. - (make-regexp "^(.*) OR (.*)$")) - (define* (crate->guix-package crate-name #:optional version) "Fetch the metadata for CRATE-NAME from crates.io, and return the `package' s-expression corresponding to that package, or #f on failure. When VERSION is specified, attempt to fetch that version; otherwise fetch the latest version of CRATE-NAME." (define (string->license string) - (match (regexp-exec %dual-license-rx string) - (#f (list (spdx-string->license string))) - (m (list (spdx-string->license (match:substring m 1)) - (spdx-string->license (match:substring m 2)))))) + (filter + (lambda (word) + (and (not (string-null? word)) + (not (any (lambda (elem) (string=? elem word)) + '("AND" "OR" "WITH"))) )) + (string-split string (string->char-set " /")))) (define (normal-dependency? dependency) (eq? (crate-dependency-kind dependency) 'normal)) -- 2.19.2 ------------=_1576069323-19832-3--