Skip to content

Commit bee2b03

Browse files
committed
Remove head.hackage
Bump to - lsp-2.3 - lsp-types-2.1 - hiedb-0.4.4 - hie-bios-12.1 (TODO remove source-repository package in favour of hackage release) - hie-comat-0.3.1.2
1 parent 0f9be3e commit bee2b03

File tree

13 files changed

+30
-43
lines changed

13 files changed

+30
-43
lines changed

cabal.project

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ packages:
3434
./plugins/hls-refactor-plugin
3535
./plugins/hls-overloaded-record-dot-plugin
3636

37-
index-state: 2023-10-06T06:12:29Z
37+
index-state: 2023-11-13T12:07:58Z
3838

3939
tests: True
4040
test-show-details: direct
@@ -84,27 +84,14 @@ if impl(ghc >= 9.1)
8484

8585
if impl(ghc >= 9.7)
8686
allow-newer:
87-
base,
88-
template-haskell,
89-
ghc,
90-
ghc-prim,
91-
integer-gmp,
92-
ghc-bignum,
93-
template-haskell,
94-
text,
95-
binary,
96-
bytestring,
97-
Cabal,
98-
unix,
99-
deepseq,
100-
101-
repository head.hackage.ghc.haskell.org
102-
url: https://ghc.gitlab.haskell.org/head.hackage/
103-
secure: True
104-
key-threshold: 3
105-
root-keys:
106-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
107-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
108-
7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
109-
110-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org
87+
ekg-core:text,
88+
ghc-trace-events:base,
89+
ghc-trace-events:bytestring,
90+
ghc-trace-events:text,
91+
primitive-unlifted:bytestring,
92+
constraints-extras:base,
93+
constraints-extras:template-haskell,
94+
commutative-semigroups:base,
95+
commutative-semigroups:template-haskell,
96+
generic-lens:text,
97+
generic-lens-core:text,

ghcide/ghcide.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ library
7272
hls-plugin-api == 2.4.0.0,
7373
lens,
7474
list-t,
75-
hiedb == 0.4.3.*,
76-
lsp-types ^>= 2.0.2.0,
77-
lsp ^>= 2.2.0.0 ,
75+
hiedb == 0.4.4.*,
76+
lsp-types ^>= 2.1.0.0,
77+
lsp ^>= 2.3.0.0 ,
7878
mtl,
7979
optparse-applicative,
8080
parallel,
@@ -107,7 +107,7 @@ library
107107
ghc-check >=0.5.0.8,
108108
ghc-paths,
109109
cryptohash-sha1 >=0.11.100 && <0.12,
110-
hie-bios == 0.12.0,
110+
hie-bios == 0.12.1,
111111
-- implicit-hie 0.1.3.0 introduced an unexpected behavioral change.
112112
-- https://github.com/Avi-D-coder/implicit-hie/issues/50
113113
-- to make sure ghcide behaves in a desirable way, we put implicit-hie

ghcide/src/Development/IDE/Core/Shake.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ getVirtualFile nf = do
366366

367367
-- Take a snapshot of the current LSP VFS
368368
vfsSnapshot :: Maybe (LSP.LanguageContextEnv a) -> IO VFS
369-
vfsSnapshot Nothing = pure $ VFS mempty ""
369+
vfsSnapshot Nothing = pure $ VFS mempty
370370
vfsSnapshot (Just lspEnv) = LSP.runLspT lspEnv LSP.getVirtualFiles
371371

372372

haskell-language-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ library
374374
, ghc
375375
, ghcide == 2.4.0.0
376376
, githash >=0.1.6.1
377-
, lsp >= 2.2.0.0
377+
, lsp >= 2.3.0.0
378378
, hie-bios
379379
, hiedb
380380
, hls-plugin-api == 2.4.0.0

hie-compat/hie-compat.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 1.22
22
name: hie-compat
3-
version: 0.3.1.1
3+
version: 0.3.1.2
44
synopsis: HIE files for GHC 8.8 and other HIE file backports
55
license: Apache-2.0
66
description:
@@ -24,7 +24,7 @@ source-repository head
2424
library
2525
default-language: Haskell2010
2626
build-depends:
27-
base < 4.19, array, bytestring, containers, directory, filepath, transformers
27+
base < 4.20, array, bytestring, containers, directory, filepath, transformers
2828
build-depends: ghc >= 8.10, ghc-boot
2929
ghc-options: -Wall -Wno-name-shadowing
3030

hls-plugin-api/hls-plugin-api.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ library
6262
, hls-graph == 2.4.0.0
6363
, lens
6464
, lens-aeson
65-
, lsp ^>=2.2
65+
, lsp ^>=2.3
6666
, mtl
6767
, opentelemetry >=0.4
6868
, optparse-applicative

hls-test-utils/hls-test-utils.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ library
4646
, hls-graph
4747
, hls-plugin-api == 2.4.0.0
4848
, lens
49-
, lsp ^>=2.2
49+
, lsp ^>=2.3
5050
, lsp-test ^>=0.16
51-
, lsp-types ^>=2.0.2
51+
, lsp-types ^>=2.1
5252
, tasty
5353
, tasty-expected-failure
5454
, tasty-golden

plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ library
3737
, hls-plugin-api == 2.4.0.0
3838
, hie-compat
3939
, lens
40-
, lsp ^>=2.2.0.0
40+
, lsp ^>=2.3.0.0
4141
, mtl
4242
, regex-tdfa
4343
, syb

plugins/hls-cabal-plugin/hls-cabal-plugin.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ library
5454
, hls-plugin-api == 2.4.0.0
5555
, hls-graph == 2.4.0.0
5656
, lens
57-
, lsp ^>=2.2
58-
, lsp-types ^>=2.0.2
57+
, lsp ^>=2.3
58+
, lsp-types ^>=2.1
5959
, regex-tdfa ^>=1.3.1
6060
, stm
6161
, text

plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ library
3737
, hiedb
3838
, hls-plugin-api == 2.4.0.0
3939
, lens
40-
, lsp >=2.2.0.0
40+
, lsp >=2.3
4141
, sqlite-simple
4242
, text
4343
, unordered-containers

plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ library
3232
, ghcide == 2.4.0.0
3333
, hashable
3434
, hls-plugin-api == 2.4.0.0
35-
, lsp >=2.2
35+
, lsp >=2.3
3636
, text
3737
, transformers
3838

plugins/hls-floskell-plugin/hls-floskell-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ library
3131
, floskell ^>=0.10
3232
, ghcide == 2.4.0.0
3333
, hls-plugin-api == 2.4.0.0
34-
, lsp-types ^>=2.0.2.0
34+
, lsp-types ^>=2.1
3535
, mtl
3636
, text
3737
, transformers

plugins/hls-gadt-plugin/hls-gadt-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ library
4141
, hls-plugin-api == 2.4.0.0
4242
, hls-refactor-plugin
4343
, lens
44-
, lsp >=2.2.0.0
44+
, lsp >=2.3
4545
, mtl
4646
, text
4747
, transformers

0 commit comments

Comments
 (0)