From d3366a8ee8cec53cfb982855aaeb30244d3f1aa2 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Sep 2019 21:01:04 +0200 Subject: import: opam: Remove initial "v" in some version numbers. * guix/import/opam.scm (opam-fetch): Remove initial "v" in some version numbers. --- guix/import/opam.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'guix/import/opam.scm') diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 5dcc0e97a3..7c533a4b4e 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)) -- cgit v1.2.3 From b2f810fe939ca98ee578a55d42f8d939539ae845 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Sep 2019 22:36:33 +0200 Subject: import: opam: Use propagated-inputs instead of inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/opam.scm (opam->guix-package): Use propagated-inputs instead of inputs. --- guix/import/opam.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix/import/opam.scm') diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 7c533a4b4e..7f089a5cf3 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -285,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)))) -- cgit v1.2.3