haskell-language-server: remove ghc8107 from the wrapper

GHC 8.10.7 is only in 21.05 for bootstrapping GHCJS, so it shouldn't be
included in the hls wrapper. This change was a result of an overeager
backport and we'll revert it here.

Also rollback some unnecessary change to release-haskell.nix, so it can
be used for testing evaluation still.
This commit is contained in:
sternenseemann 2021-10-04 21:31:30 +02:00
parent 6314733b4e
commit 849fed9f96
2 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
{ lib, supportedGhcVersions ? [ "884" "8104" "8107" ], stdenv, haskellPackages
{ lib, supportedGhcVersions ? [ "884" "8104" ], stdenv, haskellPackages
, haskell }:
#
# The recommended way to override this package is

View File

@ -207,7 +207,7 @@ let
# package sets (like Cabal, jailbreak-cabal) are
# working as expected.
cabal-install = all;
Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8104 ghc8107 ];
Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ghc8107 ];
funcmp = all;
# Doesn't currently work on ghc-9.0:
# https://github.com/haskell/haskell-language-server/issues/297