diff --git a/.gitmodules b/.gitmodules index ca9fce700..281a9120a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,3 @@ # rm -rf path_to_submodule -[submodule "submodules/cabal-helper"] - path = submodules/cabal-helper - url = https://github.com/DanielG/cabal-helper.git diff --git a/cabal.project b/cabal.project index 6f39ccbeb..a5847f35e 100644 --- a/cabal.project +++ b/cabal.project @@ -3,7 +3,6 @@ packages: ./hie-plugin-api/ -- ./submodules/HaRe - ./submodules/cabal-helper/ tests: true diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 96526db47..cdfc46ff5 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -5,17 +5,19 @@ packages: extra-deps: # - ./submodules/HaRe -- ./submodules/cabal-helper -- brittany-0.12.1.0 - base-compat-0.9.3 +- brittany-0.12.1.0 - bytestring-trie-0.2.5.0 +- cabal-helper-1.0.0.0 - cabal-plan-0.5.0.0 - connection-0.3.1 # for network and network-bsd - constrained-dynamic-0.1.0.0 -- ghc-exactprint-0.6.2 # for HaRe +- extra-1.6.18 +- file-embed-0.0.11 - filepattern-0.1.1 - floskell-0.10.2 +- ghc-exactprint-0.6.2 # for HaRe - ghc-lib-parser-8.8.1 - haddock-api-2.20.0 - haddock-library-1.6.0 @@ -28,16 +30,21 @@ extra-deps: - hoogle-5.0.17.11 - hsimport-0.11.0 - hslogger-1.3.1.0 +- libyaml-0.1.1.0 - lsp-test-0.10.0.0 - monad-dijkstra-0.1.1.2 - network-3.1.1.1 # for hslogger - network-bsd-2.8.1.0 # for hslogger +- parser-combinators-1.2.1 - pretty-show-1.8.2 - rope-utf16-splay-0.3.1.0 -- syz-0.2.0.0 - simple-sendfile-0.2.30 # for network and network-bsd - socks-0.6.1 # for network and network-bsd +- syz-0.2.0.0 - temporary-1.2.1.1 +- unix-compat-0.5.2 +- unordered-containers-0.2.10.0 +- yaml-0.11.1.2 # To make build work in windows 7 - unix-time-0.4.7 - windns-0.1.0.0 @@ -47,14 +54,6 @@ extra-deps: - wai-3.2.2.1 # for network and network-bsd -- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af -- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb -- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76 -- file-embed-0.0.11@sha256:77bb3b1dc219ccd682706b1d3dfbc5bf2db5beb1af6c108ed9e0f5b4d58a5a0a,1325 -- libyaml-0.1.1.0@sha256:b3fcd8c44622c75e054c2267f3fec39a58a311748000310cbc8257a4683d3f02,2090 -- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204 -- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788 - flags: haskell-ide-engine: pedantic: true diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index d94aa9c75..c8fe50dcc 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -5,17 +5,19 @@ packages: extra-deps: # - ./submodules/HaRe -- ./submodules/cabal-helper - base-compat-0.9.3 - brittany-0.12.1.0 - bytestring-trie-0.2.5.0 +- cabal-helper-1.0.0.0 - cabal-plan-0.5.0.0 - connection-0.3.1 # for network and network-bsd - constrained-dynamic-0.1.0.0 -- ghc-exactprint-0.6.2 # for HaRe +- extra-1.6.18 +- file-embed-0.0.11 - filepattern-0.1.1 - floskell-0.10.2 +- ghc-exactprint-0.6.2 # for HaRe - ghc-lib-parser-8.8.1 - haddock-api-2.20.0 - haddock-library-1.6.0 @@ -28,15 +30,20 @@ extra-deps: - hoogle-5.0.17.11 - hsimport-0.11.0 - hslogger-1.3.1.0 +- libyaml-0.1.1.0 - lsp-test-0.10.0.0 - monad-dijkstra-0.1.1.2 - network-3.1.1.1 # for hslogger - network-bsd-2.8.1.0 # for hslogger +- parser-combinators-1.2.1 - pretty-show-1.8.2 - rope-utf16-splay-0.3.1.0 -- syz-0.2.0.0 - simple-sendfile-0.2.30 # for network and network-bsd - socks-0.6.1 # for network and network-bsd +- syz-0.2.0.0 +- unix-compat-0.5.2 +- unordered-containers-0.2.10.0 +- yaml-0.11.1.2 # To make build work in windows 7 - unix-time-0.4.7 - temporary-1.2.1.1 @@ -45,13 +52,6 @@ extra-deps: - wai-3.2.2.1 # for network and network-bsd -- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af -- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb -- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76 -- file-embed-0.0.11@sha256:77bb3b1dc219ccd682706b1d3dfbc5bf2db5beb1af6c108ed9e0f5b4d58a5a0a,1325 -- libyaml-0.1.1.0@sha256:b3fcd8c44622c75e054c2267f3fec39a58a311748000310cbc8257a4683d3f02,2090 -- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204 -- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788 flags: haskell-ide-engine: diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 6fbc933f3..5301b80d4 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -5,16 +5,18 @@ packages: extra-deps: # - ./submodules/HaRe -- ./submodules/cabal-helper - brittany-0.12.1.0 - bytestring-trie-0.2.5.0 +- cabal-helper-1.0.0.0 - cabal-plan-0.5.0.0 - connection-0.3.1 # for network and network-bsd - constrained-dynamic-0.1.0.0 -- ghc-exactprint-0.6.2 # for HaRe +- extra-1.6.18 +- file-embed-0.0.11 - filepattern-0.1.1 - floskell-0.10.2 +- ghc-exactprint-0.6.2 # for HaRe - ghc-lib-parser-8.8.1 - haddock-api-2.20.0 - haddock-library-1.6.0 @@ -27,16 +29,21 @@ extra-deps: - hoogle-5.0.17.11 - hsimport-0.11.0 - hslogger-1.3.1.0 +- libyaml-0.1.1.0 - lsp-test-0.10.0.0 - monad-dijkstra-0.1.1.2 - network-3.1.1.1 # for hslogger - network-bsd-2.8.1.0 # for hslogger - optparse-simple-0.1.0 +- parser-combinators-1.2.1 - pretty-show-1.9.5 - rope-utf16-splay-0.3.1.0 -- syz-0.2.0.0 - simple-sendfile-0.2.30 # for network and network-bsd - socks-0.6.1 # for network and network-bsd +- syz-0.2.0.0 +- unix-compat-0.5.2 +- unordered-containers-0.2.10.0 +- yaml-0.11.1.2 # To make build work in windows 7 - unix-time-0.4.7 - temporary-1.2.1.1 @@ -44,13 +51,6 @@ extra-deps: - warp-3.2.28 # for network and network-bsd - wai-3.2.2.1 # for network and network-bsd -- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af -- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb -- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76 -- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204 -- file-embed-0.0.11@sha256:77bb3b1dc219ccd682706b1d3dfbc5bf2db5beb1af6c108ed9e0f5b4d58a5a0a,1325 -- libyaml-0.1.1.0@sha256:b3fcd8c44622c75e054c2267f3fec39a58a311748000310cbc8257a4683d3f02,2090 -- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788 flags: haskell-ide-engine: diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml index 6be262b40..f741895ca 100644 --- a/stack-8.6.1.yaml +++ b/stack-8.6.1.yaml @@ -5,22 +5,23 @@ packages: extra-deps: # - ./submodules/HaRe -- ./submodules/cabal-helper - apply-refact-0.6.0.0 - brittany-0.12.1.0 - butcher-1.3.2.3 - bytestring-trie-0.2.5.0 +- cabal-helper-1.0.0.0 - cabal-install-2.4.0.0 - cabal-plan-0.5.0.0 - constrained-dynamic-0.1.0.0 - czipwith-1.0.1.1 - data-tree-print-0.1.0.2 - deque-0.4.3 +- extra-1.6.18 - filepattern-0.1.1 - floskell-0.10.2 -- ghc-lib-parser-8.8.1 - ghc-exactprint-0.6.2 # for HaRe +- ghc-lib-parser-8.8.1 - haddock-api-2.21.0 - haskell-lsp-0.19.0.0 - haskell-lsp-types-0.19.0.0 @@ -30,27 +31,26 @@ extra-deps: - hlint-2.2.4 - hoogle-5.0.17.11 - hsimport-0.11.0 +- libyaml-0.1.1.0 - lsp-test-0.10.0.0 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 - monoid-subclasses-0.4.6.1 - multistate-0.8.0.1 +- parser-combinators-1.2.1 - primes-0.2.1.0 - resolv-0.1.1.2 - rope-utf16-splay-0.3.1.0 - strict-list-0.1.5 - syz-0.2.0.0 - temporary-1.2.1.1 +- unix-compat-0.5.2 +- unordered-containers-0.2.10.0 +- yaml-0.11.1.2 + # To make build work in windows 7 - unix-time-0.4.7 -- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af -- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb -- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76 -- libyaml-0.1.1.0@sha256:b3fcd8c44622c75e054c2267f3fec39a58a311748000310cbc8257a4683d3f02,2090 -- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204 -- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788 - flags: haskell-ide-engine: pedantic: true diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml index a5396645b..347016bac 100644 --- a/stack-8.6.2.yaml +++ b/stack-8.6.2.yaml @@ -5,18 +5,19 @@ packages: extra-deps: # - ./submodules/HaRe -- ./submodules/cabal-helper - brittany-0.12.1.0 - butcher-1.3.2.3 - bytestring-trie-0.2.5.0 +- cabal-helper-1.0.0.0 - cabal-plan-0.5.0.0 - constrained-dynamic-0.1.0.0 - deque-0.4.3 +- extra-1.6.18 - filepattern-0.1.1 - floskell-0.10.2 -- ghc-lib-parser-8.8.1 - ghc-exactprint-0.6.2 # for HaRe +- ghc-lib-parser-8.8.1 - haddock-api-2.21.0 - haskell-lsp-0.19.0.0 - haskell-lsp-types-0.19.0.0 @@ -26,24 +27,23 @@ extra-deps: - hlint-2.2.4 - hoogle-5.0.17.11 - hsimport-0.11.0 +- libyaml-0.1.1.0 - lsp-test-0.10.0.0 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 - multistate-0.8.0.1 +- parser-combinators-1.2.1 - rope-utf16-splay-0.3.1.0 - strict-list-0.1.5 - syz-0.2.0.0 - temporary-1.2.1.1 +- unix-compat-0.5.2 +- unordered-containers-0.2.10.0 +- yaml-0.11.1.2 # To make build work in windows 7 - unix-time-0.4.7 #- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219 -- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af -- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb -- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76 -- libyaml-0.1.1.0@sha256:b3fcd8c44622c75e054c2267f3fec39a58a311748000310cbc8257a4683d3f02,2090 -- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204 -- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788 flags: haskell-ide-engine: diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml index ff9cc24cb..46c524136 100644 --- a/stack-8.6.3.yaml +++ b/stack-8.6.3.yaml @@ -5,16 +5,17 @@ packages: extra-deps: # - ./submodules/HaRe -- ./submodules/cabal-helper - brittany-0.12.1.0 -- bytestring-trie-0.2.5.0 - butcher-1.3.2.1 +- bytestring-trie-0.2.5.0 +- cabal-helper-1.0.0.0 - cabal-plan-0.5.0.0 - constrained-dynamic-0.1.0.0 +- extra-1.6.18 - floskell-0.10.2 -- ghc-lib-parser-8.8.1 - ghc-exactprint-0.6.2 # for HaRe +- ghc-lib-parser-8.8.1 - haddock-api-2.21.0 - haskell-lsp-0.19.0.0 - haskell-lsp-types-0.19.0.0 @@ -29,18 +30,17 @@ extra-deps: - monad-memo-0.4.1 - multistate-0.8.0.1 - optparse-simple-0.1.0 +- parser-combinators-1.2.1 - rope-utf16-splay-0.3.1.0 - syz-0.2.0.0 - temporary-1.2.1.1 +- unix-compat-0.5.2 +- unordered-containers-0.2.10.0 +- yaml-0.11.1.2 + # To make build work in windows 7 - unix-time-0.4.7 -- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af -- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb -- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76 -- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204 -- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788 - flags: haskell-ide-engine: pedantic: true diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index e95ca6b34..d798fb4a8 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -5,16 +5,17 @@ packages: extra-deps: # - ./submodules/HaRe -- ./submodules/cabal-helper - brittany-0.12.1.0 - butcher-1.3.2.1 - bytestring-trie-0.2.5.0 +- cabal-helper-1.0.0.0 - cabal-plan-0.5.0.0 - constrained-dynamic-0.1.0.0 +- extra-1.6.18 - floskell-0.10.2 -- ghc-lib-parser-8.8.1 - ghc-exactprint-0.6.2 # for HaRe +- ghc-lib-parser-8.8.1 - haddock-api-2.22.0 - haskell-lsp-0.19.0.0 - haskell-lsp-types-0.19.0.0 @@ -27,17 +28,16 @@ extra-deps: - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 - multistate-0.8.0.1 +- parser-combinators-1.2.1 - rope-utf16-splay-0.3.1.0 - syz-0.2.0.0 - temporary-1.2.1.1 +- unix-compat-0.5.2 +- unordered-containers-0.2.10.0 +- yaml-0.11.1.2 # To make build work in windows 7 - unix-time-0.4.7 -- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af -- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb -- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76 -- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204 -- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788 flags: diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index f099e1ef1..48e5d1694 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -5,30 +5,30 @@ packages: extra-deps: # - ./submodules/HaRe -- ./submodules/cabal-helper - ansi-terminal-0.8.2 - ansi-wl-pprint-0.6.8.2 - brittany-0.12.1.0 - bytestring-trie-0.2.5.0 +- cabal-helper-1.0.0.0 - cabal-plan-0.5.0.0 +- clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 -- ghc-lib-parser-8.8.1 - ghc-exactprint-0.6.2 # for HaRe +- ghc-lib-parser-8.8.1 - haddock-api-2.22.0 - haskell-lsp-0.19.0.0 - haskell-lsp-types-0.19.0.0 - hie-bios-0.3.2 - hlint-2.2.4 -- hsimport-0.11.0 - hoogle-5.0.17.11 +- hsimport-0.11.0 - lsp-test-0.10.0.0 - monad-dijkstra-0.1.1.2@rev:1 +- parser-combinators-1.2.1 - syz-0.2.0.0 - temporary-1.2.1.1 -- clock-0.7.2 -- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788 flags: haskell-ide-engine: diff --git a/stack.yaml b/stack.yaml index 58ea2bb03..a47bc5b17 100644 --- a/stack.yaml +++ b/stack.yaml @@ -5,16 +5,19 @@ packages: extra-deps: # - ./submodules/HaRe -- ./submodules/cabal-helper -- deque-0.4.3 - ansi-terminal-0.8.2 -- bytestring-trie-0.2.5.0 - ansi-wl-pprint-0.6.8.2 - brittany-0.12.1.0 +- bytestring-trie-0.2.5.0 +- cabal-helper-1.0.0.0 - cabal-plan-0.5.0.0 +- clock-0.7.2 - constrained-dynamic-0.1.0.0 +- deque-0.4.3 +- extra-1.6.18 - floskell-0.10.2 +- ghc-exactprint-0.6.2 # for HaRe - ghc-lib-parser-8.8.1 - haddock-api-2.22.0 - haskell-lsp-0.19.0.0 @@ -24,14 +27,11 @@ extra-deps: - hsimport-0.11.0 - lsp-test-0.10.0.0 - monad-dijkstra-0.1.1.2@rev:1 +- parser-combinators-1.2.1 - syz-0.2.0.0 - temporary-1.2.1.1 -- clock-0.7.2 -- ghc-exactprint-0.6.2 # for HaRe -- extra-1.6.18 - unix-compat-0.5.2 - yaml-0.11.1.2 -- parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788 flags: haskell-ide-engine: diff --git a/submodules/cabal-helper b/submodules/cabal-helper deleted file mode 160000 index 5b6cefdbe..000000000 --- a/submodules/cabal-helper +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5b6cefdbe03ebc4ec6451751fbaba72cab663766