Hacks to fix functionality on GHC 9.10

glean.cabal.in

@@ -157,7 +157,7 @@ common deps
         random,
         regex-base,
         regex-pcre,
-        base >=4.11.1 && <4.19,
+        base >=4.11.1 && <4.21,
         array ^>=0.5.2.0,
         async ^>=2.2.1,
         attoparsec >=0.13.2.3 && <0.15,
@@ -166,24 +166,24 @@ common deps
         containers,
         contravariant ^>=1.5,
         text >=1.2.3.0 && < 2.2,
-        bytestring >=0.10.8.2 && <0.12,
+        bytestring >=0.10.8.2 && <0.13,
         vector >=0.12.0.1 && <0.14,
         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,
+        filepath >=1.4.2 && < 1.6,
         exceptions ^>=0.10.0,
         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.11,
+        deepseq >=1.4.3.0 && < 1.6,
+        hashable >=1.2.7.0 && < 1.6,
+        tar >=0.5.1.0 && < 0.7,
+        ghc-prim >=0.5.2.0 && <0.12,
         parsec ^>=3.1.13.0,
         haxl >= 2.1.2.0 && < 2.6,
         hinotify ^>= 0.4.1
@@ -1223,7 +1223,7 @@ executable hie-indexer
         glean:schema,
         glean:stubs,
         glean:util,
-        hie-compat < 0.3.1.2,
+        hie-compat,
         hiedb >= 0.6 && < 0.7
 
 -- -----------------------------------------------------------------------------

glean/hs/Glean/Query/Thrift/Internal.hs

@@ -47,11 +47,12 @@ import Data.IORef
 import qualified Data.Map as Map
 import Data.Maybe
 import Data.Proxy
-import Data.Text as Text
+import qualified Data.Text as Text
+import Data.Text (Text)
 import qualified Data.Text.Encoding as Text
-import Compat.Prettyprinter hiding ((<>))
+import Compat.Prettyprinter (Pretty(..))
 import qualified Data.Vector as Vector
-import Text.Printf
+import Text.Printf (printf)
 
 import Util.Log
 

glean/lang/clang/glean-clang.cabal

@@ -38,16 +38,16 @@ flag opt
 
 common deps
     build-depends:
-        ansi-terminal ^>= 0.11,
+        ansi-terminal >= 0.11 && < 1.2,
         array ^>=0.5.2.0,
         async ^>=2.2.1,
-        base >=4.11.1 && <4.19,
+        base >=4.11.1 && <4.21,
         containers,
         data-default,
-        deepseq ^>=1.4.3.0,
+        deepseq >=1.4.3.0 && < 1.6,
         directory ^>=1.3.1.5,
         fb-util,
-        filepath ^>=1.4.2,
+        filepath >=1.4.2 && < 1.6,
         optparse-applicative,
         process ^>=1.6.3.0,
         stm ^>=2.5.0.0,

glean/lang/haskell/HieIndexer/Index.hs

@@ -144,6 +144,10 @@ toNamespace occ
   | GHC.isTvOcc occ = Hs.Namespace_tyvar
   | GHC.isTcOcc occ = Hs.Namespace_tycon
   | GHC.isDataOcc occ = Hs.Namespace_datacon
+#if MIN_VERSION_ghc(9,10,0)
+  -- TODO: this is definitely wrong lol
+  | GHC.isFieldOcc occ = Hs.Namespace_var_
+#endif
   | otherwise = error "toNamespace"
 
 isRecFieldRef :: RecFieldContext -> Bool