me
/
guix
Archived
1
0
Fork 0
Code

guix: import: Fix importing dune project. 

* guix/import/opam.scm: Detect dune projects from dependencies, then
filter dune from dependencies.
master
Julien Lepiller 2019-11-27 23:38:36 +01:00
parent c60d98d42d
commit ba3ff730ca
No known key found for this signature in database
GPG Key ID: 43111F4520086A0C
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
guix/import/opam.scm
View File

@ -249,10 +249,7 @@ path to the repository."
(url-dict (metadata-ref opam-content "url"))
(source-url (metadata-ref url-dict "src"))
(requirements (metadata-ref opam-content "depends"))
(dependencies (filter
(lambda (name)
(not (member name '("dune" "jbuilder"))))
(dependency-list->names requirements)))
(dependencies (dependency-list->names requirements))
(native-dependencies (depends->native-inputs requirements))
(inputs (dependency-list->inputs (depends->inputs requirements)))
(native-inputs (dependency-list->inputs
@ -264,8 +261,8 @@ path to the repository."
native-dependencies))))
;; If one of these are required at build time, it means we
;; can use the much nicer dune-build-system.
(let ((use-dune? (or (member "dune" native-dependencies)
(member "jbuilder" native-dependencies))))
(let ((use-dune? (or (member "dune" (append dependencies native-dependencies))
(member "jbuilder" (append dependencies native-dependencies)))))
(call-with-temporary-output-file
(lambda (temp port)
(and (url-fetch source-url temp)
@ -297,7 +294,10 @@ path to the repository."
(synopsis ,(metadata-ref opam-content "synopsis"))
(description ,(metadata-ref opam-content "description"))
(license #f))
dependencies)))))))
(filter
(lambda (name)
(not (member name '("dune" "jbuilder"))))
dependencies))))))))
(define (opam-recursive-import package-name)
(recursive-import package-name #f