Skip to content

Commit d4ab645

Browse files
committed
Fix GHC 9.0 Nix config for fourmolu plugin
1 parent e5357f8 commit d4ab645

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

Diff for: configuration-ghc-901.nix

+2-10
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,19 @@ let
66
"hls-tactics-plugin"
77
"hls-brittany-plugin"
88
"hls-stylish-haskell-plugin"
9-
"hls-fourmolu-plugin"
109
];
1110

1211
hpkgsOverride = hself: hsuper:
1312
with pkgs.haskell.lib;
1413
{
15-
16-
# Released on hackage, but not in nixpkgs yet
17-
primitive-extras = hself.callCabal2nix "primitive-extras" (pkgs.fetchFromGitHub {
18-
owner = "metrix-ai";
19-
repo = "primitive-extras";
20-
rev = "c758d7366b99d85889cb13425fc0140879f8b936";
21-
sha256 = "sha256-vTT7svbM7IkhyxYx2xQ8p1ptoYe+ndcMN5+j9qx++7E=";
22-
}) { };
14+
fourmolu = hself.fourmolu_0_4_0_0;
15+
primitive-extras = hself.primitive-extras_0_10_1_2;
2316

2417
# Re-generate HLS drv excluding some plugins
2518
haskell-language-server =
2619
hself.callCabal2nixWithOptions "haskell-language-server" ./.
2720
(pkgs.lib.concatStringsSep " " [
2821
"-f-brittany"
29-
"-f-fourmolu"
3022
"-f-stylishhaskell"
3123
"-f-tactic"
3224
]) { };

Diff for: flake.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)