TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import: hackage: Prefix licenses with 'license:'. 

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

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Xinglu Chen 2021-05-17 22:11:15 +02:00 committed by Ludovic Courtès
parent d900cbadfd
commit cfec09a992
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
guix/import/hackage.scm
View File

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

7
tests/hackage.scm
View File

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