Update tools in Nix shell

Author: amesgen

cabal.project

@@ -30,6 +30,8 @@ packages:
 tests: true
 benchmarks: true
 
+multi-repl: True
+
 import: ./asserts.cabal
 
 -- We need to disable bitvec's SIMD for now, as it breaks during cross compilation.

flake.lock

@@ -31,6 +31,10 @@
       url = "github:nix-community/flake-compat";
       flake = false;
     };
+    hls = {
+      url = "github:haskell/haskell-language-server/2.9.0.0";
+      flake = false;
+    };
     # for cabal-docspec
     cabal-extras = {
       url = "github:phadej/cabal-extras/cabal-docspec-0.0.0.20240414";

flake.nix

@@ -6,7 +6,6 @@ in
 hsPkgs.shellFor {
   nativeBuildInputs = [
     pkgs.cabal
-    pkgs.cabal-multi-repl
     pkgs.cabal-docspec
     pkgs.fd
     pkgs.nixpkgs-fmt
@@ -24,7 +23,7 @@ hsPkgs.shellFor {
   # version as used in hsPkgs.
   tools = {
     haskell-language-server = {
-      src = inputs.haskellNix.inputs."hls-2.8";
+      src = inputs.hls;
       configureArgs = "--disable-benchmarks --disable-tests";
     };
   };

nix/shell.nix

@@ -2,7 +2,7 @@ inputs: final: prev:
 
 let
   inherit (final) lib;
-  tool-index-state = "2024-05-31T00:00:00Z";
+  tool-index-state = "2024-07-01T00:00:00Z";
   tool = name: version: other:
     final.haskell-nix.tool final.hsPkgs.args.compiler-nix-name name ({
       version = version;
@@ -12,29 +12,7 @@ in
 {
   inherit tool-index-state;
 
-  cabal = tool "cabal" "latest" { };
-
-  cabal-multi-repl = (final.haskell-nix.cabalProject {
-    # cabal master commit containing https://github.com/haskell/cabal/pull/8726
-    src = final.fetchFromGitHub {
-      owner = "haskell";
-      repo = "cabal";
-      rev = "adc283a0f06c7d24aeed67e69aca3d71c04010b3";
-      hash = "sha256-3K9WVR/tINK3PyGlXpypSpp1pguHTnolDruHNE+VvE4=";
-    };
-    index-state = tool-index-state;
-    inherit (final.hsPkgs.args) compiler-nix-name;
-    cabalProject = ''
-      packages: Cabal-syntax Cabal cabal-install-solver cabal-install
-    '';
-    configureArgs = "--disable-benchmarks --disable-tests";
-    modules = [{
-      packages.cabal-install.components.exes.cabal.postInstall = ''
-        mv $out/bin/cabal $out/bin/cabal-multi-repl
-        wrapProgram $out/bin/cabal-multi-repl --add-flags --enable-multi-repl
-      '';
-    }];
-  }).cabal-install.components.exes.cabal;
+  cabal = tool "cabal" "3.12.1.0" { };
 
   cabal-docspec = tool "cabal-docspec" "git" {
     compiler-nix-name = "ghc98";
@@ -55,7 +33,7 @@ in
 
   stylish-haskell = tool "stylish-haskell" "0.14.6.0" { };
 
-  cabal-gild = tool "cabal-gild" "1.3.1.2" { };
+  cabal-gild = tool "cabal-gild" "1.5.0.0" { };
 
   haskellBuildUtils = prev.haskellBuildUtils.override {
     inherit (final.hsPkgs.args) compiler-nix-name;