--- a/Admin/components/components.sha1 Thu Mar 21 14:18:22 2019 +0000
+++ b/Admin/components/components.sha1 Thu Mar 21 14:18:37 2019 +0000
@@ -168,6 +168,7 @@
26df569cee9c2fd91b9ac06714afd43f3b37a1dd nunchaku-0.3.tar.gz
e573f2cbb57eb7b813ed5908753cfe2cb41033ca nunchaku-0.5.tar.gz
fe57793aca175336deea4f5e9c0d949a197850ac opam-1.2.2.tar.gz
+002f74c9e65e650de2638bf54d7b012b8de76c28 opam-2.0.3.tar.gz
1c8cb6a8f4cbeaedce2d6d1ba8fc7e2ab3663aeb polyml-5.4.1.tar.gz
a3f9c159a0ee9a63b7a5d0c835ed9c2c908f8b56 polyml-5.5.0-1.tar.gz
7d604a99355efbfc1459d80db3279ffa7ade3e39 polyml-5.5.0-2.tar.gz
--- a/Admin/components/main Thu Mar 21 14:18:22 2019 +0000
+++ b/Admin/components/main Thu Mar 21 14:18:37 2019 +0000
@@ -11,7 +11,7 @@
jortho-1.0-2
kodkodi-1.5.2-1
nunchaku-0.5
-opam-1.2.2
+opam-2.0.3
polyml-5.8
postgresql-42.2.5
scala-2.12.8
--- a/Admin/ocaml/opam/README Thu Mar 21 14:18:22 2019 +0000
+++ b/Admin/ocaml/opam/README Thu Mar 21 14:18:37 2019 +0000
@@ -1,10 +1,10 @@
-This is OPAM 1.2.2 -- the OCaml Package Manager.
+This is OPAM 2.0.3 -- the OCaml Package Manager.
The executables for x86_64-linux and x86_64-darwin are from
-https://github.com/ocaml/opam/releases/tag/1.2.2
+https://github.com/ocaml/opam/releases/tag/2.0.3
The executable for x86_64-cygwin is provided as a Cygwin package.
Makarius
- 08-Oct-2018
+ 21-Mar-2018
--- a/etc/settings Thu Mar 21 14:18:22 2019 +0000
+++ b/etc/settings Thu Mar 21 14:18:37 2019 +0000
@@ -142,16 +142,16 @@
### OCaml
###
-ISABELLE_OPAM_ROOT="$ISABELLE_HOME_USER/opam"
+ISABELLE_OPAM_ROOT="$USER_HOME/.opam"
-ISABELLE_OCAML_VERSION="4.05.0"
+ISABELLE_OCAML_VERSION="ocaml-base-compiler.4.05.0"
###
### Haskell
###
-ISABELLE_STACK_ROOT="$ISABELLE_HOME_USER/stack"
+ISABELLE_STACK_ROOT="$USER_HOME/.stack"
ISABELLE_STACK_RESOLVER="lts-12.25"
--- a/lib/Tools/ocaml_setup Thu Mar 21 14:18:22 2019 +0000
+++ b/lib/Tools/ocaml_setup Thu Mar 21 14:18:37 2019 +0000
@@ -8,9 +8,9 @@
if [ -e "$ISABELLE_OPAM_ROOT/config" ]
then
- isabelle_opam switch "$ISABELLE_OCAML_VERSION"
+ isabelle_opam switch create "$ISABELLE_OCAML_VERSION"
else
- isabelle_opam init --no-setup --compiler="$ISABELLE_OCAML_VERSION"
+ isabelle_opam init --disable-sandboxing --no-setup --compiler="$ISABELLE_OCAML_VERSION"
fi
isabelle_opam install zarith -y
--- a/src/Pure/Admin/isabelle_cronjob.scala Thu Mar 21 14:18:22 2019 +0000
+++ b/src/Pure/Admin/isabelle_cronjob.scala Thu Mar 21 14:18:37 2019 +0000
@@ -287,10 +287,10 @@
detect = Build_Log.Prop.build_start + " > date '2017-03-03'")),
List(Remote_Build("Mac OS X 10.10 Yosemite", "macbroy31", options = "-m32 -M2", args = "-a")),
List(Remote_Build("Mac OS X 10.14 High Sierra", "lapbroy68", self_update = true,
- options = "-m32 -M1,2,4 -e ISABELLE_GHC_SETUP=true -e ISABELLE_OCAML_SETUP=true",
+ options = "-m32 -M1,2,4 -e ISABELLE_GHC_SETUP=true",
args = "-a -d '~~/src/Benchmarks'")),
List(Remote_Build("Mac OS X 10.14 Mojave", "lapnipkow3", self_update = true,
- options = "-m32 -M1,2 -e ISABELLE_GHC_SETUP=true -e ISABELLE_OCAML_SETUP=true",
+ options = "-m32 -M1,2 -e ISABELLE_GHC_SETUP=true",
args = "-a -d '~~/src/Benchmarks'")),
List(
Remote_Build("Windows", "vmnipkow9", historic = true, history = 90, self_update = true,