X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=ae15e94252f29db8bef9f068611fa2c5a3cf18ae;hb=e4f752e941abf3f65b790482ce38409430bceb7d;hp=064a43efbabcbbef192f673a5c92e2fed8196565;hpb=9b67a5468452ec6deb58fb1f7cd1d3716a51f87d;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index 064a43e..ae15e94 100644
--- a/Goalfile
+++ b/Goalfile
@@ -4,13 +4,13 @@ include "fedora.gl"
 
 let fedora-dir = "%HOME/d/fedora"
 
-let fedora-branch = "master"
-#let fedora-branch = "f32"
-let fedora-tag = "f34-build-side-29055"
+let fedora-branch = "rawhide"
+#let fedora-branch = "f34"
+let fedora-tag = "f35-build-side-38024"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
-let fedora-rebuild-name = "OCaml 4.11.1 rebuild"
+let fedora-rebuild-name = "OCaml 4.12.0 build"
 
 # Packages that are ignored, which means they are treated as if
 # they have been rebuilt.
@@ -28,6 +28,7 @@ let packages = [
     "ocaml-base",
     "ocaml-base64",
     "ocaml-benchmark",
+    "ocaml-bigarray-compat",
     "ocaml-biniou",
     "ocaml-bin-prot",
     "ocaml-bisect-ppx",
@@ -44,7 +45,9 @@ let packages = [
     "ocaml-compiler-libs-janestreet",
     "ocaml-cppo",
     "ocaml-cryptokit",
+    "ocaml-csexp",
     "ocaml-csv",
+    "ocaml-ctypes",
     "ocaml-cudf",
     "ocaml-curl",
     "ocaml-curses",
@@ -62,9 +65,12 @@ let packages = [
     "ocaml-fpath",
     "ocaml-gen",
     "ocaml-gettext",
+    "ocaml-graphics",
     "ocaml-gsl",
     "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",
@@ -73,6 +79,7 @@ let packages = [
     "ocaml-lacaml",
     "ocaml-lambda-term",
     "ocaml-libvirt",
+    "ocaml-luv",
     "ocaml-lwt",
     "ocaml-lwt-log",
     "ocaml-markup",
@@ -98,7 +105,7 @@ let packages = [
     "ocaml-ocplib-endian",
     "ocaml-ocplib-simplex",
     "ocaml-octavius",
-    "ocaml-odoc",
+    #"ocaml-odoc",    # Causes dep loop.
     "ocaml-omake",
     "ocaml-opam-file-format",
     "ocaml-ounit",
@@ -116,7 +123,6 @@ let packages = [
     "ocaml-ppx-deriving-yojson",
     "ocaml-ppx-enumerate",
     "ocaml-ppx-fields-conv",
-    "ocaml-ppxfind",
     "ocaml-ppx-hash",
     "ocaml-ppx-here",
     "ocaml-ppx-inline-test",
@@ -125,7 +131,6 @@ let packages = [
     "ocaml-ppx-optcomp",
     "ocaml-ppx-sexp-conv",
     "ocaml-ppx-tools",
-    "ocaml-ppx-tools-versioned",
     "ocaml-ppx-variants-conv",
     "ocaml-psmt2-frontend",
     "ocaml-ptmap",
@@ -167,6 +172,10 @@ let packages = [
     "apron",
     "brltty",
     "coccinelle",
+    "coq",
+    "flocq",
+    "frama-c",
+    "gappalib-coq",
     "graphviz",
     "haxe",
     "hevea",
@@ -182,13 +191,7 @@ let packages = [
     "virt-v2v",
     "why3",
     "z3",
-
-    # For Coq:
-    "coq",
-    "frama-c",
-    "gappalib-coq",
     "zenon",
-    "flocq",
 
     # Causes a cyclic dependency between libnbd <-> nbdkit.  We need
     # to fix this in goals itself, but in the meantime disable nbdkit