|
114 | 114 | github = overrideCabal hsuper.github (drv: { patches = []; });
|
115 | 115 | # GHCIDE requires hie-bios ^>=0.9.1
|
116 | 116 | hie-bios = hself.callCabal2nix "hie-bios" inputs.hie-bios {};
|
117 |
| - # We need an older version |
118 |
| - hiedb = hself.hiedb_0_4_1_0; |
119 | 117 |
|
120 | 118 | lsp = hsuper.callCabal2nix "lsp" inputs.lsp {};
|
121 | 119 | lsp-types = hsuper.callCabal2nix "lsp-types" inputs.lsp-types {};
|
|
207 | 205 | };
|
208 | 206 |
|
209 | 207 | ghc901Config = (import ./configuration-ghc-901.nix) { inherit pkgs; };
|
210 |
| - ghc921Config = (import ./configuration-ghc-921.nix) { inherit pkgs inputs; }; |
| 208 | + ghc922Config = (import ./configuration-ghc-922.nix) { inherit pkgs inputs; }; |
211 | 209 |
|
212 | 210 | # GHC versions
|
213 | 211 | ghcDefault = pkgs.hlsHpkgs ("ghc"
|
|
216 | 214 | ghc884 = pkgs.hlsHpkgs "ghc884";
|
217 | 215 | ghc8107 = pkgs.hlsHpkgs "ghc8107";
|
218 | 216 | ghc901 = ghc901Config.tweakHpkgs (pkgs.hlsHpkgs "ghc901");
|
219 |
| - ghc921 = ghc921Config.tweakHpkgs (pkgs.hlsHpkgs "ghc921"); |
| 217 | + ghc922 = ghc922Config.tweakHpkgs (pkgs.hlsHpkgs "ghc922"); |
220 | 218 |
|
221 | 219 | # For markdown support
|
222 | 220 | myst-parser = pkgs.python3Packages.callPackage ./myst-parser.nix {};
|
|
337 | 335 | haskell-language-server-884-dev = mkDevShell ghc884 "cabal.project";
|
338 | 336 | haskell-language-server-8107-dev = mkDevShell ghc8107 "cabal.project";
|
339 | 337 | haskell-language-server-901-dev = mkDevShell ghc901 "cabal-ghc90.project";
|
340 |
| - haskell-language-server-921-dev = mkDevShell ghc921 "cabal-ghc92.project"; |
| 338 | + haskell-language-server-922-dev = mkDevShell ghc922 "cabal-ghc92.project"; |
341 | 339 | };
|
342 | 340 |
|
343 | 341 | # Developement shell, haskell packages are also provided by nix
|
|
346 | 344 | haskell-language-server-884-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project";
|
347 | 345 | haskell-language-server-8107-dev-nix = mkDevShellWithNixDeps ghc8107 "cabal.project";
|
348 | 346 | haskell-language-server-901-dev-nix = mkDevShellWithNixDeps ghc901 "cabal-ghc90.project";
|
349 |
| - haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc92.project"; |
| 347 | + haskell-language-server-922-dev-nix = mkDevShellWithNixDeps ghc922 "cabal-ghc92.project"; |
350 | 348 | };
|
351 | 349 |
|
352 | 350 | allPackages = {
|
353 | 351 | haskell-language-server = mkExe ghcDefault;
|
354 | 352 | haskell-language-server-884 = mkExe ghc884;
|
355 | 353 | haskell-language-server-8107 = mkExe ghc8107;
|
356 | 354 | haskell-language-server-901 = mkExe ghc901;
|
357 |
| - haskell-language-server-921 = mkExe ghc921; |
| 355 | + haskell-language-server-922 = mkExe ghc922; |
358 | 356 | };
|
359 | 357 |
|
360 | 358 | devShells = simpleDevShells // nixDevShells;
|
|
0 commit comments