Move to latest LTS

mortberg · Sep 21, 2023 · 9baa6f2 · 9baa6f2
1 parent a5c6f94
commit 9baa6f2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/Connections.hs b/Connections.hs
@@ -3,7 +3,7 @@
 module Connections where
 
 import Control.Applicative
-import Data.List
+import Data.List hiding (singleton)
 import Data.Map (Map,(!),keys,fromList,toList,mapKeys,elems,intersectionWith
                 ,unionWith,singleton,foldrWithKey,assocs,mapWithKey
                 ,filterWithKey,member)
@@ -12,7 +12,6 @@ import qualified Data.Map as Map
 import qualified Data.Set as Set
 import Data.Maybe
 import Test.QuickCheck
-
 newtype Name = Name String
   deriving (Arbitrary,Eq,Ord)
 

diff --git a/Main.hs b/Main.hs
@@ -23,6 +23,7 @@ import CTT
 import Resolver
 import qualified TypeChecker as TC
 import qualified Eval as E
+import Control.Exception 
 
 type Interpreter a = InputT IO a
 

diff --git a/cubicaltt.cabal b/cubicaltt.cabal
@@ -30,8 +30,7 @@ executable cubical
     Exp.Lex,
     Exp.Par,
     Exp.Print,
-    Exp.Skel,
-    Exp.Test
+    Exp.Skel
   other-extensions:
     TypeSynonymInstances,
     FlexibleInstances,
@@ -41,14 +40,14 @@ executable cubical
     MagicHash
   build-depends:
     base >=4.6 && <5,
-    containers >=0.5 && <0.6,
+    containers >=0.5 && <0.7,
     pretty >=1.1 && <1.2,
-    QuickCheck >=2.6 && <2.10,
+    QuickCheck >=2.6 && <2.15,
     mtl >=2.2 && <2.3,
-    time >=1.4 && <1.7,
+    time >=1.4 && <1.13,
     directory >=1.2 && <1.4,
     filepath >=1.4 && <1.5,
-    haskeline >=0.7 && <0.8,
+    haskeline >=0.7 && <0.9,
     array >=0.4 && <0.6,
     -- Build tool
     BNFC >=2.8.1 && <3.0

diff --git a/stack.yaml b/stack.yaml
@@ -1,9 +1,9 @@
-resolver: lts-9.5
+resolver: lts-21.12
 
 packages:
 - .
 extra-deps:
-    - BNFC-2.8.1
+    - BNFC-2.9.5
 
 flags: {}