>From ed8cec81e6a30cc0a0e2f1562bb1a8f12e666dc1 Mon Sep 17 00:00:00 2001 Message-Id: From: Julien Lepiller Date: Wed, 22 Dec 2021 22:58:24 +0100 Subject: [PATCH 1/3] gnu: ocaml-ppx-tools-versioned: Only build ocaml-4.07 variant. * gnu/packages/ocaml.scm (ocaml-ppx-tools-versioned): Rename to... (ocaml4.07-ppx-tools-versioned): ...this. [arguments]: Use ocaml-4.07. --- gnu/packages/ocaml.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e6001ca37b..9fc3280f89 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1836,9 +1836,9 @@ (define-public ocaml-migrate-parsetree-1 "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) (properties '((upstream-name . "ocaml-migrate-parsetree"))))) -(define-public ocaml-ppx-tools-versioned +(define-public ocaml4.07-ppx-tools-versioned (package - (name "ocaml-ppx-tools-versioned") + (name "ocaml4.07-ppx-tools-versioned") (version "5.4.0") (source (origin (method git-fetch) @@ -1851,10 +1851,13 @@ (define-public ocaml-ppx-tools-versioned "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66")))) (build-system dune-build-system) (arguments - `(#:test-target "." + `(#:ocaml ,ocaml-4.07 + #:dune ,ocaml4.07-dune + #:findlib ,ocaml4.07-findlib + #:test-target "." #:package "ppx_tools_versioned")) (propagated-inputs - `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1))) + (list (package-with-ocaml4.07 ocaml-migrate-parsetree-1))) (properties `((upstream-name . "ppx_tools_versioned"))) (home-page "https://github.com/let-def/ppx_tools_versioned") (synopsis "Variant of ppx_tools") @@ -1913,7 +1916,7 @@ (define-public ocaml4.07-bitstring (base32 "15jjk2pq1vx311gl49s5ag6x5y0654x35w75z07g7kr2q334hqps")))) (propagated-inputs - `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned))) + `(("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned))) (properties '())))) (define-public ocaml-result @@ -2751,7 +2754,7 @@ (define-public ocaml4.07-sedlex (base32 "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) (propagated-inputs - `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) + `(("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned) ,@(package-propagated-inputs ocaml-sedlex))) (properties '())))) @@ -6728,7 +6731,7 @@ (define-public ocaml4.07-bisect-ppx "1njs8xc108rrpx5am5zhhcn6vjva7rsphm8034qp5lgyvnhfgh7q")))) (propagated-inputs `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) + ("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned) ,@(package-propagated-inputs ocaml-bisect-ppx))) (native-inputs `(("ocaml-ounit2" ,ocaml-ounit2))) -- 2.34.0