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/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

@@ -29,7 +29,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
@@ -46,10 +48,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
@@ -128,6 +132,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
 

flake.nix

@@ -27,10 +27,10 @@
     ]
     (system: let
       versions = {
-        ghc = "928";
+        ghc = "965";
         ormolu = "0.5.2.0";
-        hls = "2.4.0.0";
-        stack = "2.13.1";
+        hls = "2.9.0.0";
+        stack = "2.15.5";
         hpack = "0.35.2";
       };
       overlays = [

lib/unison-pretty-printer/src/Unison/Util/SyntaxText.hs

@@ -4,7 +4,7 @@ import Unison.HashQualified (HashQualified)
 import Unison.Name (Name)
 import Unison.Pattern (SeqOp)
 import Unison.Prelude
-import Unison.Referent' (Referent')
+import Unison.ReferentPrime (Referent')
 import Unison.Util.AnnotatedText (AnnotatedText (..), annotate, segment)
 
 type SyntaxText' r = AnnotatedText (Element r)

lib/unison-sqlite/src/Unison/Sqlite/Connection.hs

@@ -172,7 +172,7 @@ execute conn@(Connection _ _ conn0) sql@(Sql s params) = do
 --
 -- This function does not support parameters, and is mostly useful for executing DDL and migrations.
 executeStatements :: Connection -> Text -> IO ()
-executeStatements conn@(Connection _ _ (Sqlite.Connection database)) sql = do
+executeStatements conn@(Connection _ _ (Sqlite.Connection database _tempNameCounter)) sql = do
   logQuery (Sql sql []) Nothing
   Direct.Sqlite.exec database sql `catch` \(exception :: Sqlite.SQLError) ->
     throwSqliteQueryException
@@ -184,7 +184,7 @@ executeStatements conn@(Connection _ _ (Sqlite.Connection database)) sql = do
 
 -- With results, without checks
 
-queryStreamRow :: Sqlite.FromRow a => Connection -> Sql -> (IO (Maybe a) -> IO r) -> IO r
+queryStreamRow :: (Sqlite.FromRow a) => Connection -> Sql -> (IO (Maybe a) -> IO r) -> IO r
 queryStreamRow conn@(Connection _ _ conn0) sql@(Sql s params) callback =
   run `catch` \(exception :: Sqlite.SQLError) ->
     throwSqliteQueryException

parser-typechecker/package.yaml

@@ -20,7 +20,6 @@ when:
 
 dependencies:
   - ListLike
-  - NanoID
   - aeson
   - ansi-terminal
   - asn1-encoding
@@ -81,7 +80,7 @@ dependencies:
   - nonempty-containers
   - open-browser
   - openapi3
-  - optparse-applicative >= 0.16.1.0
+  - optparse-applicative
   - pem
   - pretty-simple
   - primitive
@@ -140,9 +139,9 @@ dependencies:
   - warp
   - witch
   - witherable
-  - x509
-  - x509-store
-  - x509-system
+  - crypton-x509
+  - crypton-x509-store
+  - crypton-x509-system
   - yaml
   - zlib
 

parser-typechecker/src/Unison/Codebase/BranchUtil.hs

@@ -25,7 +25,7 @@ import Unison.Codebase.Branch (Branch, Branch0)
 import Unison.Codebase.Branch qualified as Branch
 import Unison.Codebase.Path (Path)
 import Unison.Codebase.Path qualified as Path
-import Unison.HashQualified' (HashQualified (HashQualified, NameOnly))
+import Unison.HashQualifiedPrime (HashQualified (HashQualified, NameOnly))
 import Unison.Names (Names)
 import Unison.Names qualified as Names
 import Unison.Prelude

parser-typechecker/src/Unison/Codebase/Path.hs

@@ -88,7 +88,7 @@ import Data.Sequence (Seq ((:<|), (:|>)))
 import Data.Sequence qualified as Seq
 import Data.Text qualified as Text
 import GHC.Exts qualified as GHC
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.NameSegment (NameSegment)

parser-typechecker/src/Unison/Codebase/Path/Parse.hs

@@ -22,7 +22,7 @@ import Text.Megaparsec qualified as P
 import Text.Megaparsec.Char qualified as P (char)
 import Text.Megaparsec.Internal qualified as P (withParsecT)
 import Unison.Codebase.Path
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Prelude hiding (empty, toList)
 import Unison.ShortHash (ShortHash)
 import Unison.Syntax.Lexer qualified as Lexer

parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations/MigrateSchema1To2.hs

@@ -72,7 +72,7 @@ import Unison.Pattern qualified as Pattern
 import Unison.Prelude
 import Unison.Reference qualified as Reference
 import Unison.Referent qualified as Referent
-import Unison.Referent' qualified as Referent'
+import Unison.ReferentPrime qualified as Referent'
 import Unison.Sqlite qualified as Sqlite
 import Unison.Symbol (Symbol)
 import Unison.Term qualified as Term

parser-typechecker/src/Unison/PrettyPrintEnv.hs

@@ -28,7 +28,7 @@ import Unison.ConstructorReference (ConstructorReference)
 import Unison.ConstructorType qualified as CT
 import Unison.HashQualified (HashQualified)
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.LabeledDependency (LabeledDependency)
 import Unison.LabeledDependency qualified as LD
 import Unison.Name (Name)

parser-typechecker/src/Unison/PrettyPrintEnv/Names.hs

@@ -18,7 +18,7 @@ module Unison.PrettyPrintEnv.Names
 where
 
 import Data.Set qualified as Set
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.Names (Names)

parser-typechecker/src/Unison/PrintError.hs

@@ -33,7 +33,7 @@ import Unison.ABT qualified as ABT
 import Unison.Builtin.Decls (unitRef, pattern TupleType')
 import Unison.ConstructorReference (ConstructorReference, GConstructorReference (..))
 import Unison.HashQualified (HashQualified)
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Kind (Kind)
 import Unison.Kind qualified as Kind
 import Unison.KindInference.Error.Pretty (prettyKindError)

parser-typechecker/src/Unison/Runtime/ANF/Serialize.hs

@@ -20,10 +20,10 @@ import Data.Serialize.Put (runPutLazy)
 import Data.Text (Text)
 import Data.Word (Word16, Word32, Word64)
 import GHC.Stack
+import GHC.IsList qualified (fromList)
 import Unison.ABT.Normalized (Term (..))
 import Unison.Reference (Reference, Reference' (Builtin), pattern Derived)
 import Unison.Runtime.ANF as ANF hiding (Tag)
-import Unison.Runtime.Array qualified as PA
 import Unison.Runtime.Exception
 import Unison.Runtime.Serialize
 import Unison.Util.EnumContainers qualified as EC
@@ -682,7 +682,7 @@ getBLit v =
     NegT -> Neg <$> getPositive
     CharT -> Char <$> getChar
     FloatT -> Float <$> getFloat
-    ArrT -> Arr . PA.fromList <$> getList (getValue v)
+    ArrT -> Arr . GHC.IsList.fromList <$> getList (getValue v)
 
 putRefs :: (MonadPut m) => [Reference] -> m ()
 putRefs rs = putFoldable putReference rs

parser-typechecker/src/Unison/Runtime/Array.hs

@@ -56,7 +56,7 @@ import Data.Primitive.PrimArray as EPA hiding
 import Data.Primitive.PrimArray qualified as PA
 import Data.Primitive.Types
 import Data.Word (Word8)
-import GHC.Exts (toList)
+import GHC.IsList (toList )
 
 #ifdef ARRAY_CHECK
 import GHC.Stack

parser-typechecker/src/Unison/Runtime/MCode.hs

@@ -36,7 +36,6 @@ module Unison.Runtime.MCode
   )
 where
 
-import Control.Applicative (liftA2)
 import Data.Bifunctor (bimap, first)
 import Data.Bits (shiftL, shiftR, (.|.))
 import Data.Coerce

parser-typechecker/src/Unison/Runtime/Serialize.hs

@@ -2,7 +2,6 @@
 
 module Unison.Runtime.Serialize where
 
-import Control.Applicative (liftA2)
 import Control.Monad (replicateM)
 import Data.Bits (Bits)
 import Data.ByteString qualified as B

parser-typechecker/src/Unison/Syntax/NamePrinter.hs

@@ -2,7 +2,7 @@ module Unison.Syntax.NamePrinter where
 
 import Data.Text qualified as Text
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.LabeledDependency (LabeledDependency)
 import Unison.LabeledDependency qualified as LD
 import Unison.Name (Name)

parser-typechecker/src/Unison/Syntax/TermParser.hs

@@ -31,7 +31,7 @@ import Unison.Builtin.Decls qualified as DD
 import Unison.ConstructorReference (ConstructorReference, GConstructorReference (..))
 import Unison.ConstructorType qualified as CT
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.NameSegment qualified as NameSegment

parser-typechecker/src/Unison/Syntax/TermPrinter.hs

@@ -35,7 +35,7 @@ import Unison.ConstructorReference (GConstructorReference (..))
 import Unison.ConstructorReference qualified as ConstructorReference
 import Unison.ConstructorType qualified as CT
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.NameSegment (NameSegment)

parser-typechecker/tests/Unison/Test/Codebase/Path.hs

@@ -6,7 +6,7 @@ import Data.Maybe (fromJust)
 import EasyTest
 import Unison.Codebase.Path (Path (..), Path' (..), Relative (..))
 import Unison.Codebase.Path.Parse (parseHQSplit', parseShortHashOrHQSplit')
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.NameSegment.Internal (NameSegment (NameSegment))
 import Unison.Prelude
 import Unison.ShortHash qualified as SH

parser-typechecker/unison-parser-typechecker.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -224,7 +224,6 @@ library
   build-depends:
       IntervalMap
     , ListLike
-    , NanoID
     , aeson
     , ansi-terminal
     , asn1-encoding
@@ -244,6 +243,9 @@ library
     , concurrent-output
     , configurator
     , containers >=0.6.3
+    , crypton-x509
+    , crypton-x509-store
+    , crypton-x509-system
     , cryptonite
     , data-default
     , data-memocombinators
@@ -284,7 +286,7 @@ library
     , nonempty-containers
     , open-browser
     , openapi3
-    , optparse-applicative >=0.16.1.0
+    , optparse-applicative
     , pem
     , pretty-simple
     , primitive
@@ -343,9 +345,6 @@ library
     , warp
     , witch
     , witherable
-    , x509
-    , x509-store
-    , x509-system
     , yaml
     , zlib
   default-language: Haskell2010
@@ -420,7 +419,6 @@ test-suite parser-typechecker-tests
   build-depends:
       IntervalMap
     , ListLike
-    , NanoID
     , aeson
     , ansi-terminal
     , asn1-encoding
@@ -441,6 +439,9 @@ test-suite parser-typechecker-tests
     , concurrent-output
     , configurator
     , containers >=0.6.3
+    , crypton-x509
+    , crypton-x509-store
+    , crypton-x509-system
     , cryptonite
     , data-default
     , data-memocombinators
@@ -484,7 +485,7 @@ test-suite parser-typechecker-tests
     , nonempty-containers
     , open-browser
     , openapi3
-    , optparse-applicative >=0.16.1.0
+    , optparse-applicative
     , pem
     , pretty-simple
     , primitive
@@ -545,9 +546,6 @@ test-suite parser-typechecker-tests
     , warp
     , witch
     , witherable
-    , x509
-    , x509-store
-    , x509-system
     , yaml
     , zlib
   default-language: Haskell2010