Skip to content

Commit 35b427b

Browse files
authored
Merge pull request IntersectMBO#5521 from input-output-hk/hkm/set-default-to-ghc8107
Use GHC 8.10.7 by default
2 parents e8cc459 + d6927bd commit 35b427b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

nix/haskell.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ let
2020
{
2121
src = ../.;
2222
name = "cardano-node";
23-
compiler-nix-name = lib.mkDefault "ghc963";
23+
compiler-nix-name = lib.mkDefault "ghc8107";
2424
# extra-compilers
25-
flake.variants = lib.genAttrs ["ghc928" "ghc8107"] (x: {compiler-nix-name = x;});
25+
flake.variants = lib.genAttrs ["ghc928" "ghc963"] (x: {compiler-nix-name = x;});
2626
cabalProjectLocal = ''
2727
repository cardano-haskell-packages-local
2828
url: file:${CHaP}

nix/pkgs.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ in with final;
8383
};
8484

8585
haskell-language-server = haskell-nix.tool compiler-nix-name "haskell-language-server" rec {
86-
src = haskell-nix.sources."hls-2.3";
86+
src = {
87+
ghc8107 = haskell-nix.sources."hls-2.2";
88+
}.${compiler-nix-name} or haskell-nix.sources."hls-2.3";
8789
cabalProject = builtins.readFile (src + "/cabal.project");
8890
sha256map."https://github.com/pepeiborra/ekg-json"."7a0af7a8fd38045fd15fb13445bdcc7085325460" = "sha256-fVwKxGgM0S4Kv/4egVAAiAjV7QB5PBqMVMCfsv7otIQ=";
8991
};

0 commit comments

Comments
 (0)