X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=7f3a30950a66f4fe145d833e637addc2801d6985;hb=256c5d4ea13bc87ccf07c6813059479c198fdbd2;hp=9da8611088796abe2c30fe12044ba90083de2230;hpb=342e582283f9a9746c92970259280497b672f73a;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index 9da8611..7f3a309 100644
--- a/Goalfile
+++ b/Goalfile
@@ -6,11 +6,11 @@ let fedora-dir = "%HOME/d/fedora"
 
 let fedora-branch = "master"
 #let fedora-branch = "f32"
-let fedora-tag = "f33-build-side-20855"
+let fedora-tag = "f33-build-side-22796"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
-let fedora-rebuild-name = "Update all OCaml dependencies for RPM 4.16."
+let fedora-rebuild-name = "OCaml 4.11.0+dev2-2020-04-22 rebuild"
 
 # Packages that are blocked.  Any dependent packages are also blocked
 # automatically.
@@ -21,31 +21,37 @@ let fedora-rebuild-name = "Update all OCaml dependencies for RPM 4.16."
 # they have been rebuilt.
 let fedora-ignored = [
     "ocaml-srpm-macros", "ocaml",
+
+    # Several problems with the s390 builds:
+    # https://pagure.io/koji/issue/1974
+    # Cannot download toplink/packages/openblas/0.3.9/2.fc33/s390x/openblas-threads64-0.3.9-2.fc33.s390x.rpm: All mirrors were tried
+    "graphviz",
 ]
 
 # All OCaml-related source package names
 let other-packages = [
     "alt-ergo", "apron", "brltty", "coccinelle",
-    "graphviz", "haxe", "hevea", "hivex",
-    "libguestfs", "libnbd", "opam",
+    "haxe", "hevea", "hivex",
+    "laby",
+    "libguestfs",
+    "libnbd", "opam",
+    "utop",
     "virt-top", "virt-v2v",
+    "why3",
     "z3",
 
     # For Coq:
-    "coq", "frama-c",
-    "why3", "zenon",
+    "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
     # and build it by hand.
-    # "nbdkit",
+    #"nbdkit",
 
     # https://bugzilla.redhat.com/show_bug.cgi?id=1797853
     # "plplot",
-
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1799570
-    #"laby",
 ]
 
 pure function get-source-packages () returning strings = {