From unknown Tue Sep 09 17:03:08 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#48486 <48486@debbugs.gnu.org> To: bug#48486 <48486@debbugs.gnu.org> Subject: Status: [PATCH] import: hackage: Prefix licenses with Reply-To: bug#48486 <48486@debbugs.gnu.org> Date: Wed, 10 Sep 2025 00:03:08 +0000 retitle 48486 [PATCH] import: hackage: Prefix licenses with reassign 48486 guix-patches submitter 48486 Xinglu Chen severity 48486 normal tag 48486 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon May 17 16:11:35 2021 Received: (at submit) by debbugs.gnu.org; 17 May 2021 20:11:35 +0000 Received: from localhost ([127.0.0.1]:53880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lijaL-00020B-OL for submit@debbugs.gnu.org; Mon, 17 May 2021 16:11:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:43704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lijaI-000202-TK for submit@debbugs.gnu.org; Mon, 17 May 2021 16:11:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lijaG-0008Rk-Qq for guix-patches@gnu.org; Mon, 17 May 2021 16:11:25 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:40358 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lijaA-0008K8-SK for guix-patches@gnu.org; Mon, 17 May 2021 16:11:24 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1621282275; bh=eNqZdaLAgEnder+Ko8LJbMkJtqxUOv2WZKJvMhhcdcs=; h=From:To:Subject:Date; b=KjjwyRn2209W60h4uVbxXxKvntmhB+S86kXdVViSxVKLAF/bMSg4YVDy2UwWhGjFU 3+vQrZuFmNlTIz2CUWaHbhA1dAk6I2WpYmynDAoj1bQH9aYnkS0oaJyL7wlih9NppA ressX7cJtazLh5SXrCKs/pf+ch+j8J58qDOZiSL0= To: guix-patches@gnu.org Subject: [PATCH] =?UTF-8?q?import:=20hackage:=20Prefix=20licenses=20with?= Message-Id: <309e06a20c461e996478acd4c5020f930eccc869.1621282211.git.public@yoctocell.xyz> Date: Mon, 17 May 2021 22:11:15 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 25 X-Spam_score: 2.5 X-Spam_bar: ++ X-Spam_report: (2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=1.13, PDS_OTHER_BAD_TLD=1.999, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 2.3 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * guix/import/hackage.scm (string->license): Prefix the value of the license field with ‘license:’. * tests/hackage.scm (match-ghc-foo, match-ghc-foo-6, match-ghc-foo-revision): Adjust accordingly [...] Content analysis details: (2.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 1.1 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 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.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * guix/import/hackage.scm (string->license): Prefix the value of the license field with ‘license:’. * tests/hackage.scm (match-ghc-foo, match-ghc-foo-6, match-ghc-foo-revision): Adjust accordingly [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * guix/import/hackage.scm (string->license): Prefix the value of the license field with =E2=80=98license:=E2=80=99. * tests/hackage.scm (match-ghc-foo, match-ghc-foo-6, match-ghc-foo-revision= ): Adjust accordingly. --- guix/import/hackage.scm | 27 ++++++++++++++------------- tests/hackage.scm | 7 ++++--- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 9f992ffe8e..f94a1e7087 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -4,6 +4,7 @@ ;;; Copyright =C2=A9 2016 Nikita ;;; Copyright =C2=A9 2018 Ricardo Wurmus ;;; Copyright =C2=A9 2019 Robert Vollmert +;;; Copyright =C2=A9 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -163,22 +164,22 @@ version." ;; https://www.haskell.org ;; /cabal/release/cabal-latest/doc/API/Cabal/Distribution-License.html. (match-lambda - ("GPL-2" 'gpl2) - ("GPL-3" 'gpl3) + ("GPL-2" 'license:gpl2) + ("GPL-3" 'license:gpl3) ("GPL" "'gpl??") - ("AGPL-3" 'agpl3) + ("AGPL-3" 'license:agpl3) ("AGPL" "'agpl??") - ("LGPL-2.1" 'lgpl2.1) - ("LGPL-3" 'lgpl3) + ("LGPL-2.1" 'license:lgpl2.1) + ("LGPL-3" 'license:lgpl3) ("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) + ("BSD2" 'license:bsd-2) + ("BSD3" 'license:bsd-3) + ("BSD-3-Clause" 'license:bsd-3) + ("MIT" 'license:expat) + ("ISC" 'license:isc) + ("MPL" 'license:mpl2.0) + ("Apache-2.0" 'license:asl2.0) + ("PublicDomain" 'license:public-domain) ((x) (string->license x)) ((lst ...) `(list ,@(map string->license lst))) (_ #f))) diff --git a/tests/hackage.scm b/tests/hackage.scm index 77e333cbfc..66a13d9881 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015 Federico Beffa ;;; Copyright =C2=A9 2019 Robert Vollmert +;;; Copyright =C2=A9 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -183,7 +184,7 @@ library ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) - ('license 'bsd-3))) + ('license 'license:bsd-3))) =20 (define* (eval-test-with-cabal test-cabal matcher #:key (cabal-environment= '())) (define port (open-input-string test-cabal)) @@ -232,7 +233,7 @@ library ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) - ('license 'bsd-3))) + ('license 'license:bsd-3))) =20 (test-assert "hackage->guix-package test 6" (eval-test-with-cabal test-cabal-6 match-ghc-foo-6)) @@ -362,7 +363,7 @@ executable cabal ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) - ('license 'bsd-3))) + ('license 'license:bsd-3))) =20 (test-assert "hackage->guix-package test cabal revision" (eval-test-with-cabal test-cabal-revision match-ghc-foo-revision)) base-commit: 938ffcbb0589adc07dc12c79eda3e1e2bb9e7cf8 --=20 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat May 22 17:38:51 2021 Received: (at 48486-done) by debbugs.gnu.org; 22 May 2021 21:38:51 +0000 Received: from localhost ([127.0.0.1]:40186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lkZKd-0004CT-Ja for submit@debbugs.gnu.org; Sat, 22 May 2021 17:38:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lkZKc-0004CD-FP for 48486-done@debbugs.gnu.org; Sat, 22 May 2021 17:38:50 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40546) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lkZKW-00006F-Ot; Sat, 22 May 2021 17:38:44 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=49086 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lkZKW-0005CU-FZ; Sat, 22 May 2021 17:38:44 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Xinglu Chen Subject: Re: bug#48486: [PATCH] import: hackage: Prefix licenses with References: <309e06a20c461e996478acd4c5020f930eccc869.1621282211.git.public@yoctocell.xyz> Date: Sat, 22 May 2021 23:38:42 +0200 In-Reply-To: <309e06a20c461e996478acd4c5020f930eccc869.1621282211.git.public@yoctocell.xyz> (Xinglu Chen's message of "Mon, 17 May 2021 22:11:15 +0200") Message-ID: <87zgwm5tzx.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 48486-done Cc: 48486-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: -1.3 (-) Hi, Xinglu Chen skribis: > * guix/import/hackage.scm (string->license): Prefix the value of the lice= nse > field with =E2=80=98license:=E2=80=99. > * tests/hackage.scm (match-ghc-foo, match-ghc-foo-6, match-ghc-foo-revisi= on): > Adjust accordingly. Applied, thanks! Ludo=E2=80=99. From unknown Tue Sep 09 17:03:08 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 20 Jun 2021 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator