Bump haskellNix and hackage and use hls from hackage

flake.nix

@@ -143,14 +143,11 @@
     };
     customConfig.url = "github:input-output-hk/empty-flake";
     cardano-node-runtime.url = "github:IntersectMBO/cardano-node?ref=8.9.2";
-    hls = {
-      url = "github:cardano-scaling/haskell-language-server?ref=2.6-patched";
-      flake = false;
-    };
+
   };
 
   outputs = { self, nixpkgs, nixpkgs-unstable, hostNixpkgs, flake-utils,
-              haskellNix, iohkNix, CHaP, customConfig, cardano-node-runtime, hls,
+              haskellNix, iohkNix, CHaP, customConfig, cardano-node-runtime,
               ... }:
     let
       # Import libraries
@@ -212,7 +209,6 @@
           nodeProject = cardano-node-runtime.project.${system};
 
           walletProject = (import ./nix/haskell.nix
-              hls
               CHaP
               pkgs.haskell-nix
               nixpkgs-unstable.legacyPackages.${system}

nix/haskell.nix

@@ -1,7 +1,7 @@
 ############################################################################
 # Builds Haskell packages with Haskell.nix
 ############################################################################
-hls: CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
+CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
   ({ lib, pkgs, buildProject, ... }: {
     options = {
       gitrev = lib.mkOption {
@@ -96,7 +96,7 @@ hls: CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
         filter = lib.cleanSourceFilter;
       };
 
-      indexState = "2024-03-15T17:07:52Z";
+      indexState = "2024-05-15T17:07:52Z";
 
       localClusterConfigs = config.src + /lib/local-cluster/test/data/cluster-configs;
 
@@ -116,10 +116,10 @@ hls: CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
         tools = {
           cabal = { index-state = indexState; };
           cabal-fmt = { index-state = indexState; };
-          # haskell-language-server = {
-          #   index-state = indexState;
-          #   version = "latest";
-          # };
+          haskell-language-server = {
+            index-state = indexState;
+            version = "latest";
+          };
           hoogle = {
             index-state = indexState;
             version = "5.0.18.3";
@@ -151,10 +151,6 @@ hls: CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
           haskellPackages.weeder
           haskellPackages.stylish-haskell
 
-          (haskell-nix.tool "ghc964" "haskell-language-server" ({pkgs, ...}: rec {
-            # Use the github source of HLS that is tested with haskell.nix CI
-            src = hls;
-            }))
         ]);
         shellHook = "export LOCAL_CLUSTER_CONFIGS=${localClusterConfigs}";
       };