Skip to content

Commit 029f921

Browse files
committed
Fix bounds for ghc 9.10 package set
N.B. This has only been tried on nixpkgs staging and Mercury's internal package set, but the indexer and demo seem to work. Haven't tried the test suite.
1 parent 59789d8 commit 029f921

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

glean.cabal.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ common deps
166166
random,
167167
regex-base,
168168
regex-pcre,
169-
base >=4.11.1 && <4.19,
169+
base >=4.11.1 && <4.21,
170170
array ^>=0.5.2.0,
171171
async ^>=2.2.1,
172172
attoparsec >=0.13.2.3 && <0.15,
@@ -175,24 +175,24 @@ common deps
175175
containers,
176176
contravariant ^>=1.5,
177177
text >=1.2.3.0 && < 2.2,
178-
bytestring >=0.10.8.2 && <0.12,
178+
bytestring >=0.10.8.2 && <0.13,
179179
vector >=0.12.0.1 && <0.14,
180180
transformers >= 0.5.6 && < 0.7,
181181
network-uri ^>=2.6.1.0,
182182
stm ^>=2.5.0.0,
183183
directory ^>=1.3.1.5,
184-
filepath ^>=1.4.2,
184+
filepath >=1.4.2 && < 1.6,
185185
exceptions ^>=0.10.0,
186186
mtl >= 2.2.2 && < 2.4,
187187
unix >= 2.7.2.2 && < 2.9,
188188
process ^>=1.6.3.0,
189189
prettyprinter >=1.2.1 && <1.8,
190190
time >=1.8.0.2 && <1.13,
191191
binary ^>=0.8.5.1,
192-
deepseq ^>=1.4.3.0,
193-
hashable >=1.2.7.0 && <1.6,
194-
tar ^>=0.5.1.0,
195-
ghc-prim >=0.5.2.0 && <0.11,
192+
deepseq >=1.4.3.0 && < 1.6,
193+
hashable >=1.2.7.0 && < 1.6,
194+
tar >=0.5.1.0 && < 0.7,
195+
ghc-prim >=0.5.2.0 && <0.12,
196196
parsec ^>=3.1.13.0,
197197
haxl >= 2.1.2.0 && < 2.6,
198198
hinotify ^>= 0.4.1
@@ -1336,7 +1336,7 @@ executable hie-indexer
13361336
glean:schema,
13371337
glean:stubs,
13381338
glean:util,
1339-
hie-compat < 0.3.1.2,
1339+
hie-compat,
13401340
hiedb >= 0.6 && < 0.7
13411341

13421342
-- -----------------------------------------------------------------------------

glean/lang/clang/glean-clang.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ flag opt
3838

3939
common deps
4040
build-depends:
41-
ansi-terminal ^>= 0.11,
41+
ansi-terminal >= 0.11 && < 1.2,
4242
array ^>=0.5.2.0,
4343
async ^>=2.2.1,
44-
base >=4.11.1 && <4.19,
44+
base >=4.11.1 && <4.21,
4545
containers,
4646
data-default,
47-
deepseq ^>=1.4.3.0,
47+
deepseq >=1.4.3.0 && < 1.6,
4848
directory ^>=1.3.1.5,
4949
fb-util,
50-
filepath ^>=1.4.2,
50+
filepath >=1.4.2 && < 1.6,
5151
optparse-applicative,
5252
process ^>=1.6.3.0,
5353
stm ^>=2.5.0.0,

glean/lsp/glean-lsp.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ executable glean-lsp
7272
Data.ConcurrentCache
7373
build-depends:
7474
aeson >= 2.0.3 && < 2.3,
75-
base >=4.11.1 && <4.19,
76-
containers >= 0.6 && < 0.7,
75+
base >=4.11.1 && <4.21,
76+
containers >= 0.6 && < 0.8,
7777
data-default >= 0.7.1 && < 0.9,
7878
directory ^>=1.3.1.5,
7979
exceptions ^>=0.10.0,
80-
filepath >= 1.4.2 && < 1.5,
80+
filepath >= 1.4.2 && < 1.6,
8181
hashable >=1.2.7.0 && <1.5,
8282
lsp >=2.7.0.0 && <2.8.0.0,
8383
text >=1.2.3.0 && < 2.2,

0 commit comments

Comments
 (0)