me
/
guix
Archived
1
0
Fork 0
Code

import: hackage: Emit new-style package inputs. 

* guix/import/hackage.scm (hackage-module->sexp)[dependencies]
[native-dependencies]: Make into a list of symbols.
[maybe-inputs]: Wrap INPUTS in 'list' instead of 'quasiquote'.
* tests/hackage.scm (match-ghc-foo)
(match-ghc-foo-6)
(match-ghc-foo-revision)
(match-ghc-foo-import): Adjust accordingly.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Sarah Morgensen 2021-07-14 18:40:37 -07:00 committed by Ludovic Courtès
parent 3d5a36c457
commit 81a87222a1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
guix/import/hackage.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;;
;;; This file is part of GNU Guix.
;;;
@ -265,14 +266,12 @@ the hash of the Cabal file."
hackage-dependencies))
(define dependencies
(map (lambda (name)
(list name (list 'unquote (string->symbol name))))
(map string->symbol
(map hackage-name->package-name
hackage-dependencies)))
(define native-dependencies
(map (lambda (name)
(list name (list 'unquote (string->symbol name))))
(map string->symbol
(map hackage-name->package-name
hackage-native-dependencies)))
@ -282,8 +281,8 @@ the hash of the Cabal file."
'())
((inputs ...)
(list (list input-type
(list 'quasiquote inputs))))))
`(list ,@inputs))))))
(define (maybe-arguments)
(match (append (if (not include-test-dependencies?)
'(#:tests? #f)

22
tests/hackage.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;;
;;; This file is part of GNU Guix.
;;;
@ -178,9 +179,7 @@ library
('base32
(? string? hash)))))
('build-system 'haskell-build-system)
('inputs
('quasiquote
(("ghc-http" ('unquote 'ghc-http)))))
('inputs ('list 'ghc-http))
('home-page "http://test.org")
('synopsis (? string?))
('description (? string?))
@ -223,13 +222,8 @@ library
('base32
(? string? hash)))))
('build-system 'haskell-build-system)
('inputs
('quasiquote
(("ghc-b" ('unquote 'ghc-b))
("ghc-http" ('unquote 'ghc-http)))))
('native-inputs
('quasiquote
(("ghc-haskell-gi" ('unquote 'ghc-haskell-gi)))))
('inputs ('list 'ghc-b 'ghc-http))
('native-inputs ('list 'ghc-haskell-gi))
('home-page "http://test.org")
('synopsis (? string?))
('description (? string?))
@ -353,9 +347,7 @@ executable cabal
('base32
(? string? hash)))))
('build-system 'haskell-build-system)
('inputs
('quasiquote
(("ghc-http" ('unquote 'ghc-http)))))
('inputs ('list 'ghc-http))
('arguments
('quasiquote
('#:cabal-revision
@ -419,9 +411,7 @@ executable cabal
('base32
(? string? hash)))))
('build-system 'haskell-build-system)
('inputs
('quasiquote
(("ghc-http" ('unquote 'ghc-http)))))
('inputs ('list 'ghc-http))
('home-page "http://test.org")
('synopsis (? string?))
('description (? string?))