Merge newest trunk in "Upgrade to LTS 22.26 GHC 9.6.5"

.github/workflows/bundle-ucm.yaml

@@ -39,6 +39,8 @@ jobs:
 
       - name: install stack
         uses: unisonweb/actions/stack/install@main
+        with:
+          stack-version: 2.15.5
 
       - name: build
         run: |

.github/workflows/ci.yaml

@@ -102,6 +102,8 @@ jobs:
       - name: install stack
         if: steps.cache-ucm-binaries.outputs.cache-hit != 'true'
         uses: unisonweb/actions/stack/install@main
+        with:
+          stack-version: 2.15.5
 
       # Build deps, then build local code. Splitting it into two steps just allows us to see how much time each step
       # takes.

.github/workflows/haddocks.yaml

@@ -27,6 +27,8 @@ jobs:
 
       - name: install stack
         uses: unisonweb/actions/stack/install@main
+        with:
+          stack-version: 2.15.5
 
       - name: build with haddocks
         working-directory: unison

.github/workflows/nix-dev-cache.yaml

@@ -37,4 +37,4 @@ jobs:
         name: unison
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
     - name: build all packages and development shells
-      run: nix -L build --accept-flake-config --no-link --keep-going '.#build-tools'
+      run: nix -L build --accept-flake-config --no-link --keep-going '.#all'

.github/workflows/update-transcripts.yaml

@@ -22,6 +22,8 @@ jobs:
 
       - name: install stack
         uses: unisonweb/actions/stack/install@main
+        with:
+          stack-version: 2.15.5
 
       # One of the transcripts fails if the user's git name hasn't been set.
       - name: set git user info

codebase2/util-serialization/U/Util/Serialization.hs

@@ -8,7 +8,7 @@
 
 module U.Util.Serialization where
 
-import Control.Applicative (Applicative (liftA2), liftA3)
+import Control.Applicative (liftA3)
 import Control.Monad (foldM, replicateM, replicateM_, when)
 import Data.Bits (Bits, clearBit, setBit, shiftL, shiftR, testBit, (.|.))
 import Data.ByteString (ByteString, readFile, writeFile)

contrib/cabal.project

@@ -28,7 +28,9 @@ packages:
   parser-typechecker
   unison-core
   unison-cli
+  unison-cli-main
   unison-hashing-v2
+  unison-merge
   unison-share-api
   unison-share-projects-api
   unison-syntax
@@ -45,10 +47,12 @@ source-repository-package
   tag: 9275eea7982dabbf47be2ba078ced669ae7ef3d5
 
 constraints:
-  fsnotify < 0.4,
-  crypton-x509-store <= 1.6.8,
-  servant <= 0.19.1,
-  optparse-applicative <= 0.17.1.0
+  lsp == 2.3.0.0,
+  fsnotify == 0.4.1.0,
+  crypton-x509-store == 1.6.9,
+  servant == 0.20.1,
+  optparse-applicative == 0.18.1.0,
+  tls == 1.8.0
 
 -- For now there is no way to apply ghc-options for all local packages
 -- See https://cabal.readthedocs.io/en/latest/cabal-project.html#package-configuration-options
@@ -127,6 +131,9 @@ package unison-core
 package unison-hashing-v2
   ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
 
+package unison-merge
+  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
+
 package unison-share-api
   ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info