From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g86LD-0005W8-Ps for guix-patches@gnu.org; Thu, 04 Oct 2018 12:19:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g86LA-0002Ug-8j for guix-patches@gnu.org; Thu, 04 Oct 2018 12:19:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60838) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g86L9-0002U1-Or for guix-patches@gnu.org; Thu, 04 Oct 2018 12:19:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g86L9-0008MY-Jt for guix-patches@gnu.org; Thu, 04 Oct 2018 12:19:03 -0400 Subject: [bug#32933] [PATCH] guix: add license prefix hackage imports Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g86KE-0005Pt-4x for guix-patches@gnu.org; Thu, 04 Oct 2018 12:18:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g86KB-0001Nv-Vm for guix-patches@gnu.org; Thu, 04 Oct 2018 12:18:06 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:46605) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g86KB-0001M5-7T for guix-patches@gnu.org; Thu, 04 Oct 2018 12:18:03 -0400 Received: by mail-pl1-x62d.google.com with SMTP id v5-v6so5410241plz.13 for ; Thu, 04 Oct 2018 09:18:02 -0700 (PDT) MIME-Version: 1.0 From: Joe Hillenbrand Date: Thu, 4 Oct 2018 09:17:23 -0700 Message-ID: Content-Type: text/plain; charset="UTF-8" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32933@debbugs.gnu.org --- guix/import/hackage.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 766a0b53f..8f4a46534 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -35,6 +35,7 @@ #:use-module (guix store) #:use-module (gcrypt hash) #:use-module (guix base32) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix memoization) #:use-module (guix upstream) #:use-module (guix packages) @@ -135,20 +136,21 @@ version." ;; https://www.haskell.org ;; /cabal/release/cabal-latest/doc/API/Cabal/Distribution-License.html. (match-lambda - ("GPL-2" 'gpl2) - ("GPL-3" 'gpl3) - ("GPL" "'gpl??") - ("AGPL-3" 'agpl3) - ("AGPL" "'agpl??") - ("LGPL-2.1" 'lgpl2.1) - ("LGPL-3" 'lgpl3) - ("LGPL" "'lgpl??") - ("BSD2" 'bsd-2) - ("BSD3" 'bsd-3) - ("MIT" 'expat) - ("ISC" 'isc) - ("MPL" 'mpl2.0) - ("Apache-2.0" 'asl2.0) + ("GPL-2" 'license:gpl2) + ("GPL-3" 'license:gpl3) + ("GPL" 'license:gpl??) + ("AGPL-3" 'license:agpl3) + ("AGPL" 'license:agpl) + ("LGPL-2.0" 'license:lgpl2.0) + ("LGPL-2.1" 'license:lgpl2.1) + ("LGPL-3" 'license:lgpl3) + ("LGPL" 'license:lgpl??) + ("BSD2" 'license:bsd-2) + ("BSD3" 'license:bsd-3) + ("MIT" 'license:expat) + ("ISC" 'license:isc) + ("MPL" 'license:mpl2.0) + ("Apache-2.0" 'license:asl2.0) ((x) (string->license x)) ((lst ...) `(list ,@(map string->license lst))) (_ #f))) -- 2.19.0