From d6d30f8f287da7d1ab9288aef5f9cbc376f6507e Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 17 Nov 2021 09:04:33 +0100 Subject: [PATCH] Use th-extras master and uncomment packages --- stack-9.0.1.yaml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml index 0fbe8b91190..5a20db9350c 100644 --- a/stack-9.0.1.yaml +++ b/stack-9.0.1.yaml @@ -9,7 +9,7 @@ packages: - ./hls-test-utils - ./shake-bench - ./plugins/hls-call-hierarchy-plugin - # - ./plugins/hls-class-plugin + - ./plugins/hls-class-plugin - ./plugins/hls-haddock-comments-plugin - ./plugins/hls-eval-plugin - ./plugins/hls-explicit-imports-plugin @@ -18,9 +18,9 @@ packages: - ./plugins/hls-rename-plugin - ./plugins/hls-retrie-plugin - ./plugins/hls-splice-plugin - # - ./plugins/hls-tactics-plugin - # - ./plugins/hls-brittany-plugin - # - ./plugins/hls-stylish-haskell-plugin + - ./plugins/hls-tactics-plugin + - ./plugins/hls-brittany-plugin + - ./plugins/hls-stylish-haskell-plugin - ./plugins/hls-floskell-plugin - ./plugins/hls-fourmolu-plugin - ./plugins/hls-pragmas-plugin @@ -53,10 +53,9 @@ extra-deps: - lsp-test-0.14.0.1 - sqlite-simple-0.4.18.0 -- github: anka-213/th-extras - commit: 57a97b4df128eb7b360e8ab9c5759392de8d1659 -# https://github.com/mokus0/th-extras/pull/8 -# https://github.com/mokus0/th-extras/issues/7 +- github: mokus0/th-extras + commit: 0d050b24ec5ef37c825b6f28ebd46787191e2a2d +# https://github.com/mokus0/th-extras/issues/10 - github: anka-213/dependent-sum commit: 8cf4c7fbc3bfa2be475a17bb7c94a1e1e9a830b5 @@ -76,7 +75,7 @@ extra-deps: # end of shake-bench dpendencies -# due to floskell-0.10.5 and diagrams-core-1.5.0 +# due to floskell, stylish-haskell, brittany and shake-bench allow-newer: true configure-options: @@ -91,16 +90,19 @@ flags: haskell-language-server: pedantic: true + ignore-plugins-ghc-bounds: true class: false tactic: false # Dependencies fail - stylishHaskell: false brittany: false + retrie: BuildExecutable: false + # Stack doesn't support automatic flags. hls-hlint-plugin: hlint33: true + hyphenation: embed: true