X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=bb8ec16807f25dd05d8709fc36386cf777a4e4a9;hb=8a35177fcb7f24c8e01e2c59683c222ad87a2542;hp=e0a87fef3ba6712bb5da362be719ed5a7e67462d;hpb=0777bef81f97ffa12016ea228132e16fc1878a1d;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index e0a87fe..bb8ec16 100644
--- a/Goalfile
+++ b/Goalfile
@@ -6,11 +6,11 @@ let fedora-dir = "%HOME/d/fedora"
 
 let fedora-branch = "rawhide"
 #let fedora-branch = "f34"
-let fedora-tag = "f39-build-side-69760"
+let fedora-tag = "f40-build-side-75060"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
-let fedora-rebuild-name = "OCaml 5.0 rebuild for Fedora 39"
+let fedora-rebuild-name = "OCaml 5.1 rebuild for Fedora 40"
 
 # %fedora-retry-failed:
 # If set to 1 then failed builds are retried automatically.
@@ -28,8 +28,7 @@ let fedora-ignored = [
 let packages = [
     "ocaml-alcotest",
     "ocaml-astring",
-    # Temporarily disable because python3 flake8 is not installable
-    #"ocaml-atd",
+    "ocaml-atd",
     "ocaml-augeas",
     "ocaml-autoconf",
     "ocaml-base",
@@ -46,8 +45,8 @@ let packages = [
     "ocaml-camlidl",
     "ocaml-camlimages",
     "ocaml-camlp-streams",
-    # Waiting on two dependencies to be reviewed
-    #"ocaml-camlp5",
+    "ocaml-camlp5",
+    "ocaml-camlp5-buildscripts",
     "ocaml-camomile",
     "ocaml-cinaps",
     "ocaml-cmdliner",
@@ -69,7 +68,7 @@ let packages = [
     "ocaml-facile",
     "ocaml-fieldslib",
     "ocaml-fileutils",
-    "ocaml-findlib",
+    "ocaml-findlib", "not-ocamlfind",
     "ocaml-fmt",
     "ocaml-fpath",
     "ocaml-gen",
@@ -113,13 +112,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",
@@ -191,36 +192,30 @@ let packages = [
     "apron",
     "brltty",
     "coccinelle",
-    # Fails to build, I asked jjames.
-    #"coq",
-    # Depends on coq:
-    #"flocq",
-    # Depends on why3 -> coq:
-    #"frama-c",
-    # Depends on coq:
-    #"gappalib-coq",
-    # Depends on swig:
-    #"graphviz",
-    # Depends on camlp5:
-    #"haxe",
+    "coq",
+    "emacs-common-tuareg",
+    "flocq",
+    "frama-c",
+    "gappalib-coq",
+    "guestfs-tools",
+    "graphviz",
+    "haxe",
     "hevea",
     "hivex",
     "libguestfs",
     "libnbd",
     "opam",
+    "planets",
     "plplot",
     "prooftree",
     "supermin",
-    # Tests fail for unclear reasons.
-    #"swig",
+    "swig",
     "utop",
     "virt-top",
     "virt-v2v",
-    # Depends on coq:
-    #"why3",
+    "why3",
     "z3",
-    # Depends on coq:
-    #"zenon",
+    "zenon",
 
     # Causes a cyclic dependency between libnbd <-> nbdkit.  We need
     # to fix this in goals itself, but in the meantime disable nbdkit
@@ -247,7 +242,8 @@ pure function get-source-packages () returning strings = {
         elif [ -f $pkg/%fedora-branch/dead.package ]; then
             echo "WARNING: $pkg: is a dead package, ignored" >&2
         else
-            echo "$pkg: package is not checked out locally" >&2
+            echo "ERROR: $pkg: package is not checked out locally" >&2
+            # This does NOT exit the script, why???
             exit 1
         fi
     done