updated to stack-2.13.1: include arm64-darwin, although it does not quite work yet (e.g. session "Haskell");
authorwenzelm
Sun, 15 Oct 2023 13:36:48 +0200
changeset 78780 a611bbfeb9cd
parent 78779 0b9d7d35bcaa
child 78781 847739805b8d
updated to stack-2.13.1: include arm64-darwin, although it does not quite work yet (e.g. session "Haskell"); enforce rebuild of Isabelle/Pure and thus all Haskell applications;
Admin/components/components.sha1
Admin/components/main
etc/settings
src/Pure/Admin/component_stack.scala
src/Pure/ROOT.ML
--- a/Admin/components/components.sha1	Sat Oct 14 20:50:25 2023 +0200
+++ b/Admin/components/components.sha1	Sun Oct 15 13:36:48 2023 +0200
@@ -486,6 +486,7 @@
 fdc415284e031ee3eb2f65828cbc6945736fe995 stack-1.9.1.tar.gz
 6e19948ff4a821e2052fc9b3ddd9ae343f4fcdbb stack-1.9.3.tar.gz
 f969443705aa8619e93af5b34ea98d15cd7efaf1 stack-2.1.3.tar.gz
+423df2c437f7cceac1d269da8e379507feb246ef stack-2.13.1.tar.gz
 ebd0221d038966aa8bde075f1b0189ff867b02ca stack-2.5.1.tar.gz
 fa2d882ec45cbc8c7d2f3838b705a8316696dc66 stack-2.7.3.tar.gz
 18437bc9abd5b95be31a96f7c15a85a3ebf466cf stack-2.9.3.tar.gz
--- a/Admin/components/main	Sat Oct 14 20:50:25 2023 +0200
+++ b/Admin/components/main	Sun Oct 15 13:36:48 2023 +0200
@@ -33,7 +33,7 @@
 smbc-0.4.1
 spass-3.8ds-2
 sqlite-jdbc-3.42.0.0-1
-stack-2.9.3
+stack-2.13.1
 vampire-4.6
 verit-2021.06.2-rmx
 vscode_extension-20230206
--- a/etc/settings	Sat Oct 14 20:50:25 2023 +0200
+++ b/etc/settings	Sun Oct 15 13:36:48 2023 +0200
@@ -159,9 +159,9 @@
 
 ISABELLE_STACK_ROOT="$USER_HOME/.stack"
 
-ISABELLE_STACK_RESOLVER="lts-18.12"
+ISABELLE_STACK_RESOLVER="lts-21.15"
 
-ISABELLE_GHC_VERSION="ghc-8.10.7"
+ISABELLE_GHC_VERSION="ghc-9.4.7"
 
 
 ###
--- a/src/Pure/Admin/component_stack.scala	Sat Oct 14 20:50:25 2023 +0200
+++ b/src/Pure/Admin/component_stack.scala	Sun Oct 15 13:36:48 2023 +0200
@@ -19,6 +19,7 @@
 
   val platforms: List[Download_Platform] =
     List(
+      Download_Platform("arm64-darwin", "osx-aarch64"),
       Download_Platform("arm64-linux", "linux-aarch64"),
       Download_Platform("x86_64-darwin", "osx-x86_64"),
       Download_Platform("x86_64-linux", "linux-x86_64"),
@@ -28,7 +29,7 @@
   /* build stack */
 
   val default_url = "https://github.com/commercialhaskell/stack/releases/download"
-  val default_version = "2.9.3"
+  val default_version = "2.13.1"
 
   def build_stack(
     base_url: String = default_url,
@@ -69,7 +70,7 @@
     /* settings */
 
     component_dir.write_settings("""
-ISABELLE_STACK="$COMPONENT/${ISABELLE_WINDOWS_PLATFORM64:-$ISABELLE_PLATFORM64}/stack"
+ISABELLE_STACK="$COMPONENT/${ISABELLE_WINDOWS_PLATFORM64:-${ISABELLE_APPLE_PLATFORM64:-$ISABELLE_PLATFORM64}}/stack"
 """)
 
 
@@ -81,8 +82,6 @@
 See also https://www.haskellstack.org and executables from
 """ + base_url + """
 
-The oldest supported version of macOS is 10.14 Mojave.
-
 The downloaded files were renamed and made executable.
 
 
--- a/src/Pure/ROOT.ML	Sat Oct 14 20:50:25 2023 +0200
+++ b/src/Pure/ROOT.ML	Sun Oct 15 13:36:48 2023 +0200
@@ -370,3 +370,4 @@
 ML_file "Tools/jedit.ML";
 ML_file "Tools/ghc.ML";
 ML_file "Tools/generated_files.ML";
+