From 86506eaa5386f8541c0370b840e2a4947c6015f3 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 31 Mar 2020 13:45:32 -0400 Subject: [PATCH] lang/haskell: fix +ghcide --- modules/lang/haskell/+lsp.el | 2 +- modules/lang/haskell/packages.el | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/lang/haskell/+lsp.el b/modules/lang/haskell/+lsp.el index 16eb89bd6..eb54d0084 100644 --- 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")) diff --git a/modules/lang/haskell/packages.el b/modules/lang/haskell/packages.el index a47cc7ce8..528167c9b 100644 --- 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)