git.annexia.org
/
fedora-ocaml-rebuild.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add not-ocamlfind
[fedora-ocaml-rebuild.git]
/
Goalfile
diff --git
a/Goalfile
b/Goalfile
index
d9866f1
..
bb8ec16
100644
(file)
--- a/
Goalfile
+++ b/
Goalfile
@@
-6,11
+6,11
@@
let fedora-dir = "%HOME/d/fedora"
let fedora-branch = "rawhide"
#let fedora-branch = "f34"
let fedora-branch = "rawhide"
#let fedora-branch = "f34"
-let fedora-tag = "f
39-build-side-697
60"
+let fedora-tag = "f
40-build-side-750
60"
# The magic string that must appear in %changelog when the
# package has been rebuilt.
# The magic string that must appear in %changelog when the
# package has been rebuilt.
-let fedora-rebuild-name = "OCaml 5.
0 rebuild for Fedora 39
"
+let fedora-rebuild-name = "OCaml 5.
1 rebuild for Fedora 40
"
# %fedora-retry-failed:
# If set to 1 then failed builds are retried automatically.
# %fedora-retry-failed:
# If set to 1 then failed builds are retried automatically.
@@
-46,6
+46,7
@@
let packages = [
"ocaml-camlimages",
"ocaml-camlp-streams",
"ocaml-camlp5",
"ocaml-camlimages",
"ocaml-camlp-streams",
"ocaml-camlp5",
+ "ocaml-camlp5-buildscripts",
"ocaml-camomile",
"ocaml-cinaps",
"ocaml-cmdliner",
"ocaml-camomile",
"ocaml-cinaps",
"ocaml-cmdliner",
@@
-60,15
+61,14
@@
let packages = [
"ocaml-curses",
"ocaml-dbus",
"ocaml-dose3",
"ocaml-curses",
"ocaml-dbus",
"ocaml-dose3",
- # Cyclic dependency ocaml-dune -> ocaml-pp -> ocaml-dune
- #"ocaml-dune",
+ "ocaml-dune",
"ocaml-easy-format",
"ocaml-expat",
"ocaml-extlib",
"ocaml-facile",
"ocaml-fieldslib",
"ocaml-fileutils",
"ocaml-easy-format",
"ocaml-expat",
"ocaml-extlib",
"ocaml-facile",
"ocaml-fieldslib",
"ocaml-fileutils",
- "ocaml-findlib",
+ "ocaml-findlib",
"not-ocamlfind",
"ocaml-fmt",
"ocaml-fpath",
"ocaml-gen",
"ocaml-fmt",
"ocaml-fpath",
"ocaml-gen",
@@
-112,13
+112,15
@@
let packages = [
"ocaml-ocplib-simplex",
"ocaml-octavius",
"ocaml-odoc",
"ocaml-ocplib-simplex",
"ocaml-octavius",
"ocaml-odoc",
- "ocaml-odoc-parser",
+ # To be retired after 5.1, now merged into ocaml-odoc
+ #"ocaml-odoc-parser",
"ocaml-omake",
"ocaml-opam-file-format",
"ocaml-ounit",
"ocaml-parmap",
"ocaml-parsexp",
"ocaml-pcre",
"ocaml-omake",
"ocaml-opam-file-format",
"ocaml-ounit",
"ocaml-parmap",
"ocaml-parsexp",
"ocaml-pcre",
+ "ocaml-pcre2",
"ocaml-perl4caml",
"ocaml-postgresql",
"ocaml-pp",
"ocaml-perl4caml",
"ocaml-postgresql",
"ocaml-pp",
@@
-191,9
+193,11
@@
let packages = [
"brltty",
"coccinelle",
"coq",
"brltty",
"coccinelle",
"coq",
+ "emacs-common-tuareg",
"flocq",
"frama-c",
"gappalib-coq",
"flocq",
"frama-c",
"gappalib-coq",
+ "guestfs-tools",
"graphviz",
"haxe",
"hevea",
"graphviz",
"haxe",
"hevea",
@@
-201,6
+205,7
@@
let packages = [
"libguestfs",
"libnbd",
"opam",
"libguestfs",
"libnbd",
"opam",
+ "planets",
"plplot",
"prooftree",
"supermin",
"plplot",
"prooftree",
"supermin",
@@
-237,7
+242,8
@@
pure function get-source-packages () returning strings = {
elif [ -f $pkg/%fedora-branch/dead.package ]; then
echo "WARNING: $pkg: is a dead package, ignored" >&2
else
elif [ -f $pkg/%fedora-branch/dead.package ]; then
echo "WARNING: $pkg: is a dead package, ignored" >&2
else
- echo "$pkg: package is not checked out locally" >&2
+ echo "ERROR: $pkg: package is not checked out locally" >&2
+ # This does NOT exit the script, why???
exit 1
fi
done
exit 1
fi
done