Revert this to upgrade to GHC 9.2.3

These are all the changes which are incompatible between 8.10.7 and GHC 9.2.3

lib/unison-prelude/src/Unison/Prelude.hs

@@ -40,7 +40,7 @@ import Data.Coerce as X (Coercible, coerce)
 import Data.Either as X
 import Data.Either.Combinators as X (mapLeft, maybeToRight)
 import Data.Either.Extra (eitherToMaybe, maybeToEither)
-import Data.Foldable as X (fold, foldl', for_, toList, traverse_)
+import Data.Foldable as X (asum, fold, foldl', for_, toList, traverse_)
 import Data.Function as X ((&))
 import Data.Functor as X
 import Data.Functor.Identity as X

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

@@ -901,12 +901,6 @@ emitFunction _ grpn rec ctx (FVar v) as
       App False (Env grpn j) as
   | otherwise = emitSectionVErr v
 emitFunction rns _ _ _ (FComb r) as
-  -- | False -- known saturated call
-  --   =
-  --     Call False n as
-  -- | False -- known unsaturated call
-  --   =
-  --     Ins (Name (Env n 0) as) $ Yield (BArg1 0)
   | otherwise -- slow path
     =
       App False (Env n 0) as

stack.yaml

@@ -33,16 +33,13 @@ packages:
 - lib/unison-pretty-printer
 
 #compiler-check: match-exact
-resolver: nightly-2022-06-15
+resolver: lts-18.28
 
 extra-deps:
 - github: unisonweb/configurator
   commit: e47e9e9fe1f576f8c835183b9def52d73c01327a
 - github: unisonweb/shellmet
   commit: 2fd348592c8f51bb4c0ca6ba4bc8e38668913746
-# monad-validate patch to support ghc 9 https://github.com/hasura/monad-validate/pull/5
-- github: unisonweb/monad-validate
-  commit: 5b181b7c57d6e2c975c533b0a0072e9aeb15fb99
 - github: awkward-squad/ki
   commit: 563e96238dfe392dccf68d93953c8f30fd53bec8
   subdirs:
@@ -52,6 +49,7 @@ extra-deps:
 - sandi-0.5@sha256:b278d072ca717706ea38f9bd646e023f7f2576a778fb43565b434f93638849aa,3010
 - strings-1.1@sha256:0285dec4c8ab262359342b3e5ef1eb567074669461b9b38404f1cb870c881c5c,1617
 - fuzzyfind-3.0.0@sha256:d79a5d3ed194dd436c6b839bf187211d880cf773b2febaca456e5ccf93f5ac65,1814
+- monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505
 - NanoID-3.1.0@sha256:9118ab00e8650b5a56a10c90295d357eb77a8057a598b7e56dfedc9c6d53c77d,1524
 # 2.3.27 bundles sqlite >=3.35.0, needed for 'delete returning'
 - direct-sqlite-2.3.27

stack.yaml.lock

@@ -26,17 +26,6 @@ packages:
       sha256: 05a169a7a6b68100630e885054dc1821d31cd06571b0317ec90c75ac2c41aeb7
   original:
     url: https://github.com/unisonweb/shellmet/archive/2fd348592c8f51bb4c0ca6ba4bc8e38668913746.tar.gz
-- completed:
-    size: 18146
-    url: https://github.com/unisonweb/monad-validate/archive/5b181b7c57d6e2c975c533b0a0072e9aeb15fb99.tar.gz
-    name: monad-validate
-    version: 1.2.0.0
-    sha256: 3cf178595f6dee0cbf73d1263327b38f69df1e9ae406429e4252be634fa88f1e
-    pantry-tree:
-      size: 869
-      sha256: 2520040223ec05c14da5f1d2ac7a38e5ed2caf0ec307bce4566924da54c28166
-  original:
-    url: https://github.com/unisonweb/monad-validate/archive/5b181b7c57d6e2c975c533b0a0072e9aeb15fb99.tar.gz
 - completed:
     size: 15840
     subdir: ki
@@ -85,6 +74,13 @@ packages:
       sha256: 0e6c6d4f89083c8385de5adc4f36ad01b2b0ff45261b47f7d90d919969c8b5ed
   original:
     hackage: fuzzyfind-3.0.0@sha256:d79a5d3ed194dd436c6b839bf187211d880cf773b2febaca456e5ccf93f5ac65,1814
+- completed:
+    hackage: monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505
+    pantry-tree:
+      size: 713
+      sha256: 8e049bd12ce2bd470909578f2ee8eb80b89d5ff88860afa30e29dd4eafecfa3e
+  original:
+    hackage: monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505
 - completed:
     hackage: NanoID-3.1.0@sha256:9118ab00e8650b5a56a10c90295d357eb77a8057a598b7e56dfedc9c6d53c77d,1524
     pantry-tree:
@@ -136,7 +132,7 @@ packages:
     hackage: haskeline-0.8.1.3
 snapshots:
 - completed:
-    size: 611629
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/6/15.yaml
-    sha256: e6aa206ca389d8ad5b07d48cc54ca4787e27ed9dde90b0edf8875e6caec16bd2
-  original: nightly-2022-06-15
+    size: 590100
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/28.yaml
+    sha256: 428ec8d5ce932190d3cbe266b9eb3c175cd81e984babf876b64019e2cbe4ea68
+  original: lts-18.28

unison-core/src/Unison/Type.hs

@@ -141,7 +141,7 @@ pattern Effect'' es t <- (unEffect0 -> (es, t))
 pattern Effect0' :: Ord v => [Type v a] -> Type v a -> Type v a
 pattern Effect0' es t <- (unEffect0 -> (es, t))
 
-pattern Forall' :: forall {v} {a}. ABT.Var v => ABT.Subst F v a -> ABT.Term F v a
+pattern Forall' :: ABT.Var v => ABT.Subst F v a -> ABT.Term F v a
 pattern Forall' subst <- ABT.Tm' (Forall (ABT.Abs' subst))
 
 pattern IntroOuter' :: ABT.Var v => ABT.Subst F v a -> ABT.Term F v a
@@ -150,10 +150,10 @@ pattern IntroOuter' subst <- ABT.Tm' (IntroOuter (ABT.Abs' subst))
 pattern IntroOuterNamed' :: v -> ABT.Term F v a -> ABT.Term F v a
 pattern IntroOuterNamed' v body <- ABT.Tm' (IntroOuter (ABT.out -> ABT.Abs v body))
 
-pattern ForallsNamed' :: forall {v} {a}. [v] -> Type v a -> Type v a
+pattern ForallsNamed' :: [v] -> Type v a -> Type v a
 pattern ForallsNamed' vs body <- (unForalls -> Just (vs, body))
 
-pattern ForallNamed' :: forall {v} {a}. v -> ABT.Term F v a -> ABT.Term F v a
+pattern ForallNamed' :: v -> ABT.Term F v a -> ABT.Term F v a
 pattern ForallNamed' v body <- ABT.Tm' (Forall (ABT.out -> ABT.Abs v body))
 
 

unison-hashing-v2/src/Unison/Hashing/V2/Term.hs

@@ -174,6 +174,8 @@ instance Var v => Hashable1 (F v a p) where
                     B.Recorded (B.Resolve _ s) ->
                       [tag 2, Hashable.Text (Text.pack s)]
                 Ref (Reference.Builtin name) -> [tag 2, accumulateToken name]
+                Ref Reference.Derived {} ->
+                  error "handled above, but GHC can't figure this out"
                 App a a2 -> [tag 3, hashed (hash a), hashed (hash a2)]
                 Ann a t -> [tag 4, hashed (hash a), hashed (ABT.hash t)]
                 List as ->

unison-share-api/src/Unison/Sync/Types.hs

@@ -74,7 +74,6 @@ import Control.Lens (both, folding, ix, traverseOf, (^?))
 import qualified Crypto.JWT as Jose
 import Data.Aeson
 import qualified Data.Aeson as Aeson
-import qualified Data.Aeson.KeyMap as Aeson
 import qualified Data.Aeson.Types as Aeson
 import Data.Bifoldable
 import Data.Bifunctor
@@ -219,7 +218,6 @@ decodeHashJWTClaims (HashJWT text) =
               & JWT.unClaimsMap
               & Map.toList
               & HashMap.fromList
-              & Aeson.fromHashMapText
               & Aeson.Object
        in case Aeson.fromJSON object of
             Aeson.Error err -> error ("bad JWT: " ++ err)