about summary refs log tree commit diff
path: root/users/glittershark/owothia
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2021-03-26T01·49+0100
committersterni <sternenseemann@systemli.org>2021-03-26T10·20+0000
commit3a64d087f2dd311dab3291083f343e1e436bdd59 (patch)
tree00827bc1ce15e230bbb7d8a68bdedfcda1b67397 /users/glittershark/owothia
parentf2963cffcd7ac9401fcc24d97f50b25963bc33bf (diff)
chore(3p): use haskell-language-server from nixpkgs r/2333
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 <grfn@gws.fyi>
Diffstat (limited to 'users/glittershark/owothia')
-rw-r--r--users/glittershark/owothia/shell.nix3
1 files changed, 1 insertions, 2 deletions
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
   ];
 }