From 31d7c29ab6d71cbac79adc3383b2e61913e81b66 Mon Sep 17 00:00:00 2001 From: LinuxUser404 Date: Mon, 5 Aug 2019 19:52:44 +0300 Subject: [PATCH 1/4] bumped hlint to 2.2.2 --- haskell-ide-engine.cabal | 2 +- stack-8.4.2.yaml | 1 - stack-8.4.3.yaml | 1 - stack-8.4.4.yaml | 1 - stack-8.6.1.yaml | 1 - stack-8.6.2.yaml | 1 - stack-8.6.3.yaml | 1 - stack-8.6.4.yaml | 1 - stack-8.6.5.yaml | 1 - 9 files changed, 1 insertion(+), 9 deletions(-) diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index ed41d77a9..235626e88 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -74,7 +74,7 @@ library , haskell-lsp-types == 0.15.* , haskell-src-exts , hie-plugin-api - , hlint (>= 2.0.11 && < 2.1.18) || >= 2.1.22 + , hlint == 2.2.2 , hoogle >= 5.0.13 , hsimport , hslogger diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 5dee67768..d50bfdbb9 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -23,7 +23,6 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 -- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 353c946bc..d20e80cac 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -23,7 +23,6 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 -- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 0b3baa3bc..d26d47481 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -22,7 +22,6 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 -- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml index 9dc480ccb..fbffb2bb9 100644 --- a/stack-8.6.1.yaml +++ b/stack-8.6.1.yaml @@ -25,7 +25,6 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 -- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml index b57ac5bf4..edfcf0452 100644 --- a/stack-8.6.2.yaml +++ b/stack-8.6.2.yaml @@ -21,7 +21,6 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 -- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml index 0fc3dc998..9ca16a19f 100644 --- a/stack-8.6.3.yaml +++ b/stack-8.6.3.yaml @@ -21,7 +21,6 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 -- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index c8612a809..5b906b933 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -20,7 +20,6 @@ extra-deps: - haskell-lsp-0.15.0.0 - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 -- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 4f4ee7386..e8e123532 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -20,7 +20,6 @@ extra-deps: - haskell-lsp-0.15.0.0 - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 -- hlint-2.2.2 - hsimport-0.10.0 - hoogle-5.0.17.9 - lsp-test-0.6.0.0 From 06cc39cae15a58ac59b4e10b4783446eaf6bc0bc Mon Sep 17 00:00:00 2001 From: LinuxUser404 Date: Mon, 5 Aug 2019 20:45:12 +0300 Subject: [PATCH 2/4] Added hlint-2.2.2 back into the stack files. --- stack-8.4.2.yaml | 3 ++- stack-8.4.3.yaml | 1 + stack-8.4.4.yaml | 1 + stack-8.6.1.yaml | 1 + stack-8.6.2.yaml | 1 + stack-8.6.3.yaml | 1 + stack-8.6.4.yaml | 1 + stack-8.6.5.yaml | 3 ++- 8 files changed, 10 insertions(+), 2 deletions(-) diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index d50bfdbb9..13b68728e 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -10,8 +10,8 @@ extra-deps: - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types -- brittany-0.12.0.0 - base-compat-0.9.3 +- brittany-0.12.0.0 - cabal-plan-0.3.0.0 - constrained-dynamic-0.1.0.0 - floskell-0.10.0 @@ -23,6 +23,7 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 +- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index d20e80cac..353c946bc 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -23,6 +23,7 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 +- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index d26d47481..0b3baa3bc 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -22,6 +22,7 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 +- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml index fbffb2bb9..9dc480ccb 100644 --- a/stack-8.6.1.yaml +++ b/stack-8.6.1.yaml @@ -25,6 +25,7 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 +- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml index edfcf0452..b57ac5bf4 100644 --- a/stack-8.6.2.yaml +++ b/stack-8.6.2.yaml @@ -21,6 +21,7 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 +- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml index 9ca16a19f..0fc3dc998 100644 --- a/stack-8.6.3.yaml +++ b/stack-8.6.3.yaml @@ -21,6 +21,7 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 +- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 5b906b933..c8612a809 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -20,6 +20,7 @@ extra-deps: - haskell-lsp-0.15.0.0 - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 +- hlint-2.2.2 - hoogle-5.0.17.9 - hsimport-0.10.0 - lsp-test-0.6.0.0 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index e8e123532..f23bafeb1 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -20,8 +20,9 @@ extra-deps: - haskell-lsp-0.15.0.0 - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 -- hsimport-0.10.0 +- hlint-2.2.2 - hoogle-5.0.17.9 +- hsimport-0.10.0 - lsp-test-0.6.0.0 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 From ac627d0e6ffc5ef0f3aecd5301ce2485e883349d Mon Sep 17 00:00:00 2001 From: LinuxUser404 Date: Tue, 6 Aug 2019 14:49:07 +0300 Subject: [PATCH 3/4] added hlint dependency condition based on ghc version. --- haskell-ide-engine.cabal | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index 235626e88..13f9643f5 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -74,7 +74,6 @@ library , haskell-lsp-types == 0.15.* , haskell-src-exts , hie-plugin-api - , hlint == 2.2.2 , hoogle >= 5.0.13 , hsimport , hslogger @@ -98,6 +97,11 @@ library , vector , versions , yaml >= 0.8.31 + if impl(ghc < 8.4) + build-depends: hlint >= 2.0.11 && < 2.1.18 + else + build-depends: hlint >= 2.2.2 + ghc-options: -Wall -Wredundant-constraints if flag(pedantic) ghc-options: -Werror From 45187441bb33d0e3311415eb012e199df2bbe32a Mon Sep 17 00:00:00 2001 From: LinuxUser404 Date: Wed, 7 Aug 2019 14:36:17 +0300 Subject: [PATCH 4/4] Reverting stack files changes. --- stack-8.4.2.yaml | 2 +- stack-8.6.5.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 13b68728e..5dee67768 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -10,8 +10,8 @@ extra-deps: - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types -- base-compat-0.9.3 - brittany-0.12.0.0 +- base-compat-0.9.3 - cabal-plan-0.3.0.0 - constrained-dynamic-0.1.0.0 - floskell-0.10.0 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index f23bafeb1..4f4ee7386 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -21,8 +21,8 @@ extra-deps: - haskell-lsp-types-0.15.0.0 - haskell-src-exts-1.21.0 - hlint-2.2.2 -- hoogle-5.0.17.9 - hsimport-0.10.0 +- hoogle-5.0.17.9 - lsp-test-0.6.0.0 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1