From 89fd13b271a75d87fcd526212a76358c465ddb67 Mon Sep 17 00:00:00 2001 From: Tim McGilchrist Date: Tue, 11 Apr 2023 16:48:37 +1000 Subject: [PATCH 1/3] Pin odoc.2.2.0 version. --- .ocamlformat | 1 + dune-project | 4 ++-- voodoo-do.opam | 2 +- voodoo-gen.opam | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) 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..cbecdeb6 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,7 +50,7 @@ (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 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..5f070aff 100644 --- a/voodoo-gen.opam +++ b/voodoo-gen.opam @@ -13,7 +13,7 @@ depends: [ "ocaml" {>= "4.08.0"} "omd" {= "2.0.0~alpha3"} "voodoo-lib" - "odoc" + "odoc" {= "2.2.0"} "opam-format" {>= "2.1.0~beta2"} "tyxml" "astring" From 18fbf51e44b0d53a8aa2b66e8c0f035a4dbd7fcf Mon Sep 17 00:00:00 2001 From: Tim McGilchrist Date: Wed, 12 Apr 2023 13:06:59 +1000 Subject: [PATCH 2/3] Use conf-pandoc package --- dune-project | 1 + voodoo-gen.opam | 4 +--- voodoo-gen.opam.template | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 voodoo-gen.opam.template diff --git a/dune-project b/dune-project index cbecdeb6..175be340 100644 --- a/dune-project +++ b/dune-project @@ -54,6 +54,7 @@ (opam-format (>= 2.1.0~beta2)) tyxml + conf-pandoc astring cmdliner yojson diff --git a/voodoo-gen.opam b/voodoo-gen.opam index 5f070aff..12e8aadb 100644 --- a/voodoo-gen.opam +++ b/voodoo-gen.opam @@ -16,6 +16,7 @@ depends: [ "odoc" {= "2.2.0"} "opam-format" {>= "2.1.0~beta2"} "tyxml" + "conf-pandoc" "astring" "cmdliner" "yojson" @@ -39,6 +40,3 @@ build: [ ] ] dev-repo: "git+https://github.com/jonludlam/voodoo.git" -depexts: [ - ["pandoc"] -] diff --git a/voodoo-gen.opam.template b/voodoo-gen.opam.template deleted file mode 100644 index 80477945..00000000 --- a/voodoo-gen.opam.template +++ /dev/null @@ -1,3 +0,0 @@ -depexts: [ - ["pandoc"] -] From dd479c78aa07ecfcffa329489083070495c767b2 Mon Sep 17 00:00:00 2001 From: Tim McGilchrist Date: Thu, 13 Apr 2023 10:37:32 +1000 Subject: [PATCH 3/3] Constrain away alpine-3.16 and ppc64. --- voodoo-gen.opam | 3 +++ voodoo-gen.opam.template | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 voodoo-gen.opam.template diff --git a/voodoo-gen.opam b/voodoo-gen.opam index 12e8aadb..59d816b1 100644 --- a/voodoo-gen.opam +++ b/voodoo-gen.opam @@ -40,3 +40,6 @@ build: [ ] ] dev-repo: "git+https://github.com/jonludlam/voodoo.git" +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 new file mode 100644 index 00000000..80af9ef2 --- /dev/null +++ b/voodoo-gen.opam.template @@ -0,0 +1,3 @@ +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