* [bug#48486] [PATCH] import: hackage: Prefix licenses with
@ 2021-05-17 20:11 Xinglu Chen
2021-05-22 21:38 ` bug#48486: " Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Xinglu Chen @ 2021-05-17 20:11 UTC (permalink / raw)
To: 48486
* 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.
---
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 © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
+;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;;
;;; 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 © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
+;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;;
;;; 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)))
(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)))
(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)))
(test-assert "hackage->guix-package test cabal revision"
(eval-test-with-cabal test-cabal-revision match-ghc-foo-revision))
base-commit: 938ffcbb0589adc07dc12c79eda3e1e2bb9e7cf8
--
2.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#48486: [PATCH] import: hackage: Prefix licenses with
2021-05-17 20:11 [bug#48486] [PATCH] import: hackage: Prefix licenses with Xinglu Chen
@ 2021-05-22 21:38 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2021-05-22 21:38 UTC (permalink / raw)
To: Xinglu Chen; +Cc: 48486-done
Hi,
Xinglu Chen <public@yoctocell.xyz> skribis:
> * 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.
Applied, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-22 21:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-17 20:11 [bug#48486] [PATCH] import: hackage: Prefix licenses with Xinglu Chen
2021-05-22 21:38 ` bug#48486: " Ludovic Courtès
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).