X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=a6ae59f2369e62f48ddceb549dd049d46adcbb69;hb=ad484f47f483bfcc8c8f50703a5fc8cd5bd3bb48;hp=a1372bd9beddcabf5dc43aea58fdee22e907b581;hpb=84e526997228511d48efea17657fce46d468e2a6;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index a1372bd..a6ae59f 100644
--- a/Goalfile
+++ b/Goalfile
@@ -5,15 +5,12 @@ include "fedora.gl"
 let fedora-dir = "%HOME/d/fedora"
 
 let fedora-branch = "master"
-let fedora-tag = "f32-build-side-18015"
-let koji = "koji"
-#let koji = "koji -p riscv64"
-let fedpkg = "fedpkg"
-#let fedpkg = "fedpkg --user-config %HOME/d/fedora-ocaml-rebuild/fedpkg-user-config"
+#let fedora-branch = "f32"
+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 = "OCaml 4.10.0+beta1 rebuild."
+let fedora-rebuild-name = "OCaml 4.11.0+dev2-2020-04-22 rebuild"
 
 # Packages that are blocked.  Any dependent packages are also blocked
 # automatically.
@@ -22,19 +19,34 @@ let fedora-rebuild-name = "OCaml 4.10.0+beta1 rebuild."
 
 # Packages that are ignored, which means they are treated as if
 # they have been rebuilt.
-let fedora-ignored = [ "ocaml-srpm-macros", "ocaml" ]
+let fedora-ignored = [
+    "ocaml-srpm-macros", "ocaml",
+]
 
 # All OCaml-related source package names
 let other-packages = [
-    "alt-ergo", "apron", "brltty", "coccinelle", "coq",
-    "frama-c", "gappalib-coq", "graphviz", "hevea", "hivex",
-    "libguestfs", "libnbd", "opam", "plplot",
-    "virt-top", "virt-v2v", "why3", "z3",
-    # no OCaml code, but needs to be rebuilt after Coq
-    "flocq"
-    # "nbdkit" - causes stack overflow in goals expr_to_shell_string
-    # when handling EList.  Is the list returned too long?
+    "alt-ergo", "apron", "brltty", "coccinelle",
+    "graphviz", "haxe", "hevea", "hivex",
+    "laby",
+    "libguestfs",
+    "libnbd", "opam",
+    "plplot",
+    "utop",
+    "virt-top", "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
+    # and build it by hand.
+    #"nbdkit",
 ]
+
 pure function get-source-packages () returning strings = {
     cd %fedora-dir
     for f in ocaml* %other-packages; do
@@ -44,4 +56,4 @@ pure function get-source-packages () returning strings = {
 let fedora-source-packages = get-source-packages ()
 
 # Main goal: Rebuild all packages in Koji.
-goal all = : wrap ("*koji-built", fedora-source-packages)
+goal all = : wrap ("is-koji-built", fedora-source-packages)