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>

5 files changed, 13 insertions, 10 deletions

diff --git a/third_party/default.nix b/third_party/default.nix
index 834ae01e58..d64789c06f 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -5,11 +5,11 @@
 { ... }:
 
 let
-  # Tracking nixos-unstable as of 2021-03-18.
-  nixpkgsCommit = "1f77a4c8c74bbe896053994836790aa9bf6dc5ba";
+  # Tracking nixos-unstable as of 2021-03-25.
+  nixpkgsCommit = "60dd94fb7e01a8288f6638eee71d7cb354c49327";
   nixpkgsSrc = fetchTarball {
     url = "https://github.com/NixOS/nixpkgs/archive/${nixpkgsCommit}.tar.gz";
-    sha256 = "1j62nmzz3w33dplzf1xz1pg1pfkxii7lwdqmsxmc71cs9cm3s7n1";
+    sha256 = "0skdwk9bdld295kzrymirs8xrzycqmhsclaz8s18jhcz75hb8sk3";
   };
   nixpkgs = import nixpkgsSrc {
     config.allowUnfree = true;
@@ -21,11 +21,11 @@ let
     ];
   };
 
-  # Tracking nixos-20.09 as of 2021-03-15.
-  stableCommit = "12d9950bf47e0ac20d4d04e189448ee075242117";
+  # Tracking nixos-20.09 as of 2021-03-25.
+  stableCommit = "223d0d733a66b46504ea6b4c15f88b7cc4db58fb";
   stableNixpkgsSrc = fetchTarball {
     url = "https://github.com/NixOS/nixpkgs/archive/${stableCommit}.tar.gz";
-    sha256 = "09wy33zbzxj33296ddrrb79630kxpj1c3kiv38zs4wrw24206c2v";
+    sha256 = "073327ris0frqa3kpid3nsjr9w8yx2z83xpsc24w898mrs9r7d5v";
   };
   stableNixpkgs = import stableNixpkgsSrc {};
 
diff --git a/third_party/haskell-language-server/default.nix b/third_party/haskell-language-server/default.nix
index 82dcbaf82d..aab73ce3ea 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 6688271257..75041aa17c 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;
diff --git a/users/glittershark/owothia/shell.nix b/users/glittershark/owothia/shell.nix
index 9446a353d5..53971c97bd 100644
--- a/users/glittershark/owothia/shell.nix
+++ b/users/glittershark/owothia/shell.nix
@@ -9,6 +9,6 @@ args@{ pkgs ? (import ../../../. {}).third_party, ... }:
   buildInputs = with pkgs.haskellPackages; [
     cabal-install
     hlint
-    pkgs.haskell-language-server.ghc883
+    pkgs.haskell-language-server.ghc884
   ];
 }
diff --git a/users/glittershark/xanthous/shell.nix b/users/glittershark/xanthous/shell.nix
index 9881e6bf04..e7eb847bd0 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.ghc883
+    pkgs.haskell-language-server.ghc884
   ];
 }