From 1bd4bb859d6d67f200d4d7bbe90404ae4dbd806d Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 1 Feb 2021 22:36:52 +0100 Subject: [PATCH 1/3] Bump up version of hls-hlint-plugin to 0.2.0 --- plugins/hls-hlint-plugin/hls-hlint-plugin.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal index c814cdccf5..42fbfd4089 100644 --- a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal +++ b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: hls-hlint-plugin -version: 0.1.0.0 +version: 0.2.0.0 synopsis: Hlint integration plugin with Haskell Language Server description: Please see Haskell Language Server Readme (https://github.com/haskell/haskell-language-server#readme) license: Apache-2.0 @@ -39,11 +39,11 @@ library , extra , filepath , ghc-exactprint - , ghcide + , ghcide >=0.7.2.0 , hashable , haskell-lsp , hlint >=3.2 - , hls-plugin-api + , hls-plugin-api >=0.7.0.0 , hslogger , lens , regex-tdfa From 990c392a09c562ff188d79e46a27c0779c69bf55 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 2 Feb 2021 21:30:00 +0100 Subject: [PATCH 2/3] Use ghc-exactprint-0.6.3.4 --- cabal.project | 7 +------ plugins/hls-hlint-plugin/hls-hlint-plugin.cabal | 2 +- stack-8.10.1.yaml | 4 +--- stack-8.10.2.yaml | 3 +-- stack-8.10.3.yaml | 3 +-- stack-8.6.4.yaml | 4 +--- stack-8.6.5.yaml | 4 +--- stack-8.8.2.yaml | 4 +--- stack-8.8.3.yaml | 4 +--- stack-8.8.4.yaml | 4 +--- stack.yaml | 4 +--- 11 files changed, 11 insertions(+), 32 deletions(-) diff --git a/cabal.project b/cabal.project index 8c014dd2e4..98e368b306 100644 --- a/cabal.project +++ b/cabal.project @@ -13,11 +13,6 @@ packages: ./plugins/hls-haddock-comments-plugin ./plugins/hls-splice-plugin -source-repository-package - type: git - location: https://github.com/alanz/ghc-exactprint.git - tag: 6748e24da18a6cea985d20cc3e1e7920cb743795 - tests: true package * @@ -30,7 +25,7 @@ package ghcide write-ghc-environment-files: never -index-state: 2021-01-28T17:47:48Z +index-state: 2021-02-01T23:05:09Z allow-newer: active:base, diff --git a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal index 42fbfd4089..9099bcec2d 100644 --- a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal +++ b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal @@ -38,7 +38,7 @@ library , directory , extra , filepath - , ghc-exactprint + , ghc-exactprint >=0.6.3.4 , ghcide >=0.7.2.0 , hashable , haskell-lsp diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml index 2bf2956342..18aea7c9fc 100644 --- a/stack-8.10.1.yaml +++ b/stack-8.10.1.yaml @@ -26,9 +26,7 @@ extra-deps: - data-tree-print-0.1.0.2@rev:2 - floskell-0.10.4 - fourmolu-0.3.0.0 - # - ghc-exactprint-0.6.3.3 - - git: https://github.com/alanz/ghc-exactprint.git - commit: 6748e24da18a6cea985d20cc3e1e7920cb743795 + - ghc-exactprint-0.6.3.4 - ghc-lib-8.10.3.20201220 - ghc-lib-parser-8.10.3.20201220 - haskell-lsp-0.23.0.0 diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml index 9fd23383f3..1690a0175a 100644 --- a/stack-8.10.2.yaml +++ b/stack-8.10.2.yaml @@ -26,8 +26,7 @@ extra-deps: - data-tree-print-0.1.0.2@rev:2 - floskell-0.10.4 - fourmolu-0.3.0.0 - - git: https://github.com/alanz/ghc-exactprint.git - commit: 6748e24da18a6cea985d20cc3e1e7920cb743795 + - ghc-exactprint-0.6.3.4 - ghc-lib-8.10.3.20201220 - ghc-lib-parser-8.10.3.20201220 - haskell-lsp-0.23.0.0 diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml index d57488b4f4..cbdaa33ee7 100644 --- a/stack-8.10.3.yaml +++ b/stack-8.10.3.yaml @@ -26,8 +26,7 @@ extra-deps: - data-tree-print-0.1.0.2@rev:2 - floskell-0.10.4 - fourmolu-0.3.0.0 - - git: https://github.com/alanz/ghc-exactprint.git - commit: 6748e24da18a6cea985d20cc3e1e7920cb743795 + - ghc-exactprint-0.6.3.4 - heapsize-0.3.0 - implicit-hie-cradle-0.3.0.2 - implicit-hie-0.1.2.5 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index a85ad83394..48e3a13c38 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -35,9 +35,7 @@ extra-deps: - fuzzy-0.1.0.0 - ghc-check-0.5.0.1 - ghc-events-0.13.0 - # - ghc-exactprint-0.6.3.3 - - git: https://github.com/alanz/ghc-exactprint.git - commit: 6748e24da18a6cea985d20cc3e1e7920cb743795 + - ghc-exactprint-0.6.3.4 - ghc-lib-8.10.3.20201220 - ghc-lib-parser-8.10.3.20201220 - ghc-lib-parser-ex-8.10.0.17 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 1dfd1bcfaa..de10dea95c 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -34,9 +34,7 @@ extra-deps: - fuzzy-0.1.0.0 - ghc-check-0.5.0.1 - ghc-events-0.13.0 - # - ghc-exactprint-0.6.3.3 - - git: https://github.com/alanz/ghc-exactprint.git - commit: 6748e24da18a6cea985d20cc3e1e7920cb743795 + - ghc-exactprint-0.6.3.4 - ghc-lib-8.10.3.20201220 - ghc-lib-parser-8.10.3.20201220 - ghc-lib-parser-ex-8.10.0.17 diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index 393940a5d5..fe7eb81284 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -30,9 +30,7 @@ extra-deps: - fourmolu-0.3.0.0 - ghc-check-0.5.0.1 - ghc-events-0.13.0 - # - ghc-exactprint-0.6.3.3 - - git: https://github.com/alanz/ghc-exactprint.git - commit: 6748e24da18a6cea985d20cc3e1e7920cb743795 + - ghc-exactprint-0.6.3.4 - ghc-lib-8.10.3.20201220 - ghc-lib-parser-8.10.3.20201220 - ghc-lib-parser-ex-8.10.0.17 diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index 3002b7aa4e..bd196b7a13 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -28,9 +28,7 @@ extra-deps: - constrained-dynamic-0.1.0.0 - floskell-0.10.4 - fourmolu-0.3.0.0 - # - ghc-exactprint-0.6.3.3 - - git: https://github.com/alanz/ghc-exactprint.git - commit: 6748e24da18a6cea985d20cc3e1e7920cb743795 + - ghc-exactprint-0.6.3.4 - ghc-lib-8.10.3.20201220 - ghc-lib-parser-8.10.3.20201220 - ghc-trace-events-0.1.2.1 diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index 228636de76..7d92021668 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -28,9 +28,7 @@ extra-deps: - constrained-dynamic-0.1.0.0 - floskell-0.10.4 - fourmolu-0.3.0.0 - # - ghc-exactprint-0.6.3.3 - - git: https://github.com/alanz/ghc-exactprint.git - commit: 6748e24da18a6cea985d20cc3e1e7920cb743795 + - ghc-exactprint-0.6.3.4 - ghc-lib-8.10.3.20201220 - ghc-lib-parser-8.10.3.20201220 - ghc-trace-events-0.1.2.1 diff --git a/stack.yaml b/stack.yaml index 1ae4a1fd92..e63af8a734 100644 --- a/stack.yaml +++ b/stack.yaml @@ -36,9 +36,7 @@ extra-deps: - fuzzy-0.1.0.0 - ghc-check-0.5.0.1 - ghc-events-0.13.0 - # - ghc-exactprint-0.6.3.3 - - git: https://github.com/alanz/ghc-exactprint.git - commit: 6748e24da18a6cea985d20cc3e1e7920cb743795 + - ghc-exactprint-0.6.3.4 - ghc-lib-8.10.3.20201220 - ghc-lib-parser-8.10.3.20201220 - ghc-lib-parser-ex-8.10.0.17 From 8c386f266becdc10eba7740d24259d734e28da32 Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 3 Feb 2021 12:44:48 +0100 Subject: [PATCH 3/3] Update hackage index to get mmorph revision --- cabal.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index 98e368b306..51c92afb7c 100644 --- a/cabal.project +++ b/cabal.project @@ -25,7 +25,7 @@ package ghcide write-ghc-environment-files: never -index-state: 2021-02-01T23:05:09Z +index-state: 2021-02-03T00:50:21Z allow-newer: active:base,