Update to GHC 9.6.4 and HLS 2.6.0.0.

.gitignore

@@ -28,7 +28,6 @@ cabal*.project.local*
 
 ### Local configs ###
 .ghci
-hie.yaml
 
 ### Nix ###
 /result*

cabal.project

@@ -178,7 +178,7 @@ allow-newer:
   , servant-openapi3:*
 
 constraints:
-    base == 4.18.1.0
+    base == 4.18.2.0
   , bimap >= 0.4.0
   , openapi3 >= 3.2.0
   , libsystemd-journal >= 1.4.4

flake.nix

@@ -143,10 +143,14 @@
     };
     customConfig.url = "github:input-output-hk/empty-flake";
     cardano-node-runtime.url = "github:IntersectMBO/cardano-node?ref=8.7.3";
+    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,
+              haskellNix, iohkNix, CHaP, customConfig, cardano-node-runtime, hls,
               ... }:
     let
       # Import libraries
@@ -208,6 +212,7 @@
           nodeProject = cardano-node-runtime.project.${system};
 
           walletProject = (import ./nix/haskell.nix
+              hls
               CHaP
               pkgs.haskell-nix
               nixpkgs-unstable.legacyPackages.${system}

hie.yaml

@@ -0,0 +1,235 @@
+cradle:
+  cabal:
+    - path: "lib/address-derivation-discovery/lib"
+      component: "lib:address-derivation-discovery"
+
+    - path: "lib/application-extras/lib"
+      component: "lib:cardano-wallet-application-extras"
+
+    - path: "lib/balance-tx/lib/main"
+      component: "lib:cardano-balance-tx"
+
+    - path: "lib/balance-tx/lib/internal"
+      component: "cardano-balance-tx:lib:internal"
+
+    - path: "lib/balance-tx/test/spec"
+      component: "cardano-balance-tx:test:test"
+
+    - path: "lib/balance-tx/test/data"
+      component: "cardano-balance-tx:test:test"
+
+    - path: "lib/cardano-api-extra/lib"
+      component: "lib:cardano-api-extra"
+
+    - path: "lib/coin-selection/lib"
+      component: "lib:cardano-coin-selection"
+
+    - path: "lib/coin-selection/test/spec"
+      component: "cardano-coin-selection:test:test"
+
+    - path: "lib/coin-selection/bench"
+      component: "cardano-coin-selection:bench:utxo-index"
+
+    - path: "lib/crypto-hash-extra/src"
+      component: "lib:crypto-hash-extra"
+
+    - path: "lib/customer-deposit-wallet/src"
+      component: "lib:customer-deposit-wallet"
+
+    - path: "lib/customer-deposit-wallet/test/unit"
+      component: "customer-deposit-wallet:test:unit"
+
+    - path: "lib/customer-deposit-wallet/api/http"
+      component: "customer-deposit-wallet:lib:customer-deposit-wallet-http"
+
+    - path: "lib/customer-deposit-wallet/exe"
+      component: "customer-deposit-wallet:exe:customer-deposit-wallet"
+
+    - path: "lib/delta-store/src"
+      component: "lib:delta-store"
+
+    - path: "lib/delta-store/test/unit"
+      component: "delta-store:test:unit"
+
+    - path: "lib/delta-table/src"
+      component: "lib:delta-table"
+
+    - path: "lib/delta-table/test/unit"
+      component: "delta-table:test:unit"
+
+    - path: "lib/delta-types/src"
+      component: "lib:delta-types"
+
+    - path: "lib/delta-types/test/unit"
+      component: "delta-types:test:unit"
+
+    - path: "lib/faucet/lib"
+      component: "lib:faucet"
+
+    - path: "lib/faucet/exe/Faucet.hs"
+      component: "faucet:exe:faucet"
+
+    - path: "lib/iohk-monitoring-extra/src"
+      component: "lib:iohk-monitoring-extra"
+
+    - path: "lib/launcher/src"
+      component: "lib:cardano-wallet-launcher"
+
+    - path: "lib/launcher/test/unit"
+      component: "cardano-wallet-launcher:test:unit"
+
+    - path: "lib/local-cluster/lib"
+      component: "lib:local-cluster"
+
+    - path: "lib/local-cluster/exe/Cluster.hs"
+      component: "local-cluster:exe:local-cluster"
+
+    - path: "lib/network-layer/src"
+      component: "lib:cardano-wallet-network-layer"
+
+    - path: "lib/numeric/src"
+      component: "lib:cardano-numeric"
+
+    - path: "lib/numeric/test/unit"
+      component: "cardano-numeric:test:unit"
+
+    - path: "lib/primitive/lib"
+      component: "lib:cardano-wallet-primitive"
+
+    - path: "lib/primitive/test/data"
+      component: "cardano-wallet-primitive:test:test"
+
+    - path: "lib/primitive/test/spec"
+      component: "cardano-wallet-primitive:test:test"
+
+    - path: "lib/read/lib"
+      component: "lib:cardano-wallet-read"
+
+    - path: "lib/read/test"
+      component: "cardano-wallet-read:test:test"
+
+    - path: "lib/std-gen-seed/src"
+      component: "lib:std-gen-seed"
+
+    - path: "lib/std-gen-seed/test/unit"
+      component: "std-gen-seed:test:unit"
+
+    - path: "lib/temporary-extra/src"
+      component: "lib:temporary-extra"
+
+    - path: "lib/test-utils/src"
+      component: "lib:cardano-wallet-test-utils"
+
+    - path: "lib/test-utils/test"
+      component: "cardano-wallet-test-utils:test:unit"
+
+    - path: "lib/text-class/src"
+      component: "lib:text-class"
+
+    - path: "lib/text-class/test/unit"
+      component: "text-class:test:unit"
+
+    - path: "lib/wai-middleware-logging/src"
+      component: "lib:wai-middleware-logging"
+
+    - path: "lib/wai-middleware-logging/test"
+      component: "wai-middleware-logging:test:unit"
+
+    - path: "lib/wallet/src"
+      component: "lib:cardano-wallet"
+
+    - path: "lib/wallet/api/http"
+      component: "cardano-wallet:lib:cardano-wallet-api-http"
+
+    - path: "lib/wallet/integration/src"
+      component: "cardano-wallet:lib:cardano-wallet-integration"
+
+    - path: "lib/wallet/bench/src"
+      component: "cardano-wallet:lib:cardano-wallet-bench"
+
+    - path: "lib/wallet/mock-token-metadata/src"
+      component: "cardano-wallet:lib:mock-token-metadata"
+
+    - path: "lib/wallet/exe/cardano-wallet.hs"
+      component: "cardano-wallet:exe:cardano-wallet"
+
+    - path: "lib/wallet/./exe/mock-token-metadata-server.hs"
+      component: "cardano-wallet:exe:mock-token-metadata-server"
+
+    - path: "lib/wallet/test-common"
+      component: "cardano-wallet:test:unit"
+
+    - path: "lib/wallet/test/unit"
+      component: "cardano-wallet:test:unit"
+
+    - path: "lib/wallet/test/data"
+      component: "cardano-wallet:test:unit"
+
+    - path: "lib/wallet/./integration-tests.hs"
+      component: "cardano-wallet:exe:integration-exe"
+
+    - path: "lib/wallet/./"
+      component: "cardano-wallet:test:integration"
+
+    - path: "lib/wallet/bench/restore-bench.hs"
+      component: "cardano-wallet:bench:restore"
+
+    - path: "lib/wallet/bench/latency-bench.hs"
+      component: "cardano-wallet:bench:latency"
+
+    - path: "lib/wallet/bench/src/latency-bench.hs"
+      component: "cardano-wallet:bench:latency"
+
+    - path: "lib/wallet/test/integration/latency-bench.hs"
+      component: "cardano-wallet:bench:latency"
+
+    - path: "lib/wallet/bench/Cardano/Wallet/LatencyBenchShared.hs"
+      component: "cardano-wallet:bench:latency"
+
+    - path: "lib/wallet/bench/src/Cardano/Wallet/LatencyBenchShared.hs"
+      component: "cardano-wallet:bench:latency"
+
+    - path: "lib/wallet/test/integration/Cardano/Wallet/LatencyBenchShared.hs"
+      component: "cardano-wallet:bench:latency"
+
+    - path: "lib/wallet/bench/db-bench.hs"
+      component: "cardano-wallet:bench:db"
+
+    - path: "lib/wallet/test-common/db-bench.hs"
+      component: "cardano-wallet:bench:db"
+
+    - path: "lib/wallet/bench/Cardano/Wallet/DummyTarget/Primitive/Types.hs"
+      component: "cardano-wallet:bench:db"
+
+    - path: "lib/wallet/test-common/Cardano/Wallet/DummyTarget/Primitive/Types.hs"
+      component: "cardano-wallet:bench:db"
+
+    - path: "lib/wallet/bench/api-bench.hs"
+      component: "cardano-wallet:bench:api"
+
+    - path: "lib/wallet/test-common/api-bench.hs"
+      component: "cardano-wallet:bench:api"
+
+    - path: "lib/wallet/bench/Cardano/Wallet/DummyTarget/Primitive/Types.hs"
+      component: "cardano-wallet:bench:api"
+
+    - path: "lib/wallet/test-common/Cardano/Wallet/DummyTarget/Primitive/Types.hs"
+      component: "cardano-wallet:bench:api"
+
+    - path: "lib/wallet/bench/EraFun.hs"
+      component: "cardano-wallet:bench:erafun-benchmark"
+
+    - path: "lib/wallet-benchmarks/bench/memory-benchmark.hs"
+      component: "cardano-wallet-benchmarks:bench:memory"
+
+    - path: "lib/wallet-benchmarks/bench/Paths_cardano_wallet_benchmarks.hs"
+      component: "cardano-wallet-benchmarks:bench:memory"
+
+    - path: "lib/wallet-e2e/src"
+      component: "lib:cardano-wallet-e2e"
+
+    - path: "lib/wallet-e2e/exe/Main.hs"
+      component: "cardano-wallet-e2e:exe:wallet-e2e"
+
+    - path: "lib/wallet-e2e/exe/Options.hs"
+      component: "cardano-wallet-e2e:exe:wallet-e2e"

nix/haskell.nix

@@ -1,7 +1,7 @@
 ############################################################################
 # Builds Haskell packages with Haskell.nix
 ############################################################################
-CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
+hls: CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
   ({ lib, pkgs, buildProject, ... }: {
     options = {
       gitrev = lib.mkOption {
@@ -23,6 +23,7 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
         description = ''If false, prevent check results from being cached on `nix build`'';
         default = true;
       };
+
     };
   })
   ({ pkgs
@@ -98,9 +99,10 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
       indexState = "2024-01-12T11:04:55Z";
 
       localClusterConfigs = config.src + /lib/local-cluster/test/data/cluster-configs;
+
     in {
       name = "cardano-wallet";
-      compiler-nix-name = "ghc963";
+      compiler-nix-name = "ghc964";
 
       src = haskellLib.cleanSourceWith {
         name = "cardano-wallet-src";
@@ -149,9 +151,9 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
           haskellPackages.weeder
           haskellPackages.stylish-haskell
 
-          (haskell-nix.tool "ghc963" "haskell-language-server" ({pkgs, ...}: rec {
+          (haskell-nix.tool "ghc964" "haskell-language-server" ({pkgs, ...}: rec {
             # Use the github source of HLS that is tested with haskell.nix CI
-            src = pkgs.haskell-nix.sources."hls-2.5";
+            src = hls;
             }))
         ]);
         shellHook = "export LOCAL_CLUSTER_CONFIGS=${localClusterConfigs}";

nix/project-package-list.nix

@@ -1 +1 @@
-[ "cardano-balance-tx" "cardano-coin-selection" "cardano-numeric" "cardano-wallet" "cardano-wallet-benchmarks" "cardano-wallet-launcher" "cardano-wallet-primitive" "cardano-wallet-test-utils" "delta-store" "delta-table" "delta-types" "local-cluster" "text-class" "wai-middleware-logging" ]
+[ "address-derivation-discovery" "cardano-api-extra" "cardano-balance-tx" "cardano-coin-selection" "cardano-numeric" "cardano-wallet" "cardano-wallet-benchmarks" "cardano-wallet-launcher" "cardano-wallet-network-layer" "cardano-wallet-primitive" "cardano-wallet-read" "cardano-wallet-test-utils" "customer-deposit-wallet" "delta-store" "delta-table" "delta-types" "faucet" "local-cluster" "text-class" "wai-middleware-logging" ]