Skip to content

Commit acae68c

Browse files
committed
nix flake update & bump ghc921 -> ghc922
ghc921 is no longer available on Nix, see: NixOS/nixpkgs#163426
1 parent 4baacdc commit acae68c

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

configuration-ghc-921.nix renamed to configuration-ghc-922.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ let
2626

2727
# Hlint is still broken
2828
hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint {});
29-
hiedb = hself.hiedb_0_4_1_0;
3029

3130
# Re-generate HLS drv excluding some plugins
3231
haskell-language-server =

flake.nix

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@
114114
github = overrideCabal hsuper.github (drv: { patches = []; });
115115
# GHCIDE requires hie-bios ^>=0.9.1
116116
hie-bios = hself.callCabal2nix "hie-bios" inputs.hie-bios {};
117-
# We need an older version
118-
hiedb = hself.hiedb_0_4_1_0;
119117

120118
lsp = hsuper.callCabal2nix "lsp" inputs.lsp {};
121119
lsp-types = hsuper.callCabal2nix "lsp-types" inputs.lsp-types {};
@@ -207,7 +205,7 @@
207205
};
208206

209207
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; };
211209

212210
# GHC versions
213211
ghcDefault = pkgs.hlsHpkgs ("ghc"
@@ -216,7 +214,7 @@
216214
ghc884 = pkgs.hlsHpkgs "ghc884";
217215
ghc8107 = pkgs.hlsHpkgs "ghc8107";
218216
ghc901 = ghc901Config.tweakHpkgs (pkgs.hlsHpkgs "ghc901");
219-
ghc921 = ghc921Config.tweakHpkgs (pkgs.hlsHpkgs "ghc921");
217+
ghc922 = ghc922Config.tweakHpkgs (pkgs.hlsHpkgs "ghc922");
220218

221219
# For markdown support
222220
myst-parser = pkgs.python3Packages.callPackage ./myst-parser.nix {};
@@ -337,7 +335,7 @@
337335
haskell-language-server-884-dev = mkDevShell ghc884 "cabal.project";
338336
haskell-language-server-8107-dev = mkDevShell ghc8107 "cabal.project";
339337
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";
341339
};
342340

343341
# Developement shell, haskell packages are also provided by nix
@@ -346,15 +344,15 @@
346344
haskell-language-server-884-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project";
347345
haskell-language-server-8107-dev-nix = mkDevShellWithNixDeps ghc8107 "cabal.project";
348346
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";
350348
};
351349

352350
allPackages = {
353351
haskell-language-server = mkExe ghcDefault;
354352
haskell-language-server-884 = mkExe ghc884;
355353
haskell-language-server-8107 = mkExe ghc8107;
356354
haskell-language-server-901 = mkExe ghc901;
357-
haskell-language-server-921 = mkExe ghc921;
355+
haskell-language-server-922 = mkExe ghc922;
358356
};
359357

360358
devShells = simpleDevShells // nixDevShells;

0 commit comments

Comments
 (0)