Skip to content

Commit 507209c

Browse files
authored
Update flake manually (#98)
1 parent c1beb94 commit 507209c

File tree

2 files changed

+42
-40
lines changed

2 files changed

+42
-40
lines changed

flake.lock

Lines changed: 36 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ext/haskell-language-server-project.nix

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ let
1919
sha256 = "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=";
2020
cabalProjectLocal = "constraints: stylish-haskell ^>= 0.14, hlint ^>= 3.8";
2121
configureArgs = "--disable-benchmarks";
22-
} else if lib.hasInfix "ghc98" ghc then {
22+
}
23+
# TODO replace with ghc98 when HLS supports ghc983
24+
else if lib.hasInfix "ghc982" ghc then {
2325
rev = "2.8.0.0";
2426
sha256 = "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=";
2527
cabalProjectLocal = "constraints: stylish-haskell ^>= 0.14, hlint ^>= 3.8";
@@ -32,9 +34,9 @@ let
3234
hls-fallback = repoRoot.src.ext.haskell-language-server-project "ghc98";
3335
} else
3436
lib.trace ''
35-
Unsupported GHC version ${ghc}, defaulting to ghc98 and haskell-language-server v2.8.0.0
37+
Unsupported GHC version ${ghc}, defaulting to ghc982 and haskell-language-server v2.8.0.0
3638
'' {
37-
ghc = "ghc98";
39+
ghc = "ghc982";
3840
rev = "2.8.0.0";
3941
sha256 = "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=";
4042
cabalProjectLocal =
@@ -64,7 +66,7 @@ let
6466
inherit (config) rev sha256;
6567
};
6668

67-
compiler-nix-name = ghc;
69+
compiler-nix-name = config.ghc or ghc;
6870

6971
sha256map = {
7072
"https://github.com/pepeiborra/ekg-json"."7a0af7a8fd38045fd15fb13445bdcc7085325460" =

0 commit comments

Comments
 (0)