ghc: 9.6.7, hls: 2.11.0.0 (#2062)

Update haskell.nix and CHaP. The arguments to shellFor have changed.

Update ghc to 9.6.7.

Update hls to 2.11.0.0.

Author: noonio

cabal.project

@@ -12,8 +12,8 @@ repository cardano-haskell-packages
 
 -- See CONTRIBUTING.md for information about when and how to update these.
 index-state:
-  , hackage.haskell.org 2025-05-27T12:29:12Z
-  , cardano-haskell-packages 2025-05-28T12:02:33Z
+  , hackage.haskell.org 2025-06-11T21:55:55Z
+  , cardano-haskell-packages 2025-06-12T11:07:25Z
 
 packages: **/*.cabal
 

flake.lock

@@ -38,7 +38,7 @@
       ];
       perSystem = { config, lib, system, ... }:
         let
-          compiler = "ghc966";
+          compiler = "ghc967";
 
           # nixpkgs enhanced with haskell.nix and crypto libs as used by iohk
 
@@ -63,10 +63,10 @@
                 inherit (inputs.aiken.packages.${system}) aiken;
                 apply-refact = final.haskell-nix.tool compiler "apply-refact" "0.15.0.0";
                 cabal-install = final.haskell-nix.tool compiler "cabal-install" "3.10.3.0";
-                cabal-plan = final.haskell-nix.tool compiler "cabal-plan" "0.7.5.0";
+                cabal-plan = final.haskell-nix.tool compiler "cabal-plan" { version = "0.7.5.0"; cabalProjectLocal = "package cabal-plan\nflags: +exe"; };
                 cabal-fmt = config.treefmt.programs.cabal-fmt.package;
                 fourmolu = config.treefmt.programs.fourmolu.package;
-                haskell-language-server = final.haskell-nix.tool compiler "haskell-language-server" "2.9.0.0";
+                haskell-language-server = final.haskell-nix.tool compiler "haskell-language-server" "2.11.0.0";
                 weeder = final.haskell-nix.tool compiler "weeder" "2.9.0";
                 inherit (inputs.cardano-node.packages.${system}) cardano-cli;
                 inherit (inputs.cardano-node.packages.${system}) cardano-node;

flake.nix

@@ -67,20 +67,12 @@ let
     pkgs.systemd
   ];
 
-  haskellNixShell = hsPkgs.shellFor {
+  haskellNixShell = (hsPkgs.shellFor {
     buildInputs = libs ++ buildInputs;
 
     withHoogle = true;
 
     # Always create missing golden files
-    CREATE_MISSING_GOLDEN = 1;
-
-    # Force a UTF-8 locale because many Haskell programs and tests
-    # assume this.
-    LANG = "en_US.UTF-8";
-
-    GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-
     shellHook = ''
       if ! which cardano-node > /dev/null 2>&1; then
         echo "WARNING: 'cardano-node' not found"
@@ -89,6 +81,16 @@ let
         echo "WARNING: 'cardano-cli' not found"
       fi
     '';
+  }).overrideAttrs {
+
+    CREATE_MISSING_GOLDEN = 1;
+
+    # Force a UTF-8 locale because many Haskell programs and tests
+    # assume this.
+    LANG = "en_US.UTF-8";
+
+    GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+
   };
 
   # A "cabal-only" shell which does not use haskell.nix