diff --git a/cabal-ghc90.project b/cabal-ghc90.project index fa4961a8bd..38f318fdc4 100644 --- a/cabal-ghc90.project +++ b/cabal-ghc90.project @@ -36,7 +36,7 @@ package * write-ghc-environment-files: never -index-state: 2022-01-24T21:03:03Z +index-state: 2022-02-25T21:47:10Z constraints: -- These plugins don't work on GHC9 yet diff --git a/cabal-ghc921.project b/cabal-ghc921.project index 5ecaae445a..8d22333014 100644 --- a/cabal-ghc921.project +++ b/cabal-ghc921.project @@ -38,7 +38,7 @@ package * write-ghc-environment-files: never -index-state: 2022-01-24T21:03:03Z +index-state: 2022-02-25T21:47:10Z constraints: -- These plugins don't build/work on GHC92 yet diff --git a/cabal.project b/cabal.project index 34a5106149..e1c8aa98cf 100644 --- a/cabal.project +++ b/cabal.project @@ -41,7 +41,7 @@ package * write-ghc-environment-files: never -index-state: 2022-01-24T21:03:03Z +index-state: 2022-02-25T21:47:10Z constraints: hyphenation +embed diff --git a/flake.nix b/flake.nix index 2743d1b95e..63fc3d81cf 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,10 @@ url = "https://hackage.haskell.org/package/implicit-hie-cradle-0.3.0.5/implicit-hie-cradle-0.3.0.5.tar.gz"; flake = false; }; + hie-bios = { + url = "https://hackage.haskell.org/package/hie-bios-0.9.0/hie-bios-0.9.0.tar.gz"; + flake = false; + }; }; outputs = inputs@{ self, nixpkgs, flake-compat, flake-utils, pre-commit-hooks, gitignore, ... }: @@ -108,8 +112,8 @@ with haskell.lib; { # Patches don't apply github = overrideCabal hsuper.github (drv: { patches = []; }); - # GHCIDE requires hie-bios >=0.8 && <0.9.0 - hie-bios = hself.hie-bios_0_8_0; + # GHCIDE requires hie-bios ^>=0.9.0 + hie-bios = hself.callCabal2nix "hie-bios" inputs.hie-bios {}; # We need an older version hiedb = hself.hiedb_0_4_1_0; @@ -364,7 +368,7 @@ # distributed using nix. all-haskell-language-server = linkFarmFromDrvs "all-haskell-language-server" (lib.unique (builtins.attrValues allPackages)); - # Same for all shells + # Same for all shells # We try to build as much as possible, but not much shells are # working (especially on darwing), so this list is limited. all-nix-dev-shells = linkFarmFromDrvs "all-dev-shells" (builtins.map (shell: shell.inputDerivation) (lib.unique [nixDevShells.haskell-language-server-dev-nix])); diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 097994e925..1a0775714b 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -105,7 +105,7 @@ library ghc-check >=0.5.0.4, ghc-paths, cryptohash-sha1 >=0.11.100 && <0.12, - hie-bios >= 0.8 && < 0.9.0, + hie-bios ^>= 0.9.0, implicit-hie-cradle ^>= 0.3.0.5 || ^>= 0.5, base16-bytestring >=0.1.1 && <1.1 if os(windows) diff --git a/stack-8.10.6.yaml b/stack-8.10.6.yaml index 321f143bcd..c50a666198 100644 --- a/stack-8.10.6.yaml +++ b/stack-8.10.6.yaml @@ -42,7 +42,7 @@ extra-deps: - extra-1.7.10 - floskell-0.10.5@sha256:77f0bc1569573d9666b10975a5357fef631d32266c071733739393ccae521dab,3803 - heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417 - - hie-bios-0.8.0 + - hie-bios-0.9.0 - hiedb-0.4.1.0 - hlint-3.2.8 - implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998 diff --git a/stack-8.10.7.yaml b/stack-8.10.7.yaml index f373a37ea5..4a20d069c1 100644 --- a/stack-8.10.7.yaml +++ b/stack-8.10.7.yaml @@ -43,7 +43,7 @@ extra-deps: - extra-1.7.10 - floskell-0.10.5@sha256:77f0bc1569573d9666b10975a5357fef631d32266c071733739393ccae521dab,3803 - heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417 - - hie-bios-0.8.0 + - hie-bios-0.9.0 - hiedb-0.4.1.0 - hlint-3.2.8 - implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 9287ff9113..30c32d808b 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -62,7 +62,7 @@ extra-deps: - haddock-library-1.10.0 - hashable-1.3.0.0 - heapsize-0.3.0 - - hie-bios-0.8.0 + - hie-bios-0.9.0 - hlint-3.2.8 - HsYAML-0.2.1.0@rev:1 - HsYAML-aeson-0.2.0.0@rev:2 @@ -79,7 +79,7 @@ extra-deps: - optparse-applicative-0.15.1.0 - ormolu-0.1.4.1 - parser-combinators-1.2.1 - - prettyprinter-1.7.1 + - prettyprinter-1.7.1 - primitive-0.7.1.0 - refinery-0.4.0.0 - regex-base-0.94.0.0 @@ -115,7 +115,6 @@ extra-deps: - stm-hamt-1.2.0.6@sha256:fba86ccb4b45c5706c19b0e1315ba63dcac3b5d71de945ec001ba921fae80061,3972 - primitive-extras-0.10.1 - primitive-unlifted-0.1.3.1 - configure-options: ghcide: - --disable-library-for-ghci diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index aba8de6350..e6ddbe7651 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -52,7 +52,7 @@ extra-deps: - ghc-trace-events-0.1.2.1 - haskell-src-exts-1.21.1 - heapsize-0.3.0 - - hie-bios-0.8.0 + - hie-bios-0.9.0 - hlint-3.2.8 - HsYAML-aeson-0.2.0.0@rev:2 - hoogle-5.0.17.11 diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml index 2f75afbaee..fec732f0f5 100644 --- a/stack-9.0.1.yaml +++ b/stack-9.0.1.yaml @@ -45,6 +45,7 @@ extra-deps: - floskell-0.10.6 - heapsize-0.3.0.1 - hiedb-0.4.1.0 +- hie-bios-0.9.0 - implicit-hie-0.1.2.6 - implicit-hie-cradle-0.3.0.5 - monad-dijkstra-0.1.1.3 diff --git a/stack-9.0.2.yaml b/stack-9.0.2.yaml index df94686560..dfe06176e5 100644 --- a/stack-9.0.2.yaml +++ b/stack-9.0.2.yaml @@ -45,6 +45,7 @@ extra-deps: - floskell-0.10.6 - heapsize-0.3.0.1 - hiedb-0.4.1.0 +- hie-bios-0.9.0 - implicit-hie-0.1.2.6 - implicit-hie-cradle-0.3.0.5 - monad-dijkstra-0.1.1.3 diff --git a/stack-9.2.1.yaml b/stack-9.2.1.yaml index 8bcf7b4b3d..49b917e73b 100644 --- a/stack-9.2.1.yaml +++ b/stack-9.2.1.yaml @@ -50,6 +50,7 @@ extra-deps: - ghc-lib-parser-ex-9.2.0.1 - heapsize-0.3.0.1 - hiedb-0.4.1.0 +- hie-bios-0.9.0 - hspec-2.7.10 # for hls-test-utils - hspec-core-2.7.10 # for hls-test-utils - implicit-hie-0.1.2.6 diff --git a/stack.yaml b/stack.yaml index f373a37ea5..c5b2ecccd3 100644 --- a/stack.yaml +++ b/stack.yaml @@ -43,8 +43,8 @@ extra-deps: - extra-1.7.10 - floskell-0.10.5@sha256:77f0bc1569573d9666b10975a5357fef631d32266c071733739393ccae521dab,3803 - heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417 - - hie-bios-0.8.0 - hiedb-0.4.1.0 + - hie-bios-0.9.0 - hlint-3.2.8 - implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998 - implicit-hie-cradle-0.3.0.5@sha256:5f5e575f549b2a9db664be7650b5c3c9226e313bddc46c79e2e83eb349f8e692,2610