From e53b22104b258e58af67c950c913936a773c7f6f Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Mon, 21 Oct 2019 21:32:26 +0100 Subject: [PATCH 1/3] Bump resolvers and deps brittany-0.12.1 floskell-0.10.1 hlint-2.2.3 hsimport-0.11.0 --- stack-8.4.2.yaml | 14 +++++++------- stack-8.4.3.yaml | 14 +++++++------- stack-8.4.4.yaml | 14 +++++++------- stack-8.6.1.yaml | 18 ++++++++++-------- stack-8.6.2.yaml | 18 ++++++++++-------- stack-8.6.3.yaml | 14 +++++++------- stack-8.6.4.yaml | 14 +++++++------- stack-8.6.5.yaml | 22 +++++++++------------- stack.yaml | 12 ++++++------ 9 files changed, 70 insertions(+), 70 deletions(-) diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index f1aa155a8..f7d20a309 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -10,22 +10,22 @@ extra-deps: - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types -- brittany-0.12.0.0 +- brittany-0.12.1.0 - base-compat-0.9.3 - cabal-plan-0.3.0.0 - constrained-dynamic-0.1.0.0 -- floskell-0.10.0 +- floskell-0.10.1 - ghc-exactprint-0.5.8.2 -- ghc-lib-parser-8.8.0.20190723 +- ghc-lib-parser-8.8.1 - haddock-api-2.20.0 - haddock-library-1.6.0 - haskell-lsp-0.17.0.0 - haskell-lsp-types-0.17.0.0 -- haskell-src-exts-1.21.0 +- haskell-src-exts-1.21.1 - haskell-src-exts-util-0.2.5 -- hlint-2.2.2 -- hoogle-5.0.17.9 -- hsimport-0.10.0 +- hlint-2.2.3 +- hoogle-5.0.17.11 +- hsimport-0.11.0 - lsp-test-0.8.0.0 - monad-dijkstra-0.1.1.2 - pretty-show-1.8.2 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 959961048..728ba2efd 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -11,21 +11,21 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - base-compat-0.9.3 -- brittany-0.12.0.0 +- brittany-0.12.1.0 - cabal-plan-0.3.0.0 - constrained-dynamic-0.1.0.0 -- floskell-0.10.0 +- floskell-0.10.1 - ghc-exactprint-0.5.8.2 -- ghc-lib-parser-8.8.0.20190723 +- ghc-lib-parser-8.8.1 - haddock-api-2.20.0 - haddock-library-1.6.0 - haskell-lsp-0.17.0.0 - haskell-lsp-types-0.17.0.0 -- haskell-src-exts-1.21.0 +- haskell-src-exts-1.21.1 - haskell-src-exts-util-0.2.5 -- hlint-2.2.2 -- hoogle-5.0.17.9 -- hsimport-0.10.0 +- hlint-2.2.3 +- hoogle-5.0.17.11 +- hsimport-0.11.0 - lsp-test-0.8.0.0 - monad-dijkstra-0.1.1.2 - pretty-show-1.8.2 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 99b74e812..05258f8d0 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -10,21 +10,21 @@ extra-deps: - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types -- brittany-0.12.0.0 +- brittany-0.12.1.0 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 -- floskell-0.10.0 +- floskell-0.10.1 - ghc-exactprint-0.5.8.2 -- ghc-lib-parser-8.8.0.20190723 +- ghc-lib-parser-8.8.1 - haddock-api-2.20.0 - haddock-library-1.6.0 - haskell-lsp-0.17.0.0 - haskell-lsp-types-0.17.0.0 -- haskell-src-exts-1.21.0 +- haskell-src-exts-1.21.1 - haskell-src-exts-util-0.2.5 -- hlint-2.2.2 -- hoogle-5.0.17.9 -- hsimport-0.10.0 +- hlint-2.2.3 +- hoogle-5.0.17.11 +- hsimport-0.11.0 - lsp-test-0.8.0.0 - monad-dijkstra-0.1.1.2 - optparse-simple-0.1.0 diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml index 404751b15..08b24e7be 100644 --- a/stack-8.6.1.yaml +++ b/stack-8.6.1.yaml @@ -11,23 +11,24 @@ extra-deps: - ./submodules/ghc-mod/ghc-project-types - apply-refact-0.6.0.0 -- brittany-0.12.0.0 -- butcher-1.3.2.1 +- brittany-0.12.1.0 +- butcher-1.3.2.3 - cabal-install-2.4.0.0 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 - czipwith-1.0.1.1 - data-tree-print-0.1.0.2 -- floskell-0.10.0 -- ghc-lib-parser-8.8.0.20190723 +- deque-0.4.3 +- floskell-0.10.1 +- ghc-lib-parser-8.8.1 - haddock-api-2.21.0 - haskell-lsp-0.17.0.0 - haskell-lsp-types-0.17.0.0 -- haskell-src-exts-1.21.0 +- haskell-src-exts-1.21.1 - haskell-src-exts-util-0.2.5 -- hlint-2.2.2 -- hoogle-5.0.17.9 -- hsimport-0.10.0 +- hlint-2.2.3 +- hoogle-5.0.17.11 +- hsimport-0.11.0 - lsp-test-0.8.0.0 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 @@ -36,6 +37,7 @@ extra-deps: - 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 # To make build work in windows 7 diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml index a8be3341d..8228d8591 100644 --- a/stack-8.6.2.yaml +++ b/stack-8.6.2.yaml @@ -10,25 +10,27 @@ extra-deps: - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types -- brittany-0.12.0.0 -- butcher-1.3.2.1 +- brittany-0.12.1.0 +- butcher-1.3.2.3 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 -- floskell-0.10.0 -- ghc-lib-parser-8.8.0.20190723 +- deque-0.4.3 +- floskell-0.10.1 +- ghc-lib-parser-8.8.1 - haddock-api-2.21.0 - haskell-lsp-0.17.0.0 - haskell-lsp-types-0.17.0.0 -- haskell-src-exts-1.21.0 +- haskell-src-exts-1.21.1 - haskell-src-exts-util-0.2.5 -- hlint-2.2.2 -- hoogle-5.0.17.9 -- hsimport-0.10.0 +- hlint-2.2.3 +- hoogle-5.0.17.11 +- hsimport-0.11.0 - lsp-test-0.8.0.0 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 - multistate-0.8.0.1 - rope-utf16-splay-0.3.1.0 +- strict-list-0.1.5 - syz-0.2.0.0 - temporary-1.2.1.1 # To make build work in windows 7 diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml index f5fe0c1d1..a7d8a85c2 100644 --- a/stack-8.6.3.yaml +++ b/stack-8.6.3.yaml @@ -10,20 +10,20 @@ extra-deps: - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types -- brittany-0.12.0.0 +- brittany-0.12.1.0 - butcher-1.3.2.1 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 -- floskell-0.10.0 -- ghc-lib-parser-8.8.0.20190723 +- floskell-0.10.1 +- ghc-lib-parser-8.8.1 - haddock-api-2.21.0 - haskell-lsp-0.17.0.0 - haskell-lsp-types-0.17.0.0 -- haskell-src-exts-1.21.0 +- haskell-src-exts-1.21.1 - haskell-src-exts-util-0.2.5 -- hlint-2.2.2 -- hoogle-5.0.17.9 -- hsimport-0.10.0 +- hlint-2.2.3 +- hoogle-5.0.17.11 +- hsimport-0.11.0 - lsp-test-0.8.0.0 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 7b702e00f..adea017a2 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -10,19 +10,19 @@ extra-deps: - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types -- brittany-0.12.0.0 +- brittany-0.12.1.0 - butcher-1.3.2.1 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 -- floskell-0.10.0 -- ghc-lib-parser-8.8.0.20190723 +- floskell-0.10.1 +- ghc-lib-parser-8.8.1 - haddock-api-2.22.0 - haskell-lsp-0.17.0.0 - haskell-lsp-types-0.17.0.0 -- haskell-src-exts-1.21.0 -- hlint-2.2.2 -- hoogle-5.0.17.9 -- hsimport-0.10.0 +- haskell-src-exts-1.21.1 +- hlint-2.2.3 +- hoogle-5.0.17.11 +- hsimport-0.11.0 - lsp-test-0.8.0.0 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 51c065f4b..3bf0af29f 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -1,4 +1,4 @@ -resolver: lts-13.30 +resolver: lts-14.11 packages: - . - hie-plugin-api @@ -10,27 +10,23 @@ extra-deps: - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types -- brittany-0.12.0.0 -- butcher-1.3.2.1 +- ansi-terminal-0.8.2 +- ansi-wl-pprint-0.6.8.2 +- brittany-0.12.1.0 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 -- floskell-0.10.0 -- ghc-lib-parser-8.8.0.20190723 +- floskell-0.10.1 +- ghc-lib-parser-8.8.1 - haddock-api-2.22.0 - haskell-lsp-0.17.0.0 - haskell-lsp-types-0.17.0.0 -- haskell-src-exts-1.21.0 -- hlint-2.2.2 -- hsimport-0.10.0 -- hoogle-5.0.17.9 +- hlint-2.2.3 +- hsimport-0.11.0 +- hoogle-5.0.17.11 - lsp-test-0.8.0.0 - monad-dijkstra-0.1.1.2@rev:1 -- monad-memo-0.4.1 -- multistate-0.8.0.1 -- rope-utf16-splay-0.3.1.0 - syz-0.2.0.0 - temporary-1.2.1.1 -- yaml-0.8.32 flags: haskell-ide-engine: diff --git a/stack.yaml b/stack.yaml index 465c436b1..a5db7b88e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2019-07-31 # GHC 8.6.5 +resolver: nightly-2019-09-21 # Last GHC 8.6.5 packages: - . - hie-plugin-api @@ -12,21 +12,21 @@ extra-deps: - ansi-terminal-0.8.2 - ansi-wl-pprint-0.6.8.2 -- brittany-0.12.0.0 +- brittany-0.12.1.0 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 - floskell-0.10.1 -- ghc-lib-parser-8.8.0.20190723 +- ghc-lib-parser-8.8.1 - haddock-api-2.22.0 - haskell-lsp-0.17.0.0 - haskell-lsp-types-0.17.0.0 -- hlint-2.2.2 -- hsimport-0.10.0 +- hlint-2.2.3 +- hsimport-0.11.0 - lsp-test-0.8.0.0 - monad-dijkstra-0.1.1.2@rev:1 - syz-0.2.0.0 - temporary-1.2.1.1 -- yaml-0.8.32 +# - yaml-0.8.32 flags: haskell-ide-engine: From 41cfce08b7758c4f6be75790423c8fe071510658 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Mon, 21 Oct 2019 21:55:03 +0100 Subject: [PATCH 2/3] Clean up comment from yaml file --- stack.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index a5db7b88e..0acbf41fa 100644 --- a/stack.yaml +++ b/stack.yaml @@ -26,7 +26,6 @@ extra-deps: - monad-dijkstra-0.1.1.2@rev:1 - syz-0.2.0.0 - temporary-1.2.1.1 -# - yaml-0.8.32 flags: haskell-ide-engine: From 627bf2d797aab5c38210835074f787b58d1f47a7 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Tue, 22 Oct 2019 17:57:35 +0100 Subject: [PATCH 3/3] Prevent CircleCI OOM on "Install Hoogle" step --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 362d70112..0858f26e8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ defaults: &defaults - run: name: Install Hoogle - command: stack --stack-yaml=${STACK_FILE} install hoogle + command: stack -j 1 --stack-yaml=${STACK_FILE} install hoogle - run: name: Build (we need the exe for tests)