From 4bad5b344a135b044abfa37fb588be23637085d3 Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 17 May 2020 23:40:39 +0200 Subject: [PATCH 1/3] Use floskell released version 0.10.3 --- cabal.project | 2 +- stack-8.10.1.yaml | 5 +---- stack-8.6.4.yaml | 2 +- stack-8.6.5.yaml | 2 +- stack-8.8.2.yaml | 2 +- stack-8.8.3.yaml | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cabal.project b/cabal.project index 4b23567f98..f4606f8d50 100644 --- a/cabal.project +++ b/cabal.project @@ -29,4 +29,4 @@ package ghcide write-ghc-environment-files: never -index-state: 2020-05-13T21:21:45Z +index-state: 2020-05-17T20:25:21Z diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml index 4665200055..ce9d352f61 100644 --- a/stack-8.10.1.yaml +++ b/stack-8.10.1.yaml @@ -12,10 +12,7 @@ extra-deps: - github: peti/cabal-plan commit: 894b76c0b6bf8f7d2f881431df1f13959a8fce87 - clock-0.7.2 -# - floskell-0.10.2 -# See https://github.com/ennocramer/floskell/pull/45 -- github: jneira/floskell - commit: 78f888f46dae96922d855af1e6a00ea6bb856987 +- floskell-0.10.3 # - ghcide-0.1.0 - ghc-exactprint-0.6.3 - lens-4.19.1 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 1cb36fefe8..b69b0dfaf7 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -16,7 +16,7 @@ extra-deps: - constrained-dynamic-0.1.0.0 # - ghcide-0.1.0 - extra-1.6.21 -- floskell-0.10.2 +- floskell-0.10.3 - fuzzy-0.1.0.0 - ghc-check-0.3.0.1 - ghc-exactprint-0.6.2 # for HaRe diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index e6da9d6237..c15beacabd 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -14,7 +14,7 @@ extra-deps: - cabal-plan-0.6.2.0 - clock-0.7.2 - extra-1.7.1 -- floskell-0.10.2 +- floskell-0.10.3 - fuzzy-0.1.0.0 # - ghcide-0.1.0 - ghc-check-0.3.0.1 diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index 4b2acdc525..42c038cacb 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -10,7 +10,7 @@ extra-deps: - cabal-helper-1.1.0.0 - clock-0.7.2 - constrained-dynamic-0.1.0.0 -- floskell-0.10.2 +- floskell-0.10.3 # - ghcide-0.1.0 - ghc-check-0.3.0.1 - ghc-lib-parser-8.10.1.20200412 diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index ce8fd7e26c..597c9dfb40 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -10,7 +10,7 @@ extra-deps: - cabal-helper-1.1.0.0 - clock-0.7.2 - constrained-dynamic-0.1.0.0 -- floskell-0.10.2 +- floskell-0.10.3 # - ghcide-0.1.0 - ghc-check-0.3.0.1 - ghc-lib-parser-8.10.1.20200412 From 03f3b93734888f78870ea2ba93772c0b04325d66 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 18 May 2020 22:33:46 +0200 Subject: [PATCH 2/3] Remove floskell git dependency --- cabal.project | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cabal.project b/cabal.project index f4606f8d50..77e059b75f 100644 --- a/cabal.project +++ b/cabal.project @@ -13,12 +13,6 @@ source-repository-package location: https://github.com/peti/cabal-plan tag: 894b76c0b6bf8f7d2f881431df1f13959a8fce87 --- See https://github.com/ennocramer/floskell/pull/45 -source-repository-package - type: git - location: https://github.com/jneira/floskell - tag: 78f888f46dae96922d855af1e6a00ea6bb856987 - tests: true documentation: true From 151944bd61c9b41ef24e67911a43464837439f3e Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 18 May 2020 22:34:17 +0200 Subject: [PATCH 3/3] Add upper bound over ghc-check --- ghcide | 2 +- haskell-language-server.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ghcide b/ghcide index 5ca6556996..0db329a623 160000 --- a/ghcide +++ b/ghcide @@ -1 +1 @@ -Subproject commit 5ca6556996543312e718559eab665fe3b1926b03 +Subproject commit 0db329a62375f086725571aa14e52f7b9f85ac3b diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 16ec322d5e..07c98c0ead 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -152,7 +152,7 @@ executable haskell-language-server -- which works for now. , ghc -------------------------------------------------------------- - , ghc-check >= 0.3.0.1 + , ghc-check >= 0.3.0.1 && < 0.4 , ghc-paths , ghcide , gitrev