Skip to content

Commit 17ccd01

Browse files
committed
Remove stylish-haskell
The plan is to add fourmolu instead. It also causes nix issues
1 parent 2e6e72a commit 17ccd01

File tree

8 files changed

+5
-123
lines changed

8 files changed

+5
-123
lines changed

.stylish-haskell.yaml

Lines changed: 0 additions & 99 deletions
This file was deleted.

default.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ let
4545
inherit (pkgs.cardanoDbSyncProject.projectModule) src;
4646
};
4747

48-
stylish-haskell = callPackage stylishHaskellCheck {
49-
inherit (pkgs.cardanoDbSyncProject.projectModule) src;
50-
};
5148
};
5249

5350
shell = import ./shell.nix {

doc/hlint-stylish-haskell.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Auto-running hlint and stylish-haskell on Commit
1+
# Auto-running hlint on Commit
22

3-
This document describes how to have `hlint` and `stylish-haskell` locally on every commit.
3+
This document describes how to have `hlint` locally on every commit.
44

55
# Installing Them
66

7-
Installing these two is as simple as `cabal install hlint stylish-haskell` which will install them
7+
Installing this is as simple as `cabal install hlint` which will install them
88
in `$HOME/.cabal/bin` which should then be added to your `PATH` environment variable.
99

1010
# Install the Git Pre-commit Hook

flake.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@
8585
hlint = pkgs.callPackage pkgs.hlintCheck {
8686
inherit (pkgs.cardanoDbSyncProject.projectModule) src;
8787
};
88-
stylish-haskell = pkgs.callPackage pkgs.stylishHaskellCheck {
89-
inherit (pkgs.cardanoDbSyncProject.projectModule) src;
90-
};
9188
};
9289

9390
exes = collectExes flake.packages;

nix/pkgs.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ in {
4040
version = "3.2.7";
4141
};
4242

43-
stylish-haskell = haskell-nix.tool compiler "stylish-haskell" {
44-
version = "latest";
45-
modules = [{ reinstallableLibGhc = true; }];
46-
};
4743

4844
# systemd can't be statically linked:
4945
postgresql = (final.postgresql_11

release.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ let
7878
nonDefaultBuildSystems = tail supportedSystems;
7979
# Paths or prefixes of paths of derivations to build only on the default system (ie. linux on hydra):
8080
onlyBuildOnDefaultSystem =
81-
[ [ "checks" "hlint" ] [ "checks" "stylish-haskell" ] [ "dockerImage" ] ];
81+
[ [ "checks" "hlint" ] [ "dockerImage" ] ];
8282
# Paths or prefix of paths for which musl64 are disabled:
8383
noMusl64Build = [
8484
[ "shell" ]

scripts/git-pre-commit-hook

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Haskell files you are about to commit. Sylish-haskell will modify the files
55
# that need modification in place. Hlinf warnings are reported as that and
66
# the commit is aborted, so you can fix it.
7-
# Obviously you need stylish-haskell and hlint on your path. The versions you
7+
# Obviously you need hlint on your path. The versions you
88
# will need are the latest versions that were released before the Hackage
99
# index-state specified in the cabal.project file.
1010

@@ -52,21 +52,13 @@ for f in $files ; do
5252
done
5353

5454
if test ${#hsfiles[@]} -gt 0 ; then
55-
# echo "hsfiles:" "${hsfiles[@]}"
56-
stylish-haskell -i "${hsfiles[@]}"
57-
if test $? -ne 0 ; then
58-
echo
59-
echo "Commit aborted. Stylish Haskell failed."
60-
exit 1
61-
fi
6255
hlint "${hsfiles[@]}"
6356
if test $? -ne 0 ; then
6457
echo
6558
echo "Commit aborted. Fix the above error before trying again."
6659
exit 1
6760
fi
6861

69-
# Need to add them if we want stylish-haskell changes to be commited.
7062
git add "${hsfiles[@]}"
7163
fi
7264

shell.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ let
2626
cabalWrapped
2727
ghcid
2828
hlint
29-
stylish-haskell
3029
weeder
3130
nixWrapped
3231
pkgconfig

0 commit comments

Comments
 (0)