From 642cf11aa2715b939ed450ccddc00860b22b709e Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Fri, 16 Dec 2022 13:25:04 +0000 Subject: gnu: opam: Use OCaml 4.14 compiled version when building OCaml 5.0 packages. * gnu/packages/ocaml.scm (opam)[properties]: Add ocaml5.0-variant. (opam)[propagated-inputs]: Move to inputs. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index adbb76711e..f32d7b4f22 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -962,10 +962,12 @@ name = Guix Builder") ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701" "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))))) (inputs - (list ocaml ncurses curl bubblewrap)) - (propagated-inputs - (list ocaml-cmdliner ocaml-dose3 ocaml-mccs ocaml-opam-file-format - ocaml-re)) + (list ocaml ncurses curl bubblewrap ocaml-cmdliner ocaml-dose3 + ocaml-mccs ocaml-opam-file-format ocaml-re)) + (properties + ;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14 + ;; compiled opam until opam is compatible with OCaml 5.0. + `((ocaml5.0-variant . ,(delay opam)))) (home-page "http://opam.ocamlpro.com/") (synopsis "Package manager for OCaml") (description -- cgit v1.2.3