about summary refs log tree commit diff
path: root/third_party/haskell-language-server
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2021-03-24T17·34+0100
committersterni <sternenseemann@systemli.org>2021-03-26T01·43+0000
commit3a49e4f4bf23ab2c2bc59a7574cb8dfe2f07067d (patch)
tree93639f23aadd51a99b4803eacf0372df0390fc5c /third_party/haskell-language-server
parentd34c527372e0a6b8dcb0d9796451b987c953a88e (diff)
chore(3p): bump NixOS channels to 2021-03-25 r/2330
OpenSSL released an update which fixes two severity high security
issues:

* https://mta.openssl.org/pipermail/openssl-announce/2021-March/000197.html
* https://mta.openssl.org/pipermail/openssl-announce/2021-March/000198.html

Update to the nixpkgs (currently still master) commits updating OpenSSL.

Other changes:

* Use GHC 8.8.4 for haskell-language-server as GHC 8.8.3 got removed
  from nixpkgs last friday.

Change-Id: Ic1b2f49284e78193a4330da4bb4b718a797f5ab1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2653
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'third_party/haskell-language-server')
-rw-r--r--third_party/haskell-language-server/default.nix5
-rw-r--r--third_party/haskell-language-server/hls.nix2
2 files changed, 5 insertions, 2 deletions
diff --git a/third_party/haskell-language-server/default.nix b/third_party/haskell-language-server/default.nix
index 82dcbaf82dfd..aab73ce3ea3c 100644
--- a/third_party/haskell-language-server/default.nix
+++ b/third_party/haskell-language-server/default.nix
@@ -1,6 +1,9 @@
 { pkgs, ... }:
 
+# TODO(sterni): replace this with upstream haskell-language-server or
+#               switch to easy-hls-nix as glittershark planned
+
 rec {
   hls-nix = { ghc }: import ./hls.nix { inherit pkgs ghc; };
-  ghc883 = hls-nix { ghc = "ghc883"; };
+  ghc884 = hls-nix { ghc = "ghc884"; };
 }
diff --git a/third_party/haskell-language-server/hls.nix b/third_party/haskell-language-server/hls.nix
index 6688271257b9..75041aa17c4a 100644
--- a/third_party/haskell-language-server/hls.nix
+++ b/third_party/haskell-language-server/hls.nix
@@ -1,5 +1,5 @@
 # Pulled from https://github.com/korayal/hls-nix/blob/master/default.nix but
-# with the hashes updated for our nixpkgs pin and ghc 8.8.3
+# with the hashes updated for our nixpkgs pin and ghc 8.8.4
 { pkgs, ghc }:
 let
   hlib = pkgs.haskell.lib;