|
67 | 67 | }) |
68 | 68 |
|
69 | 69 | (final: prev: { |
70 | | - # HLint 3.2.x requires GHC >= 8.10 && < 9.0 |
71 | | - hlint = final.haskell-nix.tool "ghc8107" "hlint" { |
72 | | - version = "3.2.7"; |
| 70 | + hlint = final.haskell-nix.tool "ghc96" "hlint" { |
| 71 | + version = "3.8"; |
73 | 72 | }; |
74 | 73 |
|
75 | | - # Fourmolu 0.10.x requires GHC >= 9.0 && < 9.6 |
76 | | - fourmolu = final.haskell-nix.tool "ghc928" "fourmolu" { |
77 | | - version = "0.10.1.0"; |
| 74 | + fourmolu = final.haskell-nix.tool "ghc96" "fourmolu" { |
| 75 | + version = "0.16.2.0"; |
78 | 76 | }; |
79 | | - |
80 | | - # Weeder 2.2.0 requires GHC >= 8.10 && < 9.0 |
81 | | - weeder = final.haskell-nix.tool "ghc8107" "weeder" { |
82 | | - version = "2.2.0"; |
| 77 | + weeder = final.haskell-nix.tool "ghc96" "weeder" { |
| 78 | + version = "2.9.0"; |
83 | 79 | }; |
84 | 80 | }) |
85 | 81 |
|
|
141 | 137 | project = (nixpkgs.haskell-nix.cabalProject' ({ config, lib, pkgs, ... }: rec { |
142 | 138 | src = ./.; |
143 | 139 | name = "cardano-db-sync"; |
144 | | - compiler-nix-name = |
145 | | - if system == "x86_64-linux" |
146 | | - then lib.mkDefault "ghc810" |
147 | | - else lib.mkDefault "ghc96"; |
| 140 | + compiler-nix-name = lib.mkDefault "ghc96"; |
148 | 141 | flake.variants = |
149 | 142 | let |
150 | 143 | compilers = |
|
168 | 161 | shell.tools = { |
169 | 162 | cabal = "latest"; |
170 | 163 | haskell-language-server = { |
171 | | - src = |
172 | | - if config.compiler-nix-name == "ghc8107" then |
173 | | - nixpkgs.haskell-nix.sources."hls-1.10" |
174 | | - else |
175 | | - nixpkgs.haskell-nix.sources."hls-2.9"; |
| 164 | + src = nixpkgs.haskell-nix.sources."hls-2.9" |
176 | 165 | }; |
177 | 166 | }; |
178 | 167 | # Now we use pkgsBuildBuild, to make sure that even in the cross |
|
181 | 170 | shell.buildInputs = with nixpkgs.pkgsBuildBuild; [ |
182 | 171 | gitAndTools.git |
183 | 172 | hlint |
184 | | - ] ++ lib.optionals (config.compiler-nix-name == "ghc8107") [ |
| 173 | + ] ++ lib.optionals (config.compiler-nix-name == "ghc96") [ |
185 | 174 | # Weeder requires the GHC version to match HIE files |
186 | 175 | weeder |
187 | 176 | ] ++ lib.optionals (system != "aarch64-darwin") [ |
|
0 commit comments