diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-09-06 20:46:00 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-09-06 20:46:00 -0400 |
| commit | 65542a8852759f35e19959149ac92297c8b54be5 (patch) | |
| tree | bc8f398c7b10a4725b20aa59ab1452d30f358ea3 /guix/import/opam.scm | |
| parent | bc60349b5bc58a0b803df5adce1de6db82453744 (diff) | |
| parent | f66aee3d0d2f573187ed5d44ae7c13d73cd4097a (diff) | |
| download | guix-patches-65542a8852759f35e19959149ac92297c8b54be5.tar guix-patches-65542a8852759f35e19959149ac92297c8b54be5.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/import/opam.scm')
| -rw-r--r-- | guix/import/opam.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 5dcc0e97a3..7f089a5cf3 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -238,7 +238,9 @@ path to the repository." (version (find-latest-version name repository)) (file (string-append repository "/packages/" name "/" name "." version "/opam"))) `(("metadata" ,@(get-metadata file)) - ("version" . ,version)))) + ("version" . ,(if (string-prefix? "v" version) + (substring version 1) + version))))) (define (opam->guix-package name) (and-let* ((opam-file (opam-fetch name)) @@ -283,7 +285,7 @@ path to the repository." 'ocaml-build-system)) ,@(if (null? inputs) '() - `((inputs ,(list 'quasiquote inputs)))) + `((propagated-inputs ,(list 'quasiquote inputs)))) ,@(if (null? native-inputs) '() `((native-inputs ,(list 'quasiquote native-inputs)))) |