From 849fed9f963638871ba3d548480a5e93d77f7449 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 4 Oct 2021 21:31:30 +0200 Subject: [PATCH] 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. --- .../tools/haskell/haskell-language-server/withWrapper.nix | 2 +- pkgs/top-level/release-haskell.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 729edf44a4f..23bd3dd3267 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -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 diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 9a57989430e..48128489bbd 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -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