From 3a984910baf563529f82d1450cc32ae390e82993 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 5 Oct 2023 09:40:48 +0100
Subject: [PATCH] Begin rebuild of OCaml 5.1

Enable camlp5 -> haxe

Add ocaml-pcre2 (for camlp5)

Enable swig -> graphviz

Retire ocaml-odoc-parser (merged into and replaced by ocaml-odoc)

Add planets
---
 Goalfile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Goalfile b/Goalfile
index 8cd1f7c..3fe81cf 100644
--- a/Goalfile
+++ b/Goalfile
@@ -45,8 +45,7 @@ let packages = [
     "ocaml-camlidl",
     "ocaml-camlimages",
     "ocaml-camlp-streams",
-    # Waiting on two dependencies to be reviewed
-    #"ocaml-camlp5",
+    "ocaml-camlp5",
     "ocaml-camomile",
     "ocaml-cinaps",
     "ocaml-cmdliner",
@@ -112,13 +111,15 @@ let packages = [
     "ocaml-ocplib-simplex",
     "ocaml-octavius",
     "ocaml-odoc",
-    "ocaml-odoc-parser",
+    # To be retired after 5.1, now merged into ocaml-odoc
+    #"ocaml-odoc-parser",
     "ocaml-omake",
     "ocaml-opam-file-format",
     "ocaml-ounit",
     "ocaml-parmap",
     "ocaml-parsexp",
     "ocaml-pcre",
+    "ocaml-pcre2",
     "ocaml-perl4caml",
     "ocaml-postgresql",
     "ocaml-pp",
@@ -196,20 +197,18 @@ let packages = [
     "frama-c",
     "gappalib-coq",
     "guestfs-tools",
-    # Depends on swig:
-    #"graphviz",
-    # Depends on camlp5:
-    #"haxe",
+    "graphviz",
+    "haxe",
     "hevea",
     "hivex",
     "libguestfs",
     "libnbd",
     "opam",
+    "planets",
     "plplot",
     "prooftree",
     "supermin",
-    # Tests fail for unclear reasons.
-    #"swig",
+    "swig",
     "utop",
     "virt-top",
     "virt-v2v",
-- 
1.8.3.1