# HG changeset patch
# User haftmann
# Date 1737877184 -3600
# Node ID 989e661398d6208bdc1b09e59b8ef6e75e38cccd
# Parent  13b5aa1b3fb41e72f9af1a30612732023ac6b32b# Parent  40a2bd73dcebdd59a0e6ad6258995fe890f48d13
merged

diff -r 13b5aa1b3fb4 -r 989e661398d6 Admin/components/bundled
--- a/Admin/components/bundled	Sat Jan 25 21:26:42 2025 +0100
+++ b/Admin/components/bundled	Sun Jan 26 08:39:44 2025 +0100
@@ -1,2 +1,2 @@
 #additional components to be bundled for release
-#naproche-20240519
+naproche-20250125
diff -r 13b5aa1b3fb4 -r 989e661398d6 Admin/components/components.sha1
--- a/Admin/components/components.sha1	Sat Jan 25 21:26:42 2025 +0100
+++ b/Admin/components/components.sha1	Sun Jan 26 08:39:44 2025 +0100
@@ -353,6 +353,7 @@
 f1a9ff4c08c1d226eb1994509254a0b9624f4c52 naproche-20240501.tar.gz
 91ac689e9f7fbd69dd49089bc82904b7f5a290cf naproche-20240502.tar.gz
 f8d093ec54e8df47de0934b329713f59832eb71c naproche-20240519.tar.gz
+8212b431b495f2771c3c27bc3ae0418f55cefa88 naproche-20250125.tar.gz
 d098dd0873b1720a77dc4e060267f9a6c93f341a naproche-2d99afe5c349.tar.gz
 4a4e56fd03b7ba4edd38046f853873a90cf55d1a naproche-4ad61140062f.tar.gz
 77252e0b40f89825b9b5935f9f0c4cd5d4e7012a naproche-6d0d76ce2f2a.tar.gz
@@ -540,6 +541,7 @@
 fdfea3b1c6b02612b1d50decb20b1a27ae741629 stack-2.15.1.tar.gz
 6fd65aac9147ba93fa3356fa629f6911d82d767b stack-2.15.3.tar.gz
 937a061f638823805ebc561b22465198f0ff1670 stack-2.15.5.tar.gz
+80064400c20b0cf7c05d66686e1433bd602dfafc stack-2.15.7.tar.gz
 ebd0221d038966aa8bde075f1b0189ff867b02ca stack-2.5.1.tar.gz
 fa2d882ec45cbc8c7d2f3838b705a8316696dc66 stack-2.7.3.tar.gz
 18437bc9abd5b95be31a96f7c15a85a3ebf466cf stack-2.9.3.tar.gz
diff -r 13b5aa1b3fb4 -r 989e661398d6 Admin/components/main
--- a/Admin/components/main	Sat Jan 25 21:26:42 2025 +0100
+++ b/Admin/components/main	Sun Jan 26 08:39:44 2025 +0100
@@ -36,7 +36,7 @@
 solr-9.7.0-1
 spass-3.8ds-2
 sqlite-3.48.0.0
-stack-2.15.5
+stack-2.15.7
 vampire-4.8
 verit-2021.06.2-rmx-1
 vscode_extension-20241002
diff -r 13b5aa1b3fb4 -r 989e661398d6 etc/settings
--- a/etc/settings	Sat Jan 25 21:26:42 2025 +0100
+++ b/etc/settings	Sun Jan 26 08:39:44 2025 +0100
@@ -173,9 +173,9 @@
 
 ISABELLE_STACK_ROOT="$USER_HOME/.stack"
 
-ISABELLE_STACK_RESOLVER="lts-22.15"
+ISABELLE_STACK_RESOLVER="lts-22.43"
 
-ISABELLE_GHC_VERSION="ghc-9.6.4"
+ISABELLE_GHC_VERSION="ghc-9.6.6"
 
 
 ###
diff -r 13b5aa1b3fb4 -r 989e661398d6 src/Pure/Admin/component_stack.scala
--- a/src/Pure/Admin/component_stack.scala	Sat Jan 25 21:26:42 2025 +0100
+++ b/src/Pure/Admin/component_stack.scala	Sun Jan 26 08:39:44 2025 +0100
@@ -29,7 +29,7 @@
   /* build stack */
 
   val default_url = "https://github.com/commercialhaskell/stack/releases/download"
-  val default_version = "2.15.5"
+  val default_version = "2.15.7"
 
   def build_stack(
     base_url: String = default_url,
diff -r 13b5aa1b3fb4 -r 989e661398d6 src/Pure/ROOT.ML
--- a/src/Pure/ROOT.ML	Sat Jan 25 21:26:42 2025 +0100
+++ b/src/Pure/ROOT.ML	Sun Jan 26 08:39:44 2025 +0100
@@ -1,6 +1,6 @@
 (*  Title:      Pure/ROOT.ML
     Author:     Makarius
-    UUID:       d6fc404b-eeef-4ad0-964d-14b9310ea78f
+    UUID:       7d82dfae-8363-4f59-8191-7a6e1a7cdbc9
 
 Main entry point for the Isabelle/Pure bootstrap process.