Skip to content

Commit f4f8185

Browse files
committed
ghc884: fixup ormolu/fourmolu
1 parent e89de86 commit f4f8185

File tree

3 files changed

+28
-5
lines changed

3 files changed

+28
-5
lines changed

configuration-ghc-88.nix

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ let
2121
ghc-lib = hself.ghc-lib_8_10_7_20220219;
2222
ghc-lib-parser = hself.ghc-lib-parser_8_10_7_20220219;
2323

24+
fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu-0300 { };
25+
2426
stylish-haskell = hself.callCabal2nixWithOptions "stylish-haskell"
2527
inputs.stylish-haskell-01220 (pkgs.lib.concatStringsSep " " [ ]) { };
2628

@@ -30,15 +32,19 @@ let
3032
brittany = hself.callCabal2nixWithOptions "brittany" inputs.brittany-01312
3133
(pkgs.lib.concatStringsSep " " [ ]) { };
3234

33-
hls-stylish-haskell-plugin =
34-
hself.callCabal2nixWithOptions "hls-stylish-haskell-plugin"
35-
./plugins/hls-stylish-haskell-plugin (pkgs.lib.concatStringsSep " " [ ])
36-
{ };
35+
hls-hlint-plugin = hself.callCabal2nixWithOptions "hls-hlint-plugin"
36+
./plugins/hls-hlint-plugin
37+
(pkgs.lib.concatStringsSep " " [ "-f-hlint34" "-fhyphenation" ]) { };
3738

3839
# Re-generate HLS drv excluding some plugins
3940
haskell-language-server =
4041
hself.callCabal2nixWithOptions "haskell-language-server" ./.
41-
(pkgs.lib.concatStringsSep " " [ ]) { };
42+
(pkgs.lib.concatStringsSep " " [
43+
"-fpedantic"
44+
"-f-hlint"
45+
"-f-fourmolu"
46+
"-f-ormolu"
47+
]) { };
4248

4349
# YOLO
4450
mkDerivation = args:

flake.lock

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

flake.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
url = "https://hackage.haskell.org/package/fourmolu-0.5.0.1/fourmolu-0.5.0.1.tar.gz";
5656
flake = false;
5757
};
58+
fourmolu-0300 = {
59+
url = "https://hackage.haskell.org/package/fourmolu-0.3.0.0/fourmolu-0.3.0.0.tar.gz";
60+
flake = false;
61+
};
5862
aeson-1520= {
5963
url = "https://hackage.haskell.org/package/aeson-1.5.2.0/aeson-1.5.2.0.tar.gz";
6064
flake = false;

0 commit comments

Comments
 (0)