From 3a64d087f2dd311dab3291083f343e1e436bdd59 Mon Sep 17 00:00:00 2001 From: sterni Date: Fri, 26 Mar 2021 02:49:23 +0100 Subject: chore(3p): use haskell-language-server from nixpkgs Upstream haskellPackages has a newer haskell-language-server than we had and it is always in sync with the default GHC version of that package set which we incidentally use to build all haskell derivations in depot. I hope this will not cause us more trouble in the future, but I've gotten the impression that maralorn makes an effort to prevent haskell-language-server from being broken in haskellPackages, so ideally we'll never have to worry about hls again. If we do have to, we may need to switch to easy-hls-nix. Note that I haven't had the time yet to verify that the shells actually work since it's kinda late now and the rebuilds are many. Change-Id: I74c192d57355904cfa45bb76d70346792ba05af5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2662 Tested-by: BuildkiteCI Reviewed-by: glittershark --- users/glittershark/owothia/shell.nix | 3 +-- users/glittershark/xanthous/shell.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'users') diff --git a/users/glittershark/owothia/shell.nix b/users/glittershark/owothia/shell.nix index 4a89fa0a5d..1ad70c907b 100644 --- a/users/glittershark/owothia/shell.nix +++ b/users/glittershark/owothia/shell.nix @@ -17,7 +17,6 @@ in buildInputs = with haskellPackages; [ cabal-install hlint - # TODO(sterni): versions out of sync - # pkgs.haskell-language-server.ghc884 + haskell-language-server ]; } diff --git a/users/glittershark/xanthous/shell.nix b/users/glittershark/xanthous/shell.nix index e7eb847bd0..29a4952106 100644 --- a/users/glittershark/xanthous/shell.nix +++ b/users/glittershark/xanthous/shell.nix @@ -11,6 +11,6 @@ ghc-prof-flamegraph hp2pretty hlint - pkgs.haskell-language-server.ghc884 + haskell-language-server ]; } -- cgit 1.4.1