GHC 9.6

Author: simonmar

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: [9.2.8, 9.4.7]
+        ghc: [9.2.8, 9.4.7, 9.6.7]
         compiler: [gcc]
         index-state: [2025-04-14T00:00:00Z]
     runs-on: 32-core-ubuntu

cabal.project

@@ -20,9 +20,6 @@ tests: True
 -- necessary to use a haskeline <0.8 with GHCs that ship with base >= 4.14
 allow-newer: haskeline:base
 
--- https://github.com/TomMD/entropy/issues/75
-constraints: entropy < 0.4.1.9
-
 package fb-util
     flags: +folly
 

glean.cabal.in

@@ -156,7 +156,7 @@ common deps
         random,
         regex-base,
         regex-pcre,
-        base >=4.11.1 && <4.18,
+        base >=4.11.1 && <4.19,
         array ^>=0.5.2.0,
         async ^>=2.2.1,
         attoparsec >=0.13.2.3 && <0.15,
@@ -167,22 +167,22 @@ common deps
         text >=1.2.3.0 && < 2.2,
         bytestring >=0.10.8.2 && <0.12,
         vector >=0.12.0.1 && <0.14,
-        transformers ^>=0.5.6.2,
+        transformers >= 0.5.6 && < 0.7,
         network-uri ^>=2.6.1.0,
         stm ^>=2.5.0.0,
         directory ^>=1.3.1.5,
         filepath ^>=1.4.2,
         exceptions ^>=0.10.0,
-        mtl ^>=2.2.2,
-        unix ^>=2.7.2.2,
+        mtl >= 2.2.2 && < 2.4,
+        unix >= 2.7.2.2 && < 2.9,
         process ^>=1.6.3.0,
         prettyprinter >=1.2.1 && <1.8,
         time >=1.8.0.2 && <1.13,
         binary ^>=0.8.5.1,
         deepseq ^>=1.4.3.0,
         hashable >=1.2.7.0 && <1.6,
         tar ^>=0.5.1.0,
-        ghc-prim >=0.5.2.0 && <0.10,
+        ghc-prim >=0.5.2.0 && <0.11,
         parsec ^>=3.1.13.0,
         haxl >= 2.1.2.0 && < 2.6,
         hinotify ^>= 0.4.1

glean/db/Glean/Database/Env.hs

@@ -8,6 +8,8 @@
 
 module Glean.Database.Env ( withDatabases ) where
 
+import Prelude hiding (liftA2)
+
 import Control.Applicative (liftA2)
 import Control.Concurrent
 import Control.Concurrent.Async (async, waitEither, withAsync)

glean/db/Glean/Query/Codegen.hs

@@ -18,6 +18,7 @@ module Glean.Query.Codegen
   ) where
 
 import Control.Exception
+import Control.Monad
 import Control.Monad.Extra (whenJust)
 import Control.Monad.State
 import Data.Bifunctor (bimap)

glean/db/Glean/Query/Flatten.hs

@@ -10,6 +10,7 @@ module Glean.Query.Flatten
   ( flatten
   ) where
 
+import Control.Monad
 import Control.Monad.Except
 import Control.Monad.State
 import Data.List hiding (intersect)

glean/db/Glean/Query/Opt.hs

@@ -10,6 +10,7 @@ module Glean.Query.Opt
   ( optimise
   ) where
 
+import Control.Monad
 import Control.Monad.Except
 import Control.Monad.State.Strict
 import qualified Data.ByteString as B

glean/db/Glean/Query/Reorder.hs

@@ -13,6 +13,7 @@ module Glean.Query.Reorder
   ) where
 
 import Control.Applicative ((<|>))
+import Control.Monad
 import Control.Monad.Except
 import Control.Monad.State.Strict
 import Data.Foldable (find, toList)

glean/db/Glean/Query/Transform.hs

@@ -24,7 +24,12 @@ module Glean.Query.Transform
   , defaultValue
   ) where
 
+import Control.Monad
+#if MIN_VERSION_mtl(2,3,1)
+import Control.Monad.Cont hiding (label)
+#else
 import Control.Monad.Cont
+#endif
 import Data.Bifoldable
 import Data.Bifunctor (bimap)
 import qualified Data.ByteString as ByteString

glean/db/Glean/Query/Typecheck.hs

@@ -25,6 +25,7 @@ module Glean.Query.Typecheck
   , UseOfNegation(..)
   ) where
 
+import Control.Monad
 import Control.Applicative ((<|>))
 import Control.Monad.Except
 import Control.Monad.State