Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove head.hackage #3867

Merged
merged 5 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ inputs:
cabal:
description: "Cabal version"
required: false
default: "3.8.1.0"
default: "3.10.2.0"
os:
description: "Operating system: Linux, Windows or macOS"
required: true
Expand Down
37 changes: 12 additions & 25 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ packages:
./plugins/hls-refactor-plugin
./plugins/hls-overloaded-record-dot-plugin

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

tests: True
test-show-details: direct
Expand Down Expand Up @@ -84,27 +84,14 @@ if impl(ghc >= 9.1)

if impl(ghc >= 9.7)
allow-newer:
base,
template-haskell,
ghc,
ghc-prim,
integer-gmp,
ghc-bignum,
template-haskell,
text,
binary,
bytestring,
Cabal,
unix,
deepseq,

repository head.hackage.ghc.haskell.org
url: https://ghc.gitlab.haskell.org/head.hackage/
secure: True
key-threshold: 3
root-keys:
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d

active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org
ekg-core:text,
ghc-trace-events:base,
ghc-trace-events:bytestring,
ghc-trace-events:text,
primitive-unlifted:bytestring,
constraints-extras:base,
constraints-extras:template-haskell,
commutative-semigroups:base,
commutative-semigroups:template-haskell,
generic-lens:text,
generic-lens-core:text,
8 changes: 4 additions & 4 deletions ghcide/ghcide.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ library
hls-plugin-api == 2.4.0.0,
lens,
list-t,
hiedb == 0.4.3.*,
lsp-types ^>= 2.0.2.0,
lsp ^>= 2.2.0.0 ,
hiedb == 0.4.4.*,
lsp-types ^>= 2.1.0.0,
lsp ^>= 2.3.0.0 ,
mtl,
optparse-applicative,
parallel,
Expand Down Expand Up @@ -107,7 +107,7 @@ library
ghc-check >=0.5.0.8,
ghc-paths,
cryptohash-sha1 >=0.11.100 && <0.12,
hie-bios == 0.12.0,
hie-bios == 0.12.1,
-- implicit-hie 0.1.3.0 introduced an unexpected behavioral change.
-- https://github.com/Avi-D-coder/implicit-hie/issues/50
-- to make sure ghcide behaves in a desirable way, we put implicit-hie
Expand Down
2 changes: 1 addition & 1 deletion ghcide/src/Development/IDE/Core/Shake.hs
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ getVirtualFile nf = do

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


Expand Down
2 changes: 1 addition & 1 deletion haskell-language-server.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ library
, ghc
, ghcide == 2.4.0.0
, githash >=0.1.6.1
, lsp >= 2.2.0.0
, lsp >= 2.3.0.0
, hie-bios
, hiedb
, hls-plugin-api == 2.4.0.0
Expand Down
4 changes: 2 additions & 2 deletions hie-compat/hie-compat.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.22
name: hie-compat
version: 0.3.1.1
version: 0.3.1.2
synopsis: HIE files for GHC 8.8 and other HIE file backports
license: Apache-2.0
description:
Expand All @@ -24,7 +24,7 @@ source-repository head
library
default-language: Haskell2010
build-depends:
base < 4.19, array, bytestring, containers, directory, filepath, transformers
base < 4.20, array, bytestring, containers, directory, filepath, transformers
build-depends: ghc >= 8.10, ghc-boot
ghc-options: -Wall -Wno-name-shadowing

Expand Down
2 changes: 1 addition & 1 deletion hls-plugin-api/hls-plugin-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ library
, hls-graph == 2.4.0.0
, lens
, lens-aeson
, lsp ^>=2.2
, lsp ^>=2.3
, mtl
, opentelemetry >=0.4
, optparse-applicative
Expand Down
4 changes: 2 additions & 2 deletions hls-test-utils/hls-test-utils.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ library
, hls-graph
, hls-plugin-api == 2.4.0.0
, lens
, lsp ^>=2.2
, lsp ^>=2.3
, lsp-test ^>=0.16
, lsp-types ^>=2.0.2
, lsp-types ^>=2.1
, tasty
, tasty-expected-failure
, tasty-golden
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ library
, hls-plugin-api == 2.4.0.0
, hie-compat
, lens
, lsp ^>=2.2.0.0
, lsp ^>=2.3.0.0
, mtl
, regex-tdfa
, syb
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-cabal-plugin/hls-cabal-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ library
, hls-plugin-api == 2.4.0.0
, hls-graph == 2.4.0.0
, lens
, lsp ^>=2.2
, lsp-types ^>=2.0.2
, lsp ^>=2.3
, lsp-types ^>=2.1
, regex-tdfa ^>=1.3.1
, stm
, text
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ library
, hiedb
, hls-plugin-api == 2.4.0.0
, lens
, lsp >=2.2.0.0
, lsp >=2.3
, sqlite-simple
, text
, unordered-containers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ library
, ghcide == 2.4.0.0
, hashable
, hls-plugin-api == 2.4.0.0
, lsp >=2.2
, lsp >=2.3
, text
, transformers

Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-floskell-plugin/hls-floskell-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ library
, floskell ^>=0.10
, ghcide == 2.4.0.0
, hls-plugin-api == 2.4.0.0
, lsp-types ^>=2.0.2.0
, lsp-types ^>=2.1
, mtl
, text
, transformers
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-gadt-plugin/hls-gadt-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ library
, hls-plugin-api == 2.4.0.0
, hls-refactor-plugin
, lens
, lsp >=2.2.0.0
, lsp >=2.3
, mtl
, text
, transformers
Expand Down
Loading