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

import: opam: Replace "_" with "-" in imported names.

Browse source 
* guix/import/opam.scm (ocaml-name->guix-name): Replace "_" with "-".
(opam->guix-packages): Add upstream name when we cannot guess it
properly.
This commit is contained in:
Julien Lepiller 2019-02-01 16:16:25 +01:00
parent 0f4432c620
commit beee37ecdb
No known key found for this signature in database
GPG key ID: 43111F4520086A0C
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
guix/import/opam.scm
View file

@ -127,12 +127,17 @@ (define (get-metadata opam-file)
(lambda _
(peg:tree (match-pattern records (get-string-all (current-input-port)))))))
(define (substitute-char str what with)
(string-join (string-split str what) with))
(define (ocaml-name->guix-name name)
(cond
((equal? name "ocamlfind") "ocaml-findlib")
((string-prefix? "ocaml" name) name)
((string-prefix? "conf-" name) (substring name 5))
(else (string-append "ocaml-" name))))
(substitute-char
(cond
((equal? name "ocamlfind") "ocaml-findlib")
((string-prefix? "ocaml" name) name)
((string-prefix? "conf-" name) (substring name 5))
(else (string-append "ocaml-" name)))
#\_ "-"))
(define (metadata-ref file lookup)
(fold (lambda (record acc)
@ -247,6 +252,10 @@ (define (opam->guix-package name)
,@(if (null? native-inputs)
'()
`((native-inputs ,(list 'quasiquote native-inputs))))
,@(if (equal? name (guix-name->opam-name (ocaml-name->guix-name name)))
'()
`((properties
,(list 'quasiquote `((upstream-name . ,name))))))
(home-page ,(metadata-ref opam-content "homepage"))
(synopsis ,(metadata-ref opam-content "synopsis"))
(description ,(metadata-ref opam-content "description"))
@ -259,6 +268,11 @@ (define (opam-recursive-import package-name)
(opam->guix-package name))
#:guix-name ocaml-name->guix-name))
(define (guix-name->opam-name name)
(if (string-prefix? "ocaml-" name)
(substring name 6)
name))
(define (guix-package->opam-name package)
"Given an OCaml PACKAGE built from OPAM, return the name of the
package in OPAM."
@ -266,10 +280,9 @@ (define (guix-package->opam-name package)
(package-properties package)
'upstream-name))
(name (package-name package)))
(cond
(upstream-name upstream-name)
((string-prefix? "ocaml-" name) (substring name 6))
(else name))))
(if upstream-name
upstream-name
(guix-name->opam-name name))))
(define (opam-package? package)
"Return true if PACKAGE is an OCaml package from OPAM"