From 2e1ac5d892a5c8a0dfcd80f319d65ccdfca70be9 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 20 Dec 2021 14:34:53 +0100 Subject: [PATCH 1/2] Bump up retrie to 1.2.0.0 --- ghcide/ghcide.cabal | 2 +- plugins/hls-retrie-plugin/hls-retrie-plugin.cabal | 2 +- stack-8.10.6.yaml | 2 +- stack-8.10.7.yaml | 4 ++-- stack-8.6.5.yaml | 2 +- stack-8.8.4.yaml | 2 +- stack-9.0.1.yaml | 2 +- stack.yaml | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index e4095e239d..7ff3a4fb71 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -75,7 +75,7 @@ library prettyprinter-ansi-terminal, prettyprinter, regex-tdfa >= 1.3.1.0, - retrie, + retrie >= 1.2.0.0, rope-utf16-splay, safe, safe-exceptions, diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal index 1f29a77a19..679eac5404 100644 --- a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal +++ b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal @@ -28,7 +28,7 @@ library , hls-plugin-api >=1.1 && <1.3 , lsp , lsp-types - , retrie >=0.1.1.0 + , retrie >=1.2.0.0 , safe-exceptions , stm , text diff --git a/stack-8.10.6.yaml b/stack-8.10.6.yaml index 72997d470d..f361acc306 100644 --- a/stack-8.10.6.yaml +++ b/stack-8.10.6.yaml @@ -50,7 +50,7 @@ extra-deps: - monad-dijkstra-0.1.1.3@sha256:d2fc098d7c122555e726830a12ae0423ac187f89de9228f32e56e2f6fc2238e1,1900 - optparse-applicative-0.15.1.0@sha256:29ff6146aabf54d46c4c8788e8d1eadaea27c94f6d360c690c5f6c93dac4b07e,4810 - refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663 - - retrie-1.0.0.0@sha256:82014773115807f649f60fe4a3246911bbccd063a3c846cf5665e71f237bdd2d,4241 + - retrie-1.2.0.0 - stylish-haskell-0.12.2.0@sha256:38f7fd9ca30c9aad34f176dae4564576899e9c197b6b8557b59c5e8c6a622c74,6108 - stm-containers-1.2@sha256:a887f2e7692b7cf20e0b081e2d66e21076e2bd4b57016ec59c484edfa2d29397,3244 - stm-hamt-1.2.0.6@sha256:fba86ccb4b45c5706c19b0e1315ba63dcac3b5d71de945ec001ba921fae80061,3972 diff --git a/stack-8.10.7.yaml b/stack-8.10.7.yaml index da23ae692a..a921acfe2b 100644 --- a/stack-8.10.7.yaml +++ b/stack-8.10.7.yaml @@ -1,4 +1,4 @@ -# Build plan for GHC 8.10.7. +# Build plan for GHC 8.10.7. # stack-8.10.7.yaml is for install script, stack.yaml is for default builds, keep these identical. # https://github.com/haskell/haskell-language-server/issues/2491 @@ -51,7 +51,7 @@ extra-deps: - monad-dijkstra-0.1.1.3@sha256:d2fc098d7c122555e726830a12ae0423ac187f89de9228f32e56e2f6fc2238e1,1900 - optparse-applicative-0.15.1.0@sha256:29ff6146aabf54d46c4c8788e8d1eadaea27c94f6d360c690c5f6c93dac4b07e,4810 - refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663 - - retrie-1.0.0.0@sha256:82014773115807f649f60fe4a3246911bbccd063a3c846cf5665e71f237bdd2d,4241 + - retrie-1.2.0.0 - stylish-haskell-0.12.2.0@sha256:38f7fd9ca30c9aad34f176dae4564576899e9c197b6b8557b59c5e8c6a622c74,6108 - stm-containers-1.2@sha256:a887f2e7692b7cf20e0b081e2d66e21076e2bd4b57016ec59c484edfa2d29397,3244 - stm-hamt-1.2.0.6@sha256:fba86ccb4b45c5706c19b0e1315ba63dcac3b5d71de945ec001ba921fae80061,3972 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index bf6c913636..ebc7ea6e5b 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -81,7 +81,7 @@ extra-deps: - regex-base-0.94.0.0 - regex-pcre-builtin-0.95.1.1.8.43 - regex-tdfa-1.3.1.0 - - retrie-0.1.1.1 + - retrie-1.2.0.0 - semialign-1.1 - shake-0.19.4 - stylish-haskell-0.12.2.0 diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index f4caf8b6b2..60ec7c8500 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -63,7 +63,7 @@ extra-deps: - opentelemetry-0.6.1 - opentelemetry-extra-0.6.1 - refinery-0.4.0.0 - - retrie-0.1.1.1 + - retrie-1.2.0.0 - semigroups-0.18.5 - shake-0.19.4 - stylish-haskell-0.12.2.0 diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml index cd76d240e3..6d15abaadd 100644 --- a/stack-9.0.1.yaml +++ b/stack-9.0.1.yaml @@ -44,7 +44,7 @@ extra-deps: - implicit-hie-0.1.2.6 - implicit-hie-cradle-0.3.0.5 - monad-dijkstra-0.1.1.3 -- retrie-1.1.0.0 +- retrie-1.2.0.0 - lsp-1.2.0.1 - lsp-types-1.3.0.1 - lsp-test-0.14.0.1 diff --git a/stack.yaml b/stack.yaml index da23ae692a..a921acfe2b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -# Build plan for GHC 8.10.7. +# Build plan for GHC 8.10.7. # stack-8.10.7.yaml is for install script, stack.yaml is for default builds, keep these identical. # https://github.com/haskell/haskell-language-server/issues/2491 @@ -51,7 +51,7 @@ extra-deps: - monad-dijkstra-0.1.1.3@sha256:d2fc098d7c122555e726830a12ae0423ac187f89de9228f32e56e2f6fc2238e1,1900 - optparse-applicative-0.15.1.0@sha256:29ff6146aabf54d46c4c8788e8d1eadaea27c94f6d360c690c5f6c93dac4b07e,4810 - refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663 - - retrie-1.0.0.0@sha256:82014773115807f649f60fe4a3246911bbccd063a3c846cf5665e71f237bdd2d,4241 + - retrie-1.2.0.0 - stylish-haskell-0.12.2.0@sha256:38f7fd9ca30c9aad34f176dae4564576899e9c197b6b8557b59c5e8c6a622c74,6108 - stm-containers-1.2@sha256:a887f2e7692b7cf20e0b081e2d66e21076e2bd4b57016ec59c484edfa2d29397,3244 - stm-hamt-1.2.0.6@sha256:fba86ccb4b45c5706c19b0e1315ba63dcac3b5d71de945ec001ba921fae80061,3972 From 63a3bc92f243909d27030d7dff969fbb2f742ac6 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 20 Dec 2021 14:42:37 +0100 Subject: [PATCH 2/2] Use 1.2.0.0 wjen possible --- ghcide/ghcide.cabal | 2 +- plugins/hls-retrie-plugin/hls-retrie-plugin.cabal | 2 +- stack-8.10.6.yaml | 2 +- stack-8.10.7.yaml | 2 +- stack-8.6.5.yaml | 2 +- stack-8.8.4.yaml | 2 +- stack-9.0.1.yaml | 2 +- stack.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 7ff3a4fb71..e4095e239d 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -75,7 +75,7 @@ library prettyprinter-ansi-terminal, prettyprinter, regex-tdfa >= 1.3.1.0, - retrie >= 1.2.0.0, + retrie, rope-utf16-splay, safe, safe-exceptions, diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal index 679eac5404..1f29a77a19 100644 --- a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal +++ b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal @@ -28,7 +28,7 @@ library , hls-plugin-api >=1.1 && <1.3 , lsp , lsp-types - , retrie >=1.2.0.0 + , retrie >=0.1.1.0 , safe-exceptions , stm , text diff --git a/stack-8.10.6.yaml b/stack-8.10.6.yaml index f361acc306..ea66f0028e 100644 --- a/stack-8.10.6.yaml +++ b/stack-8.10.6.yaml @@ -50,7 +50,7 @@ extra-deps: - monad-dijkstra-0.1.1.3@sha256:d2fc098d7c122555e726830a12ae0423ac187f89de9228f32e56e2f6fc2238e1,1900 - optparse-applicative-0.15.1.0@sha256:29ff6146aabf54d46c4c8788e8d1eadaea27c94f6d360c690c5f6c93dac4b07e,4810 - refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663 - - retrie-1.2.0.0 + - retrie-1.1.0.0 - stylish-haskell-0.12.2.0@sha256:38f7fd9ca30c9aad34f176dae4564576899e9c197b6b8557b59c5e8c6a622c74,6108 - stm-containers-1.2@sha256:a887f2e7692b7cf20e0b081e2d66e21076e2bd4b57016ec59c484edfa2d29397,3244 - stm-hamt-1.2.0.6@sha256:fba86ccb4b45c5706c19b0e1315ba63dcac3b5d71de945ec001ba921fae80061,3972 diff --git a/stack-8.10.7.yaml b/stack-8.10.7.yaml index a921acfe2b..cac325463c 100644 --- a/stack-8.10.7.yaml +++ b/stack-8.10.7.yaml @@ -51,7 +51,7 @@ extra-deps: - monad-dijkstra-0.1.1.3@sha256:d2fc098d7c122555e726830a12ae0423ac187f89de9228f32e56e2f6fc2238e1,1900 - optparse-applicative-0.15.1.0@sha256:29ff6146aabf54d46c4c8788e8d1eadaea27c94f6d360c690c5f6c93dac4b07e,4810 - refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663 - - retrie-1.2.0.0 + - retrie-1.1.0.0 - stylish-haskell-0.12.2.0@sha256:38f7fd9ca30c9aad34f176dae4564576899e9c197b6b8557b59c5e8c6a622c74,6108 - stm-containers-1.2@sha256:a887f2e7692b7cf20e0b081e2d66e21076e2bd4b57016ec59c484edfa2d29397,3244 - stm-hamt-1.2.0.6@sha256:fba86ccb4b45c5706c19b0e1315ba63dcac3b5d71de945ec001ba921fae80061,3972 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index ebc7ea6e5b..bf6c913636 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -81,7 +81,7 @@ extra-deps: - regex-base-0.94.0.0 - regex-pcre-builtin-0.95.1.1.8.43 - regex-tdfa-1.3.1.0 - - retrie-1.2.0.0 + - retrie-0.1.1.1 - semialign-1.1 - shake-0.19.4 - stylish-haskell-0.12.2.0 diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index 60ec7c8500..0954312fab 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -63,7 +63,7 @@ extra-deps: - opentelemetry-0.6.1 - opentelemetry-extra-0.6.1 - refinery-0.4.0.0 - - retrie-1.2.0.0 + - retrie-1.1.0.0 - semigroups-0.18.5 - shake-0.19.4 - stylish-haskell-0.12.2.0 diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml index 6d15abaadd..cd76d240e3 100644 --- a/stack-9.0.1.yaml +++ b/stack-9.0.1.yaml @@ -44,7 +44,7 @@ extra-deps: - implicit-hie-0.1.2.6 - implicit-hie-cradle-0.3.0.5 - monad-dijkstra-0.1.1.3 -- retrie-1.2.0.0 +- retrie-1.1.0.0 - lsp-1.2.0.1 - lsp-types-1.3.0.1 - lsp-test-0.14.0.1 diff --git a/stack.yaml b/stack.yaml index a921acfe2b..cac325463c 100644 --- a/stack.yaml +++ b/stack.yaml @@ -51,7 +51,7 @@ extra-deps: - monad-dijkstra-0.1.1.3@sha256:d2fc098d7c122555e726830a12ae0423ac187f89de9228f32e56e2f6fc2238e1,1900 - optparse-applicative-0.15.1.0@sha256:29ff6146aabf54d46c4c8788e8d1eadaea27c94f6d360c690c5f6c93dac4b07e,4810 - refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663 - - retrie-1.2.0.0 + - retrie-1.1.0.0 - stylish-haskell-0.12.2.0@sha256:38f7fd9ca30c9aad34f176dae4564576899e9c197b6b8557b59c5e8c6a622c74,6108 - stm-containers-1.2@sha256:a887f2e7692b7cf20e0b081e2d66e21076e2bd4b57016ec59c484edfa2d29397,3244 - stm-hamt-1.2.0.6@sha256:fba86ccb4b45c5706c19b0e1315ba63dcac3b5d71de945ec001ba921fae80061,3972