From ccc4d287b7bd2a3ddea7b7f2c1ea2a722e68115c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 8 Dec 2020 15:03:47 +0100 Subject: guix: opam: Add coq support in the importer. * guix/import/opam.scm (get-opam-repository): Add support for coq repositories. (ocaml-name->guix-name): Properly name coq package. * doc/guix.texi (Invoking guix import): Document it. --- guix/import/opam.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'guix/import') diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 6f5c95df3b..54143f83ca 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -126,12 +126,19 @@ (define* (get-opam-repository #:optional repo) (let ((url (cond ((or (not repo) (equal? repo 'opam)) "https://github.com/ocaml/opam-repository") + ((string-prefix? "coq-" (symbol->string repo)) + "https://github.com/coq/opam-coq-archive") + ((equal? repo 'coq) "https://github.com/coq/opam-coq-archive") (else (throw 'unknown-repository repo))))) (receive (location commit _) (update-cached-checkout url) (cond ((or (not repo) (equal? repo 'opam)) location) + ((equal? repo 'coq) + (string-append location "/released")) + ((string-prefix? "coq-" (symbol->string repo)) + (string-append location "/" (substring (symbol->string repo) 4))) (else location))))) (define (latest-version versions) @@ -168,6 +175,7 @@ (define (ocaml-name->guix-name name) (substitute-char (cond ((equal? name "ocamlfind") "ocaml-findlib") + ((equal? name "coq") name) ((string-prefix? "ocaml" name) name) ((string-prefix? "conf-" name) (substring name 5)) (else (string-append "ocaml-" name))) -- cgit v1.2.3