diff --git a/glean.cabal.in b/glean.cabal.in index d2d7c0d853..e99e531456 100644 --- a/glean.cabal.in +++ b/glean.cabal.in @@ -166,7 +166,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, @@ -175,13 +175,13 @@ 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, @@ -189,10 +189,10 @@ common deps 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 @@ -1336,7 +1336,7 @@ executable hie-indexer glean:schema, glean:stubs, glean:util, - hie-compat < 0.3.1.2, + hie-compat, hiedb >= 0.6 && < 0.7 -- ----------------------------------------------------------------------------- diff --git a/glean/lang/clang/glean-clang.cabal b/glean/lang/clang/glean-clang.cabal index 94dda7a16d..9a49a7ca1e 100644 --- a/glean/lang/clang/glean-clang.cabal +++ b/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, diff --git a/glean/lang/haskell/HieIndexer/Index.hs b/glean/lang/haskell/HieIndexer/Index.hs index 286d08f6b7..604cbd56cf 100644 --- a/glean/lang/haskell/HieIndexer/Index.hs +++ b/glean/lang/haskell/HieIndexer/Index.hs @@ -179,6 +179,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 diff --git a/glean/lsp/glean-lsp.cabal b/glean/lsp/glean-lsp.cabal index b5359b5be4..6ebe139d60 100644 --- a/glean/lsp/glean-lsp.cabal +++ b/glean/lsp/glean-lsp.cabal @@ -72,12 +72,12 @@ executable glean-lsp Data.ConcurrentCache build-depends: aeson >= 2.0.3 && < 2.3, - base >=4.11.1 && <4.19, - containers >= 0.6 && < 0.7, + base >=4.11.1 && <4.21, + containers >= 0.6 && < 0.8, data-default >= 0.7.1 && < 0.9, directory ^>=1.3.1.5, exceptions ^>=0.10.0, - filepath >= 1.4.2 && < 1.5, + filepath >= 1.4.2 && < 1.6, hashable >=1.2.7.0 && <1.5, lsp >=2.7.0.0 && <2.8.0.0, text >=1.2.3.0 && < 2.2,