me
/
guix
Archived
1
0
Fork 0
Code

guix: opam: Pass default repository to recursive importer. 

* guix/import/opam.scm (opam->guix-package): Rename #:repository key
to #:repo.
(opam-recursive-import): Pass #:repo keyword.
* tests/opam.scm (opam->guix-package): Rename #:repository to #:repo.
master
Julien Lepiller 2020-12-08 13:58:49 +01:00
parent 59873d94ce
commit 15ee1b8317
No known key found for this signature in database
GPG Key ID: 53D457B2D636EE82
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/import/opam.scm
View File

@ -264,11 +264,11 @@ path to the repository."
(substring version 1)
version)))))
(define* (opam->guix-package name #:key (repository (get-opam-repository)) version)
(define* (opam->guix-package name #:key (repo (get-opam-repository)) version)
"Import OPAM package NAME from REPOSITORY (a directory name) or, if
REPOSITORY is #f, from the official OPAM repository. Return a 'package' sexp
or #f on failure."
(and-let* ((opam-file (opam-fetch name repository))
(and-let* ((opam-file (opam-fetch name repo))
(version (assoc-ref opam-file "version"))
(opam-content (assoc-ref opam-file "metadata"))
(url-dict (metadata-ref opam-content "url"))
@ -323,10 +323,11 @@ or #f on failure."
(not (member name '("dune" "jbuilder"))))
dependencies))))))))
(define (opam-recursive-import package-name)
(define* (opam-recursive-import package-name #:repo (get-opam-repository))
(recursive-import package-name
#:repo->guix-package opam->guix-package
#:guix-name ocaml-name->guix-name))
#:guix-name ocaml-name->guix-name
#:repo repo))
(define (guix-name->opam-name name)
(if (string-prefix? "ocaml-" name)

2
tests/opam.scm
View File

@ -85,7 +85,7 @@ url {
(with-output-to-file (string-append my-package "/opam")
(lambda _
(format #t "~a" test-opam-file))))
(match (opam->guix-package "foo" #:repository test-repo)
(match (opam->guix-package "foo" #:repo test-repo)
(('package
('name "ocaml-foo")
('version "1.0.0")