Skip to content

Commit 8e06b38

Browse files
committed
Remove stack support from cabal-fmt plugin
1 parent 60b2f1b commit 8e06b38

11 files changed

+39
-84
lines changed

Diff for: cabal-ghc901.project

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ packages:
2222
./plugins/hls-pragmas-plugin
2323
./plugins/hls-module-name-plugin
2424
-- ./plugins/hls-ormolu-plugin
25+
-- ./plugins/hls-cabal-fmt-plugin
2526
./plugins/hls-call-hierarchy-plugin
2627
tests: true
2728

@@ -79,7 +80,7 @@ index-state: 2021-08-01T00:00:00Z
7980

8081
constraints:
8182
-- These plugins doesn't work on GHC9 yet
82-
haskell-language-server -brittany -class -fourmolu -ormolu -splice -stylishhaskell -tactic -refineImports
83+
haskell-language-server -brittany -class -fourmolu -ormolu -splice -stylishhaskell -tactic -refineImports -cabalfmt
8384

8485

8586
allow-newer:

Diff for: stack-8.10.2.yaml

+4-9
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23-
- ./plugins/hls-cabal-fmt-plugin
24-
23+
#- ./plugins/hls-cabal-fmt-plugin
2524
- ./plugins/hls-floskell-plugin
2625
- ./plugins/hls-fourmolu-plugin
2726
- ./plugins/hls-pragmas-plugin
@@ -42,9 +41,6 @@ extra-deps:
4241
- # ghc-api-compat-8.6
4342
github: hsyl20/ghc-api-compat
4443
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
45-
- # cabal-fmt
46-
github: VeryMilkyJoe/cabal-fmt
47-
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
4844
- ghc-check-0.5.0.4
4945
- ghc-exactprint-0.6.4
5046
- ghc-lib-8.10.4.20210206
@@ -58,10 +54,7 @@ extra-deps:
5854
- refinery-0.4.0.0
5955
- retrie-0.1.1.1
6056
- shake-0.19.4
61-
- # stylish haskell
62-
github: VeryMilkyJoe/stylish-haskell
63-
commit: 9279aad535de624fca990ed50f010a1743c0043a
64-
#- stylish-haskell-0.12.2.0
57+
- stylish-haskell-0.12.2.0
6558
- semigroups-0.18.5
6659
- temporary-1.2.1.1
6760
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
@@ -88,6 +81,8 @@ configure-options:
8881
flags:
8982
haskell-language-server:
9083
pedantic: true
84+
85+
cabalfmt: false
9186
retrie:
9287
BuildExecutable: false
9388
# Stack doesn't support automatic flags.

Diff for: stack-8.10.3.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23-
- ./plugins/hls-cabal-fmt-plugin
23+
#- ./plugins/hls-cabal-fmt-plugin
2424
- ./plugins/hls-floskell-plugin
2525
- ./plugins/hls-fourmolu-plugin
2626
- ./plugins/hls-pragmas-plugin
@@ -41,9 +41,6 @@ extra-deps:
4141
- # ghc-api-compat-8.6
4242
github: hsyl20/ghc-api-compat
4343
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
44-
- # cabal-fmt
45-
github: VeryMilkyJoe/cabal-fmt
46-
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
4744
- ghc-check-0.5.0.4
4845
- ghc-exactprint-0.6.4
4946
- ghc-lib-8.10.4.20210206
@@ -57,10 +54,7 @@ extra-deps:
5754
- refinery-0.4.0.0
5855
- retrie-0.1.1.1
5956
- shake-0.19.4
60-
- # stylish haskell
61-
github: VeryMilkyJoe/stylish-haskell
62-
commit: 9279aad535de624fca990ed50f010a1743c0043a
63-
#- stylish-haskell-0.12.2.0
57+
- stylish-haskell-0.12.2.0
6458
- semigroups-0.18.5
6559
- temporary-1.2.1.1
6660
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
@@ -87,6 +81,8 @@ configure-options:
8781
flags:
8882
haskell-language-server:
8983
pedantic: true
84+
85+
cabalfmt: false
9086
retrie:
9187
BuildExecutable: false
9288
# Stack doesn't support automatic flags.

Diff for: stack-8.10.4.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23-
- ./plugins/hls-cabal-fmt-plugin
23+
#- ./plugins/hls-cabal-fmt-plugin
2424
- ./plugins/hls-floskell-plugin
2525
- ./plugins/hls-fourmolu-plugin
2626
- ./plugins/hls-pragmas-plugin
@@ -41,9 +41,6 @@ extra-deps:
4141
- # ghc-api-compat-8.6
4242
github: hsyl20/ghc-api-compat
4343
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
44-
- # cabal-fmt
45-
github: VeryMilkyJoe/cabal-fmt
46-
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
4744
- ghc-check-0.5.0.4
4845
- ghc-exactprint-0.6.4
4946
- ghc-source-gen-0.4.1.0
@@ -53,10 +50,7 @@ extra-deps:
5350
- monad-dijkstra-0.1.1.2
5451
- refinery-0.4.0.0
5552
- retrie-0.1.1.1
56-
- # stylish haskell
57-
github: VeryMilkyJoe/stylish-haskell
58-
commit: 9279aad535de624fca990ed50f010a1743c0043a
59-
#- stylish-haskell-0.12.2.0
53+
- stylish-haskell-0.12.2.0
6054
- semigroups-0.18.5
6155
- temporary-1.2.1.1
6256
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
@@ -89,6 +83,8 @@ configure-options:
8983
flags:
9084
haskell-language-server:
9185
pedantic: true
86+
87+
cabalfmt: false
9288
retrie:
9389
BuildExecutable: false
9490
# Stack doesn't support automatic flags.

Diff for: stack-8.10.5.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ packages:
2222
- ./plugins/hls-tactics-plugin
2323
- ./plugins/hls-brittany-plugin
2424
- ./plugins/hls-stylish-haskell-plugin
25-
- ./plugins/hls-cabal-fmt-plugin
25+
#- ./plugins/hls-cabal-fmt-plugin
2626
- ./plugins/hls-floskell-plugin
2727
- ./plugins/hls-fourmolu-plugin
2828
- ./plugins/hls-pragmas-plugin
@@ -43,9 +43,6 @@ extra-deps:
4343
- # ghc-api-compat-8.6
4444
github: hsyl20/ghc-api-compat
4545
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
46-
- # cabal-fmt
47-
github: VeryMilkyJoe/cabal-fmt
48-
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
4946
- ghc-check-0.5.0.4
5047
- ghc-exactprint-0.6.4
5148
- ghc-source-gen-0.4.1.0
@@ -55,10 +52,7 @@ extra-deps:
5552
- monad-dijkstra-0.1.1.2
5653
- refinery-0.4.0.0
5754
- retrie-1.0.0.0
58-
- # stylish haskell
59-
github: VeryMilkyJoe/stylish-haskell
60-
commit: 9279aad535de624fca990ed50f010a1743c0043a
61-
#- stylish-haskell-0.12.2.0
55+
- stylish-haskell-0.12.2.0
6256
- semigroups-0.18.5
6357
- temporary-1.2.1.1
6458
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
@@ -91,6 +85,8 @@ configure-options:
9185
flags:
9286
haskell-language-server:
9387
pedantic: true
88+
89+
cabalfmt: false
9490
retrie:
9591
BuildExecutable: false
9692
# Stack doesn't support automatic flags.

Diff for: stack-8.6.4.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ packages:
2121
- ./plugins/hls-tactics-plugin
2222
- ./plugins/hls-brittany-plugin
2323
- ./plugins/hls-stylish-haskell-plugin
24-
- ./plugins/hls-cabal-fmt-plugin
24+
#- ./plugins/hls-cabal-fmt-plugin
2525
- ./plugins/hls-floskell-plugin
2626
- ./plugins/hls-fourmolu-plugin
2727
- ./plugins/hls-pragmas-plugin
@@ -48,9 +48,6 @@ extra-deps:
4848
- # ghc-api-compat-8.6
4949
github: hsyl20/ghc-api-compat
5050
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
51-
- # cabal-fmt
52-
github: VeryMilkyJoe/cabal-fmt
53-
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
5451
- ghc-check-0.5.0.4
5552
- ghc-events-0.13.0
5653
- ghc-exactprint-0.6.4
@@ -87,10 +84,7 @@ extra-deps:
8784
- retrie-0.1.1.1
8885
- semialign-1.1
8986
- shake-0.19.4
90-
- # stylish haskell
91-
github: VeryMilkyJoe/stylish-haskell
92-
commit: 9279aad535de624fca990ed50f010a1743c0043a
93-
#- stylish-haskell-0.12.2.0
87+
- stylish-haskell-0.12.2.0
9488
- tasty-rerun-1.1.17
9589
- temporary-1.2.1.1
9690
- these-1.1.1.1
@@ -116,6 +110,8 @@ extra-deps:
116110
flags:
117111
haskell-language-server:
118112
pedantic: true
113+
114+
cabalfmt: false
119115
retrie:
120116
BuildExecutable: false
121117
# Stack doesn't support automatic flags.

Diff for: stack-8.6.5.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23-
- ./plugins/hls-cabal-fmt-plugin
23+
#- ./plugins/hls-cabal-fmt-plugin
2424
- ./plugins/hls-floskell-plugin
2525
- ./plugins/hls-fourmolu-plugin
2626
- ./plugins/hls-pragmas-plugin
@@ -49,9 +49,6 @@ extra-deps:
4949
- # ghc-api-compat-8.6
5050
github: hsyl20/ghc-api-compat
5151
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
52-
- # cabal-fmt
53-
github: VeryMilkyJoe/cabal-fmt
54-
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
5552
- ghc-check-0.5.0.4
5653
- ghc-events-0.13.0
5754
- ghc-exactprint-0.6.4
@@ -88,10 +85,7 @@ extra-deps:
8885
- retrie-0.1.1.1
8986
- semialign-1.1
9087
- shake-0.19.4
91-
- # stylish haskell
92-
github: VeryMilkyJoe/stylish-haskell
93-
commit: 9279aad535de624fca990ed50f010a1743c0043a
94-
#- stylish-haskell-0.12.2.0
88+
- stylish-haskell-0.12.2.0
9589
- tasty-rerun-1.1.17
9690
- temporary-1.2.1.1
9791
- these-1.1.1.1
@@ -125,6 +119,8 @@ configure-options:
125119
flags:
126120
haskell-language-server:
127121
pedantic: true
122+
123+
cabalfmt: false
128124
retrie:
129125
BuildExecutable: false
130126
# Stack doesn't support automatic flags.

Diff for: stack-8.8.3.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23-
- ./plugins/hls-cabal-fmt-plugin
23+
#- ./plugins/hls-cabal-fmt-plugin
2424
- ./plugins/hls-floskell-plugin
2525
- ./plugins/hls-fourmolu-plugin
2626
- ./plugins/hls-pragmas-plugin
@@ -43,9 +43,6 @@ extra-deps:
4343
- # ghc-api-compat-8.6
4444
github: hsyl20/ghc-api-compat
4545
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
46-
- # cabal-fmt
47-
github: VeryMilkyJoe/cabal-fmt
48-
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
4946
- ghc-check-0.5.0.4
5047
- ghc-exactprint-0.6.4
5148
- ghc-lib-8.10.4.20210206
@@ -71,10 +68,7 @@ extra-deps:
7168
- retrie-0.1.1.1
7269
- semigroups-0.18.5
7370
- shake-0.19.4
74-
- # stylish haskell
75-
github: VeryMilkyJoe/stylish-haskell
76-
commit: 9279aad535de624fca990ed50f010a1743c0043a
77-
#- stylish-haskell-0.12.2.0
71+
- stylish-haskell-0.12.2.0
7872
- temporary-1.2.1.1
7973
- uniplate-1.6.13
8074
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
@@ -104,6 +98,8 @@ configure-options:
10498
flags:
10599
haskell-language-server:
106100
pedantic: true
101+
102+
cabalfmt: false
107103
retrie:
108104
BuildExecutable: false
109105
# Stack doesn't support automatic flags.

Diff for: stack-8.8.4.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23-
- ./plugins/hls-cabal-fmt-plugin
23+
#- ./plugins/hls-cabal-fmt-plugin
2424
- ./plugins/hls-floskell-plugin
2525
- ./plugins/hls-fourmolu-plugin
2626
- ./plugins/hls-pragmas-plugin
@@ -43,9 +43,6 @@ extra-deps:
4343
- # ghc-api-compat-8.6
4444
github: hsyl20/ghc-api-compat
4545
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
46-
- # cabal-fmt
47-
github: VeryMilkyJoe/cabal-fmt
48-
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
4946
- ghc-check-0.5.0.4
5047
- ghc-exactprint-0.6.4
5148
- ghc-lib-8.10.4.20210206
@@ -70,10 +67,7 @@ extra-deps:
7067
- retrie-0.1.1.1
7168
- semigroups-0.18.5
7269
- shake-0.19.4
73-
- # stylish haskell
74-
github: VeryMilkyJoe/stylish-haskell
75-
commit: 9279aad535de624fca990ed50f010a1743c0043a
76-
#- stylish-haskell-0.12.2.0
70+
- stylish-haskell-0.12.2.0
7771
- temporary-1.2.1.1
7872
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
7973
- bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727
@@ -101,6 +95,8 @@ configure-options:
10195
flags:
10296
haskell-language-server:
10397
pedantic: true
98+
99+
cabalfmt: false
104100
retrie:
105101
BuildExecutable: false
106102
# Stack doesn't support automatic flags.

Diff for: stack-9.0.1.yaml

+1-10
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,6 @@ extra-deps:
9292
commit: ca23431a8dfa013992f9164ccc882a3277361f17
9393
# https://github.com/diagrams/active/pull/36
9494

95-
# - # stylish haskell
96-
# github: VeryMilkyJoe/stylish-haskell
97-
# commit: 9279aad535de624fca990ed50f010a1743c0043a
98-
# https://github.com/haskell/stylish-haskell/pull/375
99-
100-
- # cabal-fmt
101-
github: VeryMilkyJoe/cabal-fmt
102-
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
103-
# https://github.com/phadej/cabal-fmt/pull/33
104-
10595
# benchmark dependency
10696
- github: HeinrichApfelmus/operational
10797
commit: 16e19aaf34e286f3d27b3988c61040823ec66537
@@ -127,6 +117,7 @@ flags:
127117
fourmolu: false
128118
stylishHaskell: false
129119
brittany: false
120+
cabalfmt: false
130121
retrie:
131122
BuildExecutable: false
132123
# Stack doesn't support automatic flags.

0 commit comments

Comments
 (0)