Skip to content

Commit 69974d9

Browse files
authored
Merge pull request haskell#1521 from alanz/c-h-hackage
Replaced cabal-helper submodule with hackage version
2 parents 072ff7f + db2124e commit 69974d9

File tree

12 files changed

+76
-82
lines changed

12 files changed

+76
-82
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,3 @@
1010
# rm -rf path_to_submodule
1111

1212

13-
[submodule "submodules/cabal-helper"]
14-
path = submodules/cabal-helper
15-
url = https://github.com/DanielG/cabal-helper.git

cabal.project

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ packages:
33
./hie-plugin-api/
44

55
-- ./submodules/HaRe
6-
./submodules/cabal-helper/
76

87
tests: true
98

stack-8.4.2.yaml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ packages:
55

66
extra-deps:
77
# - ./submodules/HaRe
8-
- ./submodules/cabal-helper
98

10-
- brittany-0.12.1.0
119
- base-compat-0.9.3
10+
- brittany-0.12.1.0
1211
- bytestring-trie-0.2.5.0
12+
- cabal-helper-1.0.0.0
1313
- cabal-plan-0.5.0.0
1414
- connection-0.3.1 # for network and network-bsd
1515
- constrained-dynamic-0.1.0.0
16-
- ghc-exactprint-0.6.2 # for HaRe
16+
- extra-1.6.18
17+
- file-embed-0.0.11
1718
- filepattern-0.1.1
1819
- floskell-0.10.2
20+
- ghc-exactprint-0.6.2 # for HaRe
1921
- ghc-lib-parser-8.8.1
2022
- haddock-api-2.20.0
2123
- haddock-library-1.6.0
@@ -28,16 +30,21 @@ extra-deps:
2830
- hoogle-5.0.17.11
2931
- hsimport-0.11.0
3032
- hslogger-1.3.1.0
33+
- libyaml-0.1.1.0
3134
- lsp-test-0.10.0.0
3235
- monad-dijkstra-0.1.1.2
3336
- network-3.1.1.1 # for hslogger
3437
- network-bsd-2.8.1.0 # for hslogger
38+
- parser-combinators-1.2.1
3539
- pretty-show-1.8.2
3640
- rope-utf16-splay-0.3.1.0
37-
- syz-0.2.0.0
3841
- simple-sendfile-0.2.30 # for network and network-bsd
3942
- socks-0.6.1 # for network and network-bsd
43+
- syz-0.2.0.0
4044
- temporary-1.2.1.1
45+
- unix-compat-0.5.2
46+
- unordered-containers-0.2.10.0
47+
- yaml-0.11.1.2
4148
# To make build work in windows 7
4249
- unix-time-0.4.7
4350
- windns-0.1.0.0
@@ -47,14 +54,6 @@ extra-deps:
4754
- wai-3.2.2.1 # for network and network-bsd
4855

4956

50-
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
51-
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb
52-
- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76
53-
- file-embed-0.0.11@sha256:77bb3b1dc219ccd682706b1d3dfbc5bf2db5beb1af6c108ed9e0f5b4d58a5a0a,1325
54-
- libyaml-0.1.1.0@sha256:b3fcd8c44622c75e054c2267f3fec39a58a311748000310cbc8257a4683d3f02,2090
55-
- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204
56-
- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788
57-
5857
flags:
5958
haskell-ide-engine:
6059
pedantic: true

stack-8.4.3.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ packages:
55

66
extra-deps:
77
# - ./submodules/HaRe
8-
- ./submodules/cabal-helper
98

109
- base-compat-0.9.3
1110
- brittany-0.12.1.0
1211
- bytestring-trie-0.2.5.0
12+
- cabal-helper-1.0.0.0
1313
- cabal-plan-0.5.0.0
1414
- connection-0.3.1 # for network and network-bsd
1515
- constrained-dynamic-0.1.0.0
16-
- ghc-exactprint-0.6.2 # for HaRe
16+
- extra-1.6.18
17+
- file-embed-0.0.11
1718
- filepattern-0.1.1
1819
- floskell-0.10.2
20+
- ghc-exactprint-0.6.2 # for HaRe
1921
- ghc-lib-parser-8.8.1
2022
- haddock-api-2.20.0
2123
- haddock-library-1.6.0
@@ -28,15 +30,20 @@ extra-deps:
2830
- hoogle-5.0.17.11
2931
- hsimport-0.11.0
3032
- hslogger-1.3.1.0
33+
- libyaml-0.1.1.0
3134
- lsp-test-0.10.0.0
3235
- monad-dijkstra-0.1.1.2
3336
- network-3.1.1.1 # for hslogger
3437
- network-bsd-2.8.1.0 # for hslogger
38+
- parser-combinators-1.2.1
3539
- pretty-show-1.8.2
3640
- rope-utf16-splay-0.3.1.0
37-
- syz-0.2.0.0
3841
- simple-sendfile-0.2.30 # for network and network-bsd
3942
- socks-0.6.1 # for network and network-bsd
43+
- syz-0.2.0.0
44+
- unix-compat-0.5.2
45+
- unordered-containers-0.2.10.0
46+
- yaml-0.11.1.2
4047
# To make build work in windows 7
4148
- unix-time-0.4.7
4249
- temporary-1.2.1.1
@@ -45,13 +52,6 @@ extra-deps:
4552
- wai-3.2.2.1 # for network and network-bsd
4653

4754

48-
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
49-
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb
50-
- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76
51-
- file-embed-0.0.11@sha256:77bb3b1dc219ccd682706b1d3dfbc5bf2db5beb1af6c108ed9e0f5b4d58a5a0a,1325
52-
- libyaml-0.1.1.0@sha256:b3fcd8c44622c75e054c2267f3fec39a58a311748000310cbc8257a4683d3f02,2090
53-
- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204
54-
- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788
5555

5656
flags:
5757
haskell-ide-engine:

stack-8.4.4.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@ packages:
55

66
extra-deps:
77
# - ./submodules/HaRe
8-
- ./submodules/cabal-helper
98

109
- brittany-0.12.1.0
1110
- bytestring-trie-0.2.5.0
11+
- cabal-helper-1.0.0.0
1212
- cabal-plan-0.5.0.0
1313
- connection-0.3.1 # for network and network-bsd
1414
- constrained-dynamic-0.1.0.0
15-
- ghc-exactprint-0.6.2 # for HaRe
15+
- extra-1.6.18
16+
- file-embed-0.0.11
1617
- filepattern-0.1.1
1718
- floskell-0.10.2
19+
- ghc-exactprint-0.6.2 # for HaRe
1820
- ghc-lib-parser-8.8.1
1921
- haddock-api-2.20.0
2022
- haddock-library-1.6.0
@@ -27,30 +29,28 @@ extra-deps:
2729
- hoogle-5.0.17.11
2830
- hsimport-0.11.0
2931
- hslogger-1.3.1.0
32+
- libyaml-0.1.1.0
3033
- lsp-test-0.10.0.0
3134
- monad-dijkstra-0.1.1.2
3235
- network-3.1.1.1 # for hslogger
3336
- network-bsd-2.8.1.0 # for hslogger
3437
- optparse-simple-0.1.0
38+
- parser-combinators-1.2.1
3539
- pretty-show-1.9.5
3640
- rope-utf16-splay-0.3.1.0
37-
- syz-0.2.0.0
3841
- simple-sendfile-0.2.30 # for network and network-bsd
3942
- socks-0.6.1 # for network and network-bsd
43+
- syz-0.2.0.0
44+
- unix-compat-0.5.2
45+
- unordered-containers-0.2.10.0
46+
- yaml-0.11.1.2
4047
# To make build work in windows 7
4148
- unix-time-0.4.7
4249
- temporary-1.2.1.1
4350
- time-manager-0.0.0 # for http2
4451
- warp-3.2.28 # for network and network-bsd
4552
- wai-3.2.2.1 # for network and network-bsd
4653

47-
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
48-
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb
49-
- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76
50-
- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204
51-
- file-embed-0.0.11@sha256:77bb3b1dc219ccd682706b1d3dfbc5bf2db5beb1af6c108ed9e0f5b4d58a5a0a,1325
52-
- libyaml-0.1.1.0@sha256:b3fcd8c44622c75e054c2267f3fec39a58a311748000310cbc8257a4683d3f02,2090
53-
- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788
5454

5555
flags:
5656
haskell-ide-engine:

stack-8.6.1.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,23 @@ packages:
55

66
extra-deps:
77
# - ./submodules/HaRe
8-
- ./submodules/cabal-helper
98

109
- apply-refact-0.6.0.0
1110
- brittany-0.12.1.0
1211
- butcher-1.3.2.3
1312
- bytestring-trie-0.2.5.0
13+
- cabal-helper-1.0.0.0
1414
- cabal-install-2.4.0.0
1515
- cabal-plan-0.5.0.0
1616
- constrained-dynamic-0.1.0.0
1717
- czipwith-1.0.1.1
1818
- data-tree-print-0.1.0.2
1919
- deque-0.4.3
20+
- extra-1.6.18
2021
- filepattern-0.1.1
2122
- floskell-0.10.2
22-
- ghc-lib-parser-8.8.1
2323
- ghc-exactprint-0.6.2 # for HaRe
24+
- ghc-lib-parser-8.8.1
2425
- haddock-api-2.21.0
2526
- haskell-lsp-0.19.0.0
2627
- haskell-lsp-types-0.19.0.0
@@ -30,27 +31,26 @@ extra-deps:
3031
- hlint-2.2.4
3132
- hoogle-5.0.17.11
3233
- hsimport-0.11.0
34+
- libyaml-0.1.1.0
3335
- lsp-test-0.10.0.0
3436
- monad-dijkstra-0.1.1.2
3537
- monad-memo-0.4.1
3638
- monoid-subclasses-0.4.6.1
3739
- multistate-0.8.0.1
40+
- parser-combinators-1.2.1
3841
- primes-0.2.1.0
3942
- resolv-0.1.1.2
4043
- rope-utf16-splay-0.3.1.0
4144
- strict-list-0.1.5
4245
- syz-0.2.0.0
4346
- temporary-1.2.1.1
47+
- unix-compat-0.5.2
48+
- unordered-containers-0.2.10.0
49+
- yaml-0.11.1.2
50+
4451
# To make build work in windows 7
4552
- unix-time-0.4.7
4653

47-
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
48-
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb
49-
- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76
50-
- libyaml-0.1.1.0@sha256:b3fcd8c44622c75e054c2267f3fec39a58a311748000310cbc8257a4683d3f02,2090
51-
- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204
52-
- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788
53-
5454
flags:
5555
haskell-ide-engine:
5656
pedantic: true

stack-8.6.2.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@ packages:
55

66
extra-deps:
77
# - ./submodules/HaRe
8-
- ./submodules/cabal-helper
98

109
- brittany-0.12.1.0
1110
- butcher-1.3.2.3
1211
- bytestring-trie-0.2.5.0
12+
- cabal-helper-1.0.0.0
1313
- cabal-plan-0.5.0.0
1414
- constrained-dynamic-0.1.0.0
1515
- deque-0.4.3
16+
- extra-1.6.18
1617
- filepattern-0.1.1
1718
- floskell-0.10.2
18-
- ghc-lib-parser-8.8.1
1919
- ghc-exactprint-0.6.2 # for HaRe
20+
- ghc-lib-parser-8.8.1
2021
- haddock-api-2.21.0
2122
- haskell-lsp-0.19.0.0
2223
- haskell-lsp-types-0.19.0.0
@@ -26,24 +27,23 @@ extra-deps:
2627
- hlint-2.2.4
2728
- hoogle-5.0.17.11
2829
- hsimport-0.11.0
30+
- libyaml-0.1.1.0
2931
- lsp-test-0.10.0.0
3032
- monad-dijkstra-0.1.1.2
3133
- monad-memo-0.4.1
3234
- multistate-0.8.0.1
35+
- parser-combinators-1.2.1
3336
- rope-utf16-splay-0.3.1.0
3437
- strict-list-0.1.5
3538
- syz-0.2.0.0
3639
- temporary-1.2.1.1
40+
- unix-compat-0.5.2
41+
- unordered-containers-0.2.10.0
42+
- yaml-0.11.1.2
3743
# To make build work in windows 7
3844
- unix-time-0.4.7
3945
#- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
4046

41-
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
42-
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb
43-
- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76
44-
- libyaml-0.1.1.0@sha256:b3fcd8c44622c75e054c2267f3fec39a58a311748000310cbc8257a4683d3f02,2090
45-
- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204
46-
- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788
4747

4848
flags:
4949
haskell-ide-engine:

stack-8.6.3.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@ packages:
55

66
extra-deps:
77
# - ./submodules/HaRe
8-
- ./submodules/cabal-helper
98

109
- brittany-0.12.1.0
11-
- bytestring-trie-0.2.5.0
1210
- butcher-1.3.2.1
11+
- bytestring-trie-0.2.5.0
12+
- cabal-helper-1.0.0.0
1313
- cabal-plan-0.5.0.0
1414
- constrained-dynamic-0.1.0.0
15+
- extra-1.6.18
1516
- floskell-0.10.2
16-
- ghc-lib-parser-8.8.1
1717
- ghc-exactprint-0.6.2 # for HaRe
18+
- ghc-lib-parser-8.8.1
1819
- haddock-api-2.21.0
1920
- haskell-lsp-0.19.0.0
2021
- haskell-lsp-types-0.19.0.0
@@ -29,18 +30,17 @@ extra-deps:
2930
- monad-memo-0.4.1
3031
- multistate-0.8.0.1
3132
- optparse-simple-0.1.0
33+
- parser-combinators-1.2.1
3234
- rope-utf16-splay-0.3.1.0
3335
- syz-0.2.0.0
3436
- temporary-1.2.1.1
37+
- unix-compat-0.5.2
38+
- unordered-containers-0.2.10.0
39+
- yaml-0.11.1.2
40+
3541
# To make build work in windows 7
3642
- unix-time-0.4.7
3743

38-
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
39-
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb
40-
- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76
41-
- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204
42-
- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788
43-
4444
flags:
4545
haskell-ide-engine:
4646
pedantic: true

stack-8.6.4.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@ packages:
55

66
extra-deps:
77
# - ./submodules/HaRe
8-
- ./submodules/cabal-helper
98

109
- brittany-0.12.1.0
1110
- butcher-1.3.2.1
1211
- bytestring-trie-0.2.5.0
12+
- cabal-helper-1.0.0.0
1313
- cabal-plan-0.5.0.0
1414
- constrained-dynamic-0.1.0.0
15+
- extra-1.6.18
1516
- floskell-0.10.2
16-
- ghc-lib-parser-8.8.1
1717
- ghc-exactprint-0.6.2 # for HaRe
18+
- ghc-lib-parser-8.8.1
1819
- haddock-api-2.22.0
1920
- haskell-lsp-0.19.0.0
2021
- haskell-lsp-types-0.19.0.0
@@ -27,17 +28,16 @@ extra-deps:
2728
- monad-dijkstra-0.1.1.2@rev:1
2829
- monad-memo-0.4.1
2930
- multistate-0.8.0.1
31+
- parser-combinators-1.2.1
3032
- rope-utf16-splay-0.3.1.0
3133
- syz-0.2.0.0
3234
- temporary-1.2.1.1
35+
- unix-compat-0.5.2
36+
- unordered-containers-0.2.10.0
37+
- yaml-0.11.1.2
3338
# To make build work in windows 7
3439
- unix-time-0.4.7
3540

36-
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
37-
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb
38-
- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76
39-
- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204
40-
- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788
4141

4242

4343
flags:

0 commit comments

Comments
 (0)