Skip to content

Commit 0c018ac

Browse files
fendorhasufellberbermanmergify[bot]
authored
Upgrade to hie-bios 0.9.0 (#2738)
* Try out new hie-bios * Update to hie-bios 0.9.0 hackage release * Use caret operator for hie-bios dependency Co-authored-by: Julian Ospald <hasufell@posteo.de> * Update nix dependency * Update hie-bios dependency in flake.nix Co-authored-by: Potato Hatsue <berberman@yandex.com> Co-authored-by: Julian Ospald <hasufell@posteo.de> Co-authored-by: Potato Hatsue <berberman@yandex.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 905e2ef commit 0c018ac

13 files changed

+20
-14
lines changed

cabal-ghc90.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ package *
3636

3737
write-ghc-environment-files: never
3838

39-
index-state: 2022-01-24T21:03:03Z
39+
index-state: 2022-02-25T21:47:10Z
4040

4141
constraints:
4242
-- These plugins don't work on GHC9 yet

cabal-ghc921.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ package *
3838

3939
write-ghc-environment-files: never
4040

41-
index-state: 2022-01-24T21:03:03Z
41+
index-state: 2022-02-25T21:47:10Z
4242

4343
constraints:
4444
-- These plugins don't build/work on GHC92 yet

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ package *
4141

4242
write-ghc-environment-files: never
4343

44-
index-state: 2022-01-24T21:03:03Z
44+
index-state: 2022-02-25T21:47:10Z
4545

4646
constraints:
4747
hyphenation +embed

flake.nix

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
url = "https://hackage.haskell.org/package/implicit-hie-cradle-0.3.0.5/implicit-hie-cradle-0.3.0.5.tar.gz";
6060
flake = false;
6161
};
62+
hie-bios = {
63+
url = "https://hackage.haskell.org/package/hie-bios-0.9.0/hie-bios-0.9.0.tar.gz";
64+
flake = false;
65+
};
6266
};
6367
outputs =
6468
inputs@{ self, nixpkgs, flake-compat, flake-utils, pre-commit-hooks, gitignore, ... }:
@@ -108,8 +112,8 @@
108112
with haskell.lib; {
109113
# Patches don't apply
110114
github = overrideCabal hsuper.github (drv: { patches = []; });
111-
# GHCIDE requires hie-bios >=0.8 && <0.9.0
112-
hie-bios = hself.hie-bios_0_8_0;
115+
# GHCIDE requires hie-bios ^>=0.9.0
116+
hie-bios = hself.callCabal2nix "hie-bios" inputs.hie-bios {};
113117
# We need an older version
114118
hiedb = hself.hiedb_0_4_1_0;
115119

@@ -364,7 +368,7 @@
364368
# distributed using nix.
365369
all-haskell-language-server = linkFarmFromDrvs "all-haskell-language-server" (lib.unique (builtins.attrValues allPackages));
366370

367-
# Same for all shells
371+
# Same for all shells
368372
# We try to build as much as possible, but not much shells are
369373
# working (especially on darwing), so this list is limited.
370374
all-nix-dev-shells = linkFarmFromDrvs "all-dev-shells" (builtins.map (shell: shell.inputDerivation) (lib.unique [nixDevShells.haskell-language-server-dev-nix]));

ghcide/ghcide.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ library
105105
ghc-check >=0.5.0.4,
106106
ghc-paths,
107107
cryptohash-sha1 >=0.11.100 && <0.12,
108-
hie-bios >= 0.8 && < 0.9.0,
108+
hie-bios ^>= 0.9.0,
109109
implicit-hie-cradle ^>= 0.3.0.5 || ^>= 0.5,
110110
base16-bytestring >=0.1.1 && <1.1
111111
if os(windows)

stack-8.10.6.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ extra-deps:
4242
- extra-1.7.10
4343
- floskell-0.10.5@sha256:77f0bc1569573d9666b10975a5357fef631d32266c071733739393ccae521dab,3803
4444
- heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417
45-
- hie-bios-0.8.0
45+
- hie-bios-0.9.0
4646
- hiedb-0.4.1.0
4747
- hlint-3.2.8
4848
- implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998

stack-8.10.7.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extra-deps:
4343
- extra-1.7.10
4444
- floskell-0.10.5@sha256:77f0bc1569573d9666b10975a5357fef631d32266c071733739393ccae521dab,3803
4545
- heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417
46-
- hie-bios-0.8.0
46+
- hie-bios-0.9.0
4747
- hiedb-0.4.1.0
4848
- hlint-3.2.8
4949
- implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998

stack-8.6.5.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ extra-deps:
6262
- haddock-library-1.10.0
6363
- hashable-1.3.0.0
6464
- heapsize-0.3.0
65-
- hie-bios-0.8.0
65+
- hie-bios-0.9.0
6666
- hlint-3.2.8
6767
- HsYAML-0.2.1.0@rev:1
6868
- HsYAML-aeson-0.2.0.0@rev:2
@@ -79,7 +79,7 @@ extra-deps:
7979
- optparse-applicative-0.15.1.0
8080
- ormolu-0.1.4.1
8181
- parser-combinators-1.2.1
82-
- prettyprinter-1.7.1
82+
- prettyprinter-1.7.1
8383
- primitive-0.7.1.0
8484
- refinery-0.4.0.0
8585
- regex-base-0.94.0.0
@@ -115,7 +115,6 @@ extra-deps:
115115
- stm-hamt-1.2.0.6@sha256:fba86ccb4b45c5706c19b0e1315ba63dcac3b5d71de945ec001ba921fae80061,3972
116116
- primitive-extras-0.10.1
117117
- primitive-unlifted-0.1.3.1
118-
119118
configure-options:
120119
ghcide:
121120
- --disable-library-for-ghci

stack-8.8.4.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ extra-deps:
5252
- ghc-trace-events-0.1.2.1
5353
- haskell-src-exts-1.21.1
5454
- heapsize-0.3.0
55-
- hie-bios-0.8.0
55+
- hie-bios-0.9.0
5656
- hlint-3.2.8
5757
- HsYAML-aeson-0.2.0.0@rev:2
5858
- hoogle-5.0.17.11

stack-9.0.1.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ extra-deps:
4545
- floskell-0.10.6
4646
- heapsize-0.3.0.1
4747
- hiedb-0.4.1.0
48+
- hie-bios-0.9.0
4849
- implicit-hie-0.1.2.6
4950
- implicit-hie-cradle-0.3.0.5
5051
- monad-dijkstra-0.1.1.3

stack-9.0.2.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ extra-deps:
4545
- floskell-0.10.6
4646
- heapsize-0.3.0.1
4747
- hiedb-0.4.1.0
48+
- hie-bios-0.9.0
4849
- implicit-hie-0.1.2.6
4950
- implicit-hie-cradle-0.3.0.5
5051
- monad-dijkstra-0.1.1.3

stack-9.2.1.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ extra-deps:
5050
- ghc-lib-parser-ex-9.2.0.1
5151
- heapsize-0.3.0.1
5252
- hiedb-0.4.1.0
53+
- hie-bios-0.9.0
5354
- hspec-2.7.10 # for hls-test-utils
5455
- hspec-core-2.7.10 # for hls-test-utils
5556
- implicit-hie-0.1.2.6

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ extra-deps:
4343
- extra-1.7.10
4444
- floskell-0.10.5@sha256:77f0bc1569573d9666b10975a5357fef631d32266c071733739393ccae521dab,3803
4545
- heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417
46-
- hie-bios-0.8.0
4746
- hiedb-0.4.1.0
47+
- hie-bios-0.9.0
4848
- hlint-3.2.8
4949
- implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998
5050
- implicit-hie-cradle-0.3.0.5@sha256:5f5e575f549b2a9db664be7650b5c3c9226e313bddc46c79e2e83eb349f8e692,2610

0 commit comments

Comments
 (0)