support ghc-9.10

.github/workflows/applications.yml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['9.6']
-        cabal: ['3.10']
+        ghc: ['9.6', '9.10']
+        cabal: ['3.12']
         os: ['ubuntu-20.04', 'ubuntu-22.04', 'macos-latest', 'macos-14']
         cabalcache: ['true']
         flags: ['+build-tool']

cabal.project

@@ -45,12 +45,13 @@ allow-newer: *:template-haskell
 allow-newer: *:base
 allow-newer: *:ghc-prim
 
--- Patch merged into master (upcoming verison 10.0). We are currently using 9.2
+-- Patch merged into master (upcoming verison 10.0). We are currently using 9.2.
+-- This fork contains additional fixes for using 9.2 with recent compilers. 
 source-repository-package
   type: git
-  tag: 3946a0e94470d7403a855dd60f8e54687ecc2b1d
+  tag: 1f2d042718fcf9a140398bd3dedac77c207cce27
   location: https://github.com/larskuhtz/sbv
-  --sha256: 1msbz6525nmsywpm910jh23siil4qgn3rpsm52m8j6877r7v5zw3
+  --sha256: sha256-Y2ZRU9lkrClYiNc8apwy4uO1TAvJ8JZEPKF73ZuGdlA=
 
 -- Servant is notoriously forcing outdated upper bounds onto its users.
 -- It is usually safe to just ignore those.

pact.cabal

@@ -1,4 +1,4 @@
-cabal-version:       2.2
+cabal-version:       3.0
 name:                pact
 version:             4.12
 -- ^ 4 digit is prerelease, 3- or 2-digit for prod release
@@ -236,7 +236,7 @@ library
     , mod >=0.1.2
     , mtl >=2.3
     , pact-json >=0.1
-    , pact-time >=0.2
+    , pact-time >=0.3.0.1
     , parsers >=0.12.4
     , poly >=0.5.0
     , primitive >=0.8
@@ -260,7 +260,6 @@ library
     , utf8-string >=1.0.1.1
     , vector >=0.11.0.0
     , vector-algorithms >=0.7
-    , vector-space >=0.10.4
     , wide-word >= 0.1
     , yaml
 

src-tool/Pact/Analyze/Types/Shared.hs

@@ -35,7 +35,6 @@ import           Control.Lens                 (At (at), Index, Iso, IxValue,
                                                makePrisms, over, (%~), (&),
                                                (<&>))
 import           Data.Aeson                   (FromJSON)
-import           Data.AffineSpace             ((.+^), (.-.))
 import           Data.Coerce                  (Coercible, coerce)
 import           Data.Constraint              (Dict (Dict), withDict)
 import           Data.Data                    (Data, Proxy, Typeable)
@@ -69,6 +68,7 @@ import           Data.Type.Equality           ((:~:) (Refl))
 import           GHC.TypeLits                 (KnownSymbol, SomeSymbol(..), Symbol, symbolVal, someSymbolVal)
 import           Prelude                      hiding (Float)
 
+import           Pact.Time                    ((.-.), (.+^))
 import           Pact.Types.Pretty            hiding (list)
 import qualified Pact.Types.Pretty            as Pretty
 import qualified Pact.Types.Lang              as Pact

src/Pact/Native/Time.hs

@@ -23,10 +23,8 @@ module Pact.Native.Time
 import Control.Monad
 import Prelude
 import Data.Decimal
-import Data.AffineSpace
 import Data.Text (Text, pack, unpack)
 import Pact.Time
-
 import Pact.Types.Pretty
 import Pact.Types.Runtime
 import Pact.Native.Internal