Skip to content

Commit 7fba6e2

Browse files
committed
hlint and fourmolu for GHC 9.2!
1 parent 5755ed9 commit 7fba6e2

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

configuration-ghc-90.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ let
3939
{ };
4040

4141
retrie = hself.retrie_1_1_0_0;
42+
fourmolu = hself.fourmolu_0_8_2_0;
4243

4344
});
4445
in {

configuration-ghc-92.nix

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
let
44
disabledPlugins = [
5-
"hls-hlint-plugin"
65
# That one is not technically a plugin, but by putting it in this list, we
76
# get it removed from the top level list of requirement and it is not pull
87
# in the nix shell.
@@ -26,8 +25,7 @@ let
2625

2726
ghc-exactprint =
2827
hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-150 { };
29-
# Hlint is still broken
30-
hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint { });
28+
hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-341 {}) "-fghc-lib";
3129

3230
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
3331

@@ -38,7 +36,7 @@ let
3836

3937
#
4038
retrie = hself.retrieHEAD;
41-
apply-refact = hself.apply-refactHEAD;
39+
fourmolu = hself.fourmolu_0_8_2_0;
4240

4341
});
4442
in {

configuration-ghc-94.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ let
2525

2626
ghc-exactprint =
2727
hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-160 { };
28-
# Hlint is still broken
2928
hlint = hsuper.callCabal2nix "hlint" inputs.hlint-35 {};
3029

3130
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
@@ -51,6 +50,7 @@ let
5150
#
5251
retrie = hself.retrieHEAD;
5352
apply-refact = hself.apply-refactHEAD;
53+
fourmolu = hself.fourmoluHEAD;
5454

5555
});
5656
in {

flake.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
url = "https://hackage.haskell.org/package/hlint-3.3.6/hlint-3.3.6.tar.gz";
8080
flake = false;
8181
};
82-
hlint-34 = {
83-
url = "https://hackage.haskell.org/package/hlint-3.4/hlint-3.4.tar.gz";
82+
hlint-341 = {
83+
url = "https://hackage.haskell.org/package/hlint-3.4.1/hlint-3.4.1.tar.gz";
8484
flake = false;
8585
};
8686
hlint-35 = {
@@ -199,7 +199,7 @@
199199
else hsuper.ormolu;
200200

201201
# Fourmolu needs a handful of patches to build on GHC 9.4.
202-
fourmolu =
202+
fourmoluHEAD =
203203
appendPatches
204204
(doJailbreak (if final.system == "aarch64-darwin"
205205
then overrideCabal hsuper.fourmolu_0_8_2_0 (_: { enableSeparateBinOutput = false; })

0 commit comments

Comments
 (0)