Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 2 insertions, 4 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix b/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix
index 52a2737ebb74..30f00cc6ea2c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -7,9 +7,6 @@
 # files.
 self: super: {
 
-  multi-ghc-travis = throw ("haskellPackages.multi-ghc-travis has been renamed"
-    + " to haskell-ci, which is now on hackage");
-
   dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { };
 
   # https://github.com/channable/vaultenv/issues/1
@@ -22,8 +19,9 @@ self: super: {
   # HLS and its fork of ghcide that it uses
   # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh
   haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { };
-  hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { };
   hls-brittany = self.callPackage ../tools/haskell/haskell-language-server/hls-brittany.nix { };
+  hls-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-plugin.nix { };
+  hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { };
 
   nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };