From b91ee0c6ebf30b52607062f2bbabb77aca01bef5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 12 Dec 2023 15:24:15 +0000
Subject: [PATCH] Move fedora and ELN packages to separate included source
 files

---
 Goalfile           | 204 +----------------------------------------------------
 eln-packages.gl    |  34 +++++++++
 fedora-packages.gl | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 239 insertions(+), 201 deletions(-)
 create mode 100644 eln-packages.gl
 create mode 100644 fedora-packages.gl

diff --git a/Goalfile b/Goalfile
index c64817a..dcb108a 100644
--- a/Goalfile
+++ b/Goalfile
@@ -24,207 +24,9 @@ let fedora-ignored = [
     "ocaml-srpm-macros", "ocaml",
 ]
 
-# All OCaml-related source package names
-let packages = [
-    "ocaml-alcotest",
-    "ocaml-astring",
-    "ocaml-atd",
-    "ocaml-augeas",
-    "ocaml-autoconf",
-    "ocaml-base",
-    "ocaml-base64",
-    "ocaml-benchmark",
-    "ocaml-bigarray-compat",
-    "ocaml-biniou",
-    "ocaml-bin-prot",
-    "ocaml-bisect-ppx",
-    "ocaml-bos",
-    "ocaml-cairo",
-    "ocaml-calendar",
-    "ocaml-camlbz2",
-    "ocaml-camlidl",
-    "ocaml-camlimages",
-    "ocaml-camlp-streams",
-    "ocaml-camlp5",
-    "ocaml-camlp5-buildscripts",
-    "ocaml-camomile",
-    "ocaml-cinaps",
-    "ocaml-cmdliner",
-    "ocaml-compiler-libs-janestreet",
-    "ocaml-cppo",
-    "ocaml-crunch",
-    "ocaml-cryptokit",
-    "ocaml-csexp",
-    "ocaml-csv",
-    "ocaml-ctypes",
-    "ocaml-cudf",
-    "ocaml-curl",
-    "ocaml-curses",
-    "ocaml-dbus",
-    "ocaml-dose3",
-    "ocaml-dune",
-    "ocaml-easy-format",
-    "ocaml-expat",
-    "ocaml-extlib",
-    "ocaml-facile",
-    "ocaml-fieldslib",
-    "ocaml-fileutils",
-    "ocaml-findlib", "not-ocamlfind",
-    "ocaml-fmt",
-    "ocaml-fpath",
-    "ocaml-gen",
-    "ocaml-gettext",
-    "ocaml-graphics",
-    "ocaml-gsl",
-    "ocamlify",
-    "ocaml-integers",
-    "ocaml-jane-street-headers",
-    "ocaml-jst-config",
-    "ocaml-lablgl",
-    "ocaml-lablgtk",
-    "ocaml-lablgtk3",
-    "ocaml-labltk",
-    "ocaml-lacaml",
-    "ocaml-lambda-term",
-    "ocaml-libvirt",
-    "ocaml-logs",
-    "ocaml-luv",
-    "ocaml-lwt",
-    "ocaml-markup",
-    "ocaml-mccs",
-    "ocaml-mdx",
-    "ocaml-menhir",
-    "ocaml-merlin",
-    "ocaml-mew",
-    "ocaml-mew-vi",
-    "ocaml-mlgmpidl",
-    "ocaml-mlmpfr",
-    "ocaml-mtime",
-    "ocamlmod",
-    "ocaml-mysql",
-    "ocaml-newt",
-    "ocaml-num",
-    "ocaml-obuild",
-    "ocaml-ocamlbuild",
-    "ocaml-ocamlgraph",
-    "ocaml-ocamlnet",
-    "ocaml-ocp-indent",
-    "ocaml-ocplib-endian",
-    "ocaml-ocplib-simplex",
-    "ocaml-octavius",
-    "ocaml-odoc",
-    "ocaml-omake",
-    "ocaml-opam-file-format",
-    "ocaml-ounit",
-    "ocaml-parmap",
-    "ocaml-parsexp",
-    "ocaml-pcre",
-    "ocaml-pcre2",
-    "ocaml-perl4caml",
-    "ocaml-postgresql",
-    "ocaml-pp",
-    "ocaml-ppx-assert",
-    "ocaml-ppx-base",
-    "ocaml-ppx-cold",
-    "ocaml-ppx-compare",
-    "ocaml-ppx-custom-printf",
-    "ocaml-ppx-derivers",
-    "ocaml-ppx-deriving",
-    "ocaml-ppx-deriving-yaml",
-    "ocaml-ppx-deriving-yojson",
-    "ocaml-ppx-enumerate",
-    "ocaml-ppx-expect",
-    "ocaml-ppx-fields-conv",
-    "ocaml-ppx-globalize",
-    "ocaml-ppx-hash",
-    "ocaml-ppx-here",
-    "ocaml-ppx-import",
-    "ocaml-ppx-inline-test",
-    "ocaml-ppx-js-style",
-    "ocaml-ppx-let",
-    "ocaml-ppxlib",
-    "ocaml-ppx-optcomp",
-    "ocaml-ppx-sexp-conv",
-    "ocaml-ppx-stable-witness",
-    "ocaml-ppx-variants-conv",
-    "ocaml-psmt2-frontend",
-    "ocaml-ptime",
-    "ocaml-ptmap",
-    "ocaml-pyml",
-    "ocaml-qcheck",
-    "ocaml-qtest",
-    "ocaml-re",
-    "ocaml-react",
-    "ocaml-res",
-    "ocaml-result",
-    "ocaml-rresult",
-    "ocaml-SDL",
-    "ocaml-sedlex",
-    "ocaml-sexplib",
-    "ocaml-sexplib0",
-    "ocaml-sha",
-    "ocaml-sqlite",
-    "ocaml-ssl",
-    "ocaml-stdcompat",
-    "ocaml-stdio",
-    "ocaml-stdlib-random",
-    "ocaml-time-now",
-    "ocaml-topkg",
-    "ocaml-trie",
-    "ocaml-tyxml",
-    "ocaml-uucd",
-    "ocaml-uucp",
-    "ocaml-uunf",
-    "ocaml-uuseg",
-    "ocaml-uutf",
-    "ocaml-variantslib",
-    "ocaml-version",
-    "ocaml-xml-light",
-    "ocaml-xmlm",
-    "ocaml-xmlrpc-light",
-    "ocaml-yaml",
-    "ocaml-yojson",
-    "ocaml-zarith",
-    "ocaml-zed",
-    "ocaml-zip",
-    "ocaml-zmq",
-
-    "alt-ergo",
-    "apron",
-    "brltty",
-    "coccinelle",
-    "coq",
-    "emacs-common-tuareg",
-    "flocq",
-    "frama-c",
-    "gappalib-coq",
-    "guestfs-tools",
-    "graphviz",
-    "haxe",
-    "hevea",
-    "hivex",
-    "libguestfs",
-    # Hangs in OCaml tests, investigate later.
-    #"libnbd",
-    "opam",
-    "planets",
-    "plplot",
-    "prooftree",
-    "supermin",
-    # Temporarily disable as I am doing the build by hand.
-    #"swig",
-    "utop",
-    "virt-top",
-    "virt-v2v",
-    "why3",
-    "z3",
-    "zenon",
-
-    # 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",
-]
+# Include the full list of packages for either Fedora or ELN.
+include "./fedora-packages.gl"
+#include "./eln-packages.gl"
 
 # Get the list of source packages.
 pure function get-source-packages () returning strings = {
diff --git a/eln-packages.gl b/eln-packages.gl
new file mode 100644
index 0000000..a4d95c1
--- /dev/null
+++ b/eln-packages.gl
@@ -0,0 +1,34 @@
+# All OCaml-related source package names in ELN
+
+let packages = [
+    "ocaml-augeas",
+    "ocaml-calendar",
+    "ocaml-curses",
+    "ocaml-fileutils",
+    "ocaml-findlib",
+    "ocaml-getext",
+    "ocaml-libvirt",
+    "ocaml-re",
+    "ocaml-cppo",
+    "ocaml-csexp",
+    "ocaml-dune",
+    "ocaml-labltk",
+    "ocaml-ocamlbuild",
+    "ocaml-pp",
+
+    "brltty",
+    "guestfs-tools",
+    "graphviz",
+    "hivex",
+    "libguestfs",
+    "libnbd",
+    "supermin",
+    "swig",
+    "virt-top",
+    "virt-v2v",
+
+    # 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",
+]
diff --git a/fedora-packages.gl b/fedora-packages.gl
new file mode 100644
index 0000000..547b472
--- /dev/null
+++ b/fedora-packages.gl
@@ -0,0 +1,202 @@
+# All OCaml-related source package names in Fedora
+
+let packages = [
+    "ocaml-alcotest",
+    "ocaml-astring",
+    "ocaml-atd",
+    "ocaml-augeas",
+    "ocaml-autoconf",
+    "ocaml-base",
+    "ocaml-base64",
+    "ocaml-benchmark",
+    "ocaml-bigarray-compat",
+    "ocaml-biniou",
+    "ocaml-bin-prot",
+    "ocaml-bisect-ppx",
+    "ocaml-bos",
+    "ocaml-cairo",
+    "ocaml-calendar",
+    "ocaml-camlbz2",
+    "ocaml-camlidl",
+    "ocaml-camlimages",
+    "ocaml-camlp-streams",
+    "ocaml-camlp5",
+    "ocaml-camlp5-buildscripts",
+    "ocaml-camomile",
+    "ocaml-cinaps",
+    "ocaml-cmdliner",
+    "ocaml-compiler-libs-janestreet",
+    "ocaml-cppo",
+    "ocaml-crunch",
+    "ocaml-cryptokit",
+    "ocaml-csexp",
+    "ocaml-csv",
+    "ocaml-ctypes",
+    "ocaml-cudf",
+    "ocaml-curl",
+    "ocaml-curses",
+    "ocaml-dbus",
+    "ocaml-dose3",
+    "ocaml-dune",
+    "ocaml-easy-format",
+    "ocaml-expat",
+    "ocaml-extlib",
+    "ocaml-facile",
+    "ocaml-fieldslib",
+    "ocaml-fileutils",
+    "ocaml-findlib", "not-ocamlfind",
+    "ocaml-fmt",
+    "ocaml-fpath",
+    "ocaml-gen",
+    "ocaml-gettext",
+    "ocaml-graphics",
+    "ocaml-gsl",
+    "ocamlify",
+    "ocaml-integers",
+    "ocaml-jane-street-headers",
+    "ocaml-jst-config",
+    "ocaml-lablgl",
+    "ocaml-lablgtk",
+    "ocaml-lablgtk3",
+    "ocaml-labltk",
+    "ocaml-lacaml",
+    "ocaml-lambda-term",
+    "ocaml-libvirt",
+    "ocaml-logs",
+    "ocaml-luv",
+    "ocaml-lwt",
+    "ocaml-markup",
+    "ocaml-mccs",
+    "ocaml-mdx",
+    "ocaml-menhir",
+    "ocaml-merlin",
+    "ocaml-mew",
+    "ocaml-mew-vi",
+    "ocaml-mlgmpidl",
+    "ocaml-mlmpfr",
+    "ocaml-mtime",
+    "ocamlmod",
+    "ocaml-mysql",
+    "ocaml-newt",
+    "ocaml-num",
+    "ocaml-obuild",
+    "ocaml-ocamlbuild",
+    "ocaml-ocamlgraph",
+    "ocaml-ocamlnet",
+    "ocaml-ocp-indent",
+    "ocaml-ocplib-endian",
+    "ocaml-ocplib-simplex",
+    "ocaml-octavius",
+    "ocaml-odoc",
+    "ocaml-omake",
+    "ocaml-opam-file-format",
+    "ocaml-ounit",
+    "ocaml-parmap",
+    "ocaml-parsexp",
+    "ocaml-pcre",
+    "ocaml-pcre2",
+    "ocaml-perl4caml",
+    "ocaml-postgresql",
+    "ocaml-pp",
+    "ocaml-ppx-assert",
+    "ocaml-ppx-base",
+    "ocaml-ppx-cold",
+    "ocaml-ppx-compare",
+    "ocaml-ppx-custom-printf",
+    "ocaml-ppx-derivers",
+    "ocaml-ppx-deriving",
+    "ocaml-ppx-deriving-yaml",
+    "ocaml-ppx-deriving-yojson",
+    "ocaml-ppx-enumerate",
+    "ocaml-ppx-expect",
+    "ocaml-ppx-fields-conv",
+    "ocaml-ppx-globalize",
+    "ocaml-ppx-hash",
+    "ocaml-ppx-here",
+    "ocaml-ppx-import",
+    "ocaml-ppx-inline-test",
+    "ocaml-ppx-js-style",
+    "ocaml-ppx-let",
+    "ocaml-ppxlib",
+    "ocaml-ppx-optcomp",
+    "ocaml-ppx-sexp-conv",
+    "ocaml-ppx-stable-witness",
+    "ocaml-ppx-variants-conv",
+    "ocaml-psmt2-frontend",
+    "ocaml-ptime",
+    "ocaml-ptmap",
+    "ocaml-pyml",
+    "ocaml-qcheck",
+    "ocaml-qtest",
+    "ocaml-re",
+    "ocaml-react",
+    "ocaml-res",
+    "ocaml-result",
+    "ocaml-rresult",
+    "ocaml-SDL",
+    "ocaml-sedlex",
+    "ocaml-sexplib",
+    "ocaml-sexplib0",
+    "ocaml-sha",
+    "ocaml-sqlite",
+    "ocaml-ssl",
+    "ocaml-stdcompat",
+    "ocaml-stdio",
+    "ocaml-stdlib-random",
+    "ocaml-time-now",
+    "ocaml-topkg",
+    "ocaml-trie",
+    "ocaml-tyxml",
+    "ocaml-uucd",
+    "ocaml-uucp",
+    "ocaml-uunf",
+    "ocaml-uuseg",
+    "ocaml-uutf",
+    "ocaml-variantslib",
+    "ocaml-version",
+    "ocaml-xml-light",
+    "ocaml-xmlm",
+    "ocaml-xmlrpc-light",
+    "ocaml-yaml",
+    "ocaml-yojson",
+    "ocaml-zarith",
+    "ocaml-zed",
+    "ocaml-zip",
+    "ocaml-zmq",
+
+    "alt-ergo",
+    "apron",
+    "brltty",
+    "coccinelle",
+    "coq",
+    "emacs-common-tuareg",
+    "flocq",
+    "frama-c",
+    "gappalib-coq",
+    "guestfs-tools",
+    "graphviz",
+    "haxe",
+    "hevea",
+    "hivex",
+    "libguestfs",
+    # Hangs in OCaml tests, investigate later.
+    #"libnbd",
+    "opam",
+    "planets",
+    "plplot",
+    "prooftree",
+    "supermin",
+    # Temporarily disable as I am doing the build by hand.
+    #"swig",
+    "utop",
+    "virt-top",
+    "virt-v2v",
+    "why3",
+    "z3",
+    "zenon",
+
+    # 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",
+]
-- 
1.8.3.1