lang/haskell: fix +ghcide

2020-03-31 13:45:32 -04:00 · 2020-03-31 13:45:32 -04:00 · 86506eaa53
commit 86506eaa53
parent ca10445837
2 changed files with 3 additions and 2 deletions
--- a/modules/lang/haskell/+lsp.el
+++ b/modules/lang/haskell/+lsp.el
@ -2,7 +2,7 @@

 (use-package! lsp-haskell
  :after lsp-clients
-  :init (add-hook 'haskell-mode-local-vars #'lsp!)
+  :preface (add-hook 'haskell-mode-local-vars-hook #'lsp!)
  :config
  (when IS-MAC
    (setq lsp-haskell-process-path-hie "hie-wrapper"))
--- a/modules/lang/haskell/packages.el
+++ b/modules/lang/haskell/packages.el
@ -6,7 +6,8 @@
 (when (featurep! +dante)
  (package! dante :pin "4955bc7363")
  (package! attrap :pin "4cf3e4a162"))
-(when (featurep! +lsp)
+(when (or (featurep! +lsp)
+          (featurep! +ghcide))
  (package! lsp-haskell :pin "582fa27c88"))
 ;; DEPRECATED
 (when (featurep! +intero)