unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Joe Hillenbrand <joehillen@gmail.com>
To: 32933@debbugs.gnu.org
Subject: [bug#32933] [PATCH] guix: add license prefix hackage imports
Date: Thu, 4 Oct 2018 09:17:23 -0700	[thread overview]
Message-ID: <CANJQ5C6Q_izmdftZ2xWb2SbiDiCnf3-ZdTTH_UzS=hFvbtPx9Q@mail.gmail.com> (raw)

---
 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

             reply	other threads:[~2018-10-04 16:19 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-04 16:17 Joe Hillenbrand [this message]
2018-10-12 13:17 ` [bug#32933] [PATCH] guix: add license prefix hackage imports Ludovic Courtès
2018-10-12 17:55   ` Joe Hillenbrand
2018-10-12 20:31     ` Ricardo Wurmus
2018-10-15  8:07       ` Ludovic Courtès
2018-10-15  9:47         ` Ricardo Wurmus
2018-10-15 13:42           ` Joe Hillenbrand
2018-10-15 13:47             ` Ricardo Wurmus
2021-12-21 17:18 ` bug#32933: " Xinglu Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CANJQ5C6Q_izmdftZ2xWb2SbiDiCnf3-ZdTTH_UzS=hFvbtPx9Q@mail.gmail.com' \
    --to=joehillen@gmail.com \
    --cc=32933@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).