Add ocaml-ppx-import

[fedora-ocaml-rebuild.git] / Goalfile

diff --git a/Goalfile b/Goalfile
index 2124c2e..2041b75 100644 (file)
--- a/Goalfile
+++ b/Goalfile
@@ -12,17 +12,16 @@ let fedora-tag = "f38-build-side-62208"
 # package has been rebuilt.
 let fedora-rebuild-name = "Rebuild OCaml packages for F38"
 
+# %fedora-retry-failed:
+# If set to 1 then failed builds are retried automatically.
+# If set to 0 then failed builds must be manually restarted.
+# Normally you want this to be 0.
+let fedora-retry-failed = "1"
+
 # Packages that are ignored, which means they are treated as if
 # they have been rebuilt.
 let fedora-ignored = [
     "ocaml-srpm-macros", "ocaml",
-
-    # These use rpmautospec and must be rebuilt by hand for now.
-    # XXX eventually need to fix stdlib/fedora.gl to deal with these
-    "ocaml-base64",
-    "ocaml-dose3",
-    "ocaml-opam-file-format",
-    "opam",
 ]
 
 # All OCaml-related source package names
@@ -64,7 +63,8 @@ let packages = [
     "ocaml-curses",
     "ocaml-dbus",
     "ocaml-dose3",
-    "ocaml-dune",
+    # Cyclic dependency ocaml-dune -> ocaml-pp -> ocaml-dune
+    #"ocaml-dune",
     "ocaml-easy-format",
     "ocaml-expat",
     "ocaml-extlib",
@@ -81,7 +81,6 @@ let packages = [
     "ocamlify",
     "ocaml-integers",
     "ocaml-jane-street-headers",
-#   "ocaml-jsonm", https://bugzilla.redhat.com/show_bug.cgi?id=1183825
     "ocaml-jst-config",
     "ocaml-lablgl",
     "ocaml-lablgtk",
@@ -142,6 +141,7 @@ let packages = [
     "ocaml-ppx-fields-conv",
     "ocaml-ppx-hash",
     "ocaml-ppx-here",
+    "ocaml-ppx-import",
     "ocaml-ppx-inline-test",
     "ocaml-ppx-js-style",
     "ocaml-ppx-let",
@@ -168,7 +168,6 @@ let packages = [
     "ocaml-sqlite",
     "ocaml-ssl",
     "ocaml-stdcompat",
-    "ocaml-stdint",
     "ocaml-stdio",
     "ocaml-time-now",
     "ocaml-topkg",
@@ -228,7 +227,7 @@ pure function get-source-packages () returning strings = {
             # Check that all spec files have disabled the broken
             # "package notes" misfeature.
             if ! grep -sq "%%undefine _package_note_flags" $spec ; then
-                echo "ERROR: $pkg does not %%undefine _package_note_flags"
+                echo "ERROR: $pkg does not %%undefine _package_note_flags" >&2
                 exit 1
             fi
             # OK to rebuild this package.