[bug#45498] [PATCH 08/12] gnu: ocaml-markup: Update to 1.0.0.

[Julien Lepiller]

Le Mon, 28 Dec 2020 13:47:14 +0100,
pukkamustard <pukkamustard@posteo.net> a écrit :

> [...]
>  (define-public ocaml-tyxml
>    (package
>      (name "ocaml-tyxml")
> @@ -5619,6 +5638,17 @@ also create your own representation and use it
> to instantiate a new set of combinators.")
>      (license license:lgpl2.1)))
>  
> +(define-public ocaml4.07-tyxml
> +  (package-with-ocaml4.07
> +   (package
> +     (inherit ocaml-tyxml)
> +     (inputs
> +      `(("ocaml-re" ,ocaml-re)
> +        ("ocaml-seq" ,ocaml-seq)
> +        ("ocaml-uutf" ,ocaml-uutf)
> +        ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned)
> +        ("ocaml-markup" ,ocaml-markup0.8.0))))))
> +

Here, I would also add an ocaml4.07-variant property to ocaml-tyxml, so
(package-with-ocaml4.07 ocaml-tyxml) returns that variant (also
remove the properties from the variant, or there will be a loop).

>  (define-public ocaml-bisect-ppx
>    (package
>      (name "ocaml-bisect-ppx")
> @@ -5681,7 +5711,7 @@ then run the Bisect_ppx report tool on the
> generated visitation files.") #:dune ,ocaml4.07-dune))
>      (inputs
>       `(("ocaml-alcotest" ,(package-with-ocaml4.07 ocaml-alcotest))
> -       ("ocaml-markup" ,(package-with-ocaml4.07 ocaml-markup))
> +       ("ocaml-markup" ,(package-with-ocaml4.07 ocaml-markup0.8.0))
>         ("ocaml-sexplib" ,ocaml4.07-sexplib)
>         ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re))
>         ("ocaml-uutf" ,(package-with-ocaml4.07 ocaml-uutf))))
> @@ -5691,7 +5721,7 @@ then run the Bisect_ppx report tool on the
> generated visitation files.") ("ocaml-cppo" ,(package-with-ocaml4.07
> ocaml-cppo)) ("ocaml-fpath" ,(package-with-ocaml4.07 ocaml-fpath))
>         ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result))
> -       ("ocaml-tyxml" ,(package-with-ocaml4.07 ocaml-tyxml))
> +       ("ocaml-tyxml" ,ocaml4.07-tyxml)

Then this would not be needed

>         ("ocaml-bisect-ppx" ,(package-with-ocaml4.07
> ocaml-bisect-ppx)))) (home-page "https://github.com/ocaml/odoc";)
>      (synopsis "OCaml documentation generator")