GNU bug report logs -
#32933
[PATCH] guix: add license prefix hackage imports
Previous Next
Reported by: Joe Hillenbrand <joehillen <at> gmail.com>
Date: Thu, 4 Oct 2018 16:19:03 UTC
Severity: normal
Tags: patch
Done: Xinglu Chen <public <at> yoctocell.xyz>
Bug is archived. No further changes may be made.
Full log
View this message in rfc822 format
[Message part 1 (text/plain, inline)]
Your message dated Tue, 21 Dec 2021 18:18:26 +0100
with message-id <87v8zhev19.fsf <at> yoctocell.xyz>
and subject line Re: [bug#32933] [PATCH] guix: add license prefix hackage imports
has caused the debbugs.gnu.org bug report #32933,
regarding [PATCH] guix: add license prefix hackage imports
to be marked as done.
(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)
--
32933: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=32933
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
---
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
[Message part 3 (message/rfc822, inline)]
[Message part 4 (text/plain, inline)]
This was done in commit cfec09a9928e171a724f630ba652ea0241d52e92.
Closing!
[signature.asc (application/pgp-signature, inline)]
This bug report was last modified 3 years and 147 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.