Merge pull request #116 from jneira/floskell-release

jneira · web-flow · commit 67d6a17b1544 · 2020-05-19T07:27:37.000+02:00
Use floskell released version 0.10.3
diff --git 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
 
@@ -29,4 +23,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/ghcide b/ghcide
@@ -1 +1 @@
-Subproject commit 5ca6556996543312e718559eab665fe3b1926b03
+Subproject commit 0db329a62375f086725571aa14e52f7b9f85ac3b
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
