From fe0dcee4edc4c16269ac014fdedad8e7b883ce34 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Sun, 27 Jan 2019 22:49:18 +0200 Subject: [PATCH] WIP on bringing in hlint 2.1.13 Blocked on hoogle 5.0.17.4 not exporting new types. See https://github.com/ndmitchell/hoogle/issues/285 --- cabal.project | 5 +++++ haskell-ide-engine.cabal | 3 ++- stack-8.2.2.yaml | 2 +- stack-8.4.2.yaml | 4 ++-- stack-8.4.3.yaml | 2 +- stack-8.4.4.yaml | 2 +- stack-8.6.1.yaml | 2 +- stack-8.6.2.yaml | 2 +- stack-8.6.3.yaml | 24 ++++++++++++++---------- stack.yaml | 7 +++++-- submodules/ghc-mod | 2 +- 11 files changed, 34 insertions(+), 21 deletions(-) diff --git a/cabal.project b/cabal.project index ddeb48ff..109b648d 100644 --- a/cabal.project +++ b/cabal.project @@ -7,3 +7,8 @@ packages: ./submodules/cabal-helper/ ./submodules/ghc-mod/ ./submodules/ghc-mod/core/ + +allow-newer:ghc-mod-5.9.0.0:haskell-src-exts +allow-newer:ghc-mod-core-5.9.0.0:haskell-src-exts +allow-newer:HaRe-0.8.4.1:haskell-src-exts +allow-newer:hsimport-0.8.6:haskell-src-exts \ No newline at end of file diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index 54bbd95f..0f792e14 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -71,7 +71,8 @@ library , haskell-lsp >= 0.8 , haskell-src-exts , hie-plugin-api - , hlint >= 2.0.11 + -- , hlint >= 2.0.11 + , hlint >= 2.1.13 , hoogle >= 5.0.13 , hsimport , hslogger diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml index 378f3db1..a217aa75 100644 --- a/stack-8.2.2.yaml +++ b/stack-8.2.2.yaml @@ -21,7 +21,7 @@ extra-deps: - haddock-library-1.4.4 - haskell-lsp-0.8.0.1 - haskell-lsp-types-0.8.0.1 -- hsimport-0.8.6 +- hsimport-0.8.8 - lsp-test-0.5.0.2 - pretty-show-1.8.2 - sorted-list-0.2.1.0 diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 8525d5a8..4245afe0 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -19,8 +19,8 @@ extra-deps: - haddock-library-1.6.0 - haskell-lsp-0.8.0.1 - haskell-lsp-types-0.8.0.1 -- hlint-2.1.8 -- hsimport-0.8.6 +- hlint-2.1.13 +- hsimport-0.8.8 - lsp-test-0.5.0.2 - pretty-show-1.8.2 - syz-0.2.0.0 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index c33a5bcb..6e8e2748 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -18,7 +18,7 @@ extra-deps: - haddock-library-1.6.0 - haskell-lsp-0.8.0.1 - haskell-lsp-types-0.8.0.1 -- hsimport-0.8.6 +- hsimport-0.8.8 - lsp-test-0.5.0.2 - pretty-show-1.8.2 - syz-0.2.0.0 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 2a02616b..219e11a3 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -18,7 +18,7 @@ extra-deps: - haddock-library-1.6.0 - haskell-lsp-0.8.0.1 - haskell-lsp-types-0.8.0.1 -- hsimport-0.8.6 +- hsimport-0.8.8 - lsp-test-0.5.0.2 - optparse-simple-0.1.0 - pretty-show-1.9.5 diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml index bf75919a..bd5ee632 100644 --- a/stack-8.6.1.yaml +++ b/stack-8.6.1.yaml @@ -20,7 +20,7 @@ extra-deps: - haddock-api-2.21.0 - haskell-lsp-0.8.0.1 - haskell-lsp-types-0.8.0.1 -- hsimport-0.8.6 +- hsimport-0.8.8 - lsp-test-0.5.0.2 - monad-memo-0.4.1 - monoid-subclasses-0.4.6.1 diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml index 9661c7ae..7b8a4aef 100644 --- a/stack-8.6.2.yaml +++ b/stack-8.6.2.yaml @@ -14,7 +14,7 @@ extra-deps: - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 - haddock-api-2.21.0 -- hsimport-0.8.6 +- hsimport-0.8.8 - lsp-test-0.5.0.2 - monad-memo-0.4.1 - multistate-0.8.0.1 diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml index 0c699deb..cc68ee01 100644 --- a/stack-8.6.3.yaml +++ b/stack-8.6.3.yaml @@ -10,16 +10,20 @@ extra-deps: - ./submodules/ghc-mod - ./submodules/ghc-mod/core -- butcher-1.3.2.1 -- cabal-plan-0.4.0.0 -- constrained-dynamic-0.1.0.0 -- haddock-api-2.21.0 -- hsimport-0.8.6 -- monad-memo-0.4.1 -- multistate-0.8.0.1 -- syz-0.2.0.0 -- temporary-1.2.1.1 -- yaml-0.8.32 +- hlint-2.1.13 +- hsimport-0.8.8 + +# - haskell-src-exts-1.21.0 +# - monad-memo-0.4.1 +# - multistate-0.8.0.1 +# - 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 49a4ea91..15c0493f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2018-12-31 # GHC 8.6.3 +resolver: nightly-2019-01-27 # GHC 8.6.3 packages: - . - hie-plugin-api @@ -14,7 +14,10 @@ extra-deps: - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 - haddock-api-2.21.0 -- hsimport-0.8.6 +- haskell-src-exts-1.21.0 +- hlint-2.1.13 +- hsimport-0.8.8 +- hoogle-5.0.17.4 - monad-memo-0.4.1 - multistate-0.8.0.1 - optparse-simple-0.1.0 diff --git a/submodules/ghc-mod b/submodules/ghc-mod index 4ec12838..b2053675 160000 --- a/submodules/ghc-mod +++ b/submodules/ghc-mod @@ -1 +1 @@ -Subproject commit 4ec1283866546a4c752bcbbf1e502d04f8817f3e +Subproject commit b20536757f34769c6fe4478f13b71a55c9ae582e