diff --git a/.ocamlformat b/.ocamlformat index 9bc3c7b2..8714408e 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -1 +1,2 @@ version=0.24.1 +ocaml-version = 4.08.0 diff --git a/dune-project b/dune-project index 7942aee4..175be340 100644 --- a/dune-project +++ b/dune-project @@ -34,7 +34,7 @@ (depends voodoo-lib voodoo-web - odoc ; = 2.2.0 pinned by the pipeline + (odoc (= 2.2.0)) tyxml astring cmdliner @@ -50,10 +50,11 @@ (omd (= 2.0.0~alpha3)) voodoo-lib - odoc ; = 2.2.0 pinned by the pipeline + (odoc (= 2.2.0)) (opam-format (>= 2.1.0~beta2)) tyxml + conf-pandoc astring cmdliner yojson diff --git a/voodoo-do.opam b/voodoo-do.opam index 023ef75c..b8209316 100644 --- a/voodoo-do.opam +++ b/voodoo-do.opam @@ -12,7 +12,7 @@ depends: [ "dune" {>= "2.8"} "voodoo-lib" "voodoo-web" - "odoc" + "odoc" {= "2.2.0"} "tyxml" "astring" "cmdliner" diff --git a/voodoo-gen.opam b/voodoo-gen.opam index 4a09c383..59d816b1 100644 --- a/voodoo-gen.opam +++ b/voodoo-gen.opam @@ -13,9 +13,10 @@ depends: [ "ocaml" {>= "4.08.0"} "omd" {= "2.0.0~alpha3"} "voodoo-lib" - "odoc" + "odoc" {= "2.2.0"} "opam-format" {>= "2.1.0~beta2"} "tyxml" + "conf-pandoc" "astring" "cmdliner" "yojson" @@ -39,6 +40,6 @@ build: [ ] ] dev-repo: "git+https://github.com/jonludlam/voodoo.git" -depexts: [ - ["pandoc"] -] +available: [ os-distribution != "alpine" & arch != "ppc64"] +# PPC64 fails to build with stack overflow see https://github.com/ocaml/ocaml/issues/11415 +# Alpine-3.16 doesn't have a pandoc package, however 3.17 does \ No newline at end of file diff --git a/voodoo-gen.opam.template b/voodoo-gen.opam.template index 80477945..80af9ef2 100644 --- a/voodoo-gen.opam.template +++ b/voodoo-gen.opam.template @@ -1,3 +1,3 @@ -depexts: [ - ["pandoc"] -] +available: [ os-distribution != "alpine" & arch != "ppc64"] +# PPC64 fails to build with stack overflow see https://github.com/ocaml/ocaml/issues/11415 +# Alpine-3.16 doesn't have a pandoc package, however 3.17 does \ No newline at end of file