diff --git a/modules/lang/haskell/config.el b/modules/lang/haskell/config.el index 07898eaf1..515a7c00b 100644 --- a/modules/lang/haskell/config.el +++ b/modules/lang/haskell/config.el @@ -3,7 +3,8 @@ (after! projectile (add-to-list 'projectile-project-root-files "stack.yaml")) -(cond ((featurep! +intero) (load! "+intero")) +;; TODO ghcide? +(cond ((featurep! +intero) (load! "+intero")) ; DEPRECATED ((featurep! +dante) (load! "+dante")) ((featurep! +lsp) (load! "+lsp"))) diff --git a/modules/lang/haskell/doctor.el b/modules/lang/haskell/doctor.el index 9dcb7fc7d..30e023631 100644 --- a/modules/lang/haskell/doctor.el +++ b/modules/lang/haskell/doctor.el @@ -16,5 +16,3 @@ (when (or (featurep! +dante) (featurep! +intero)) (unless (executable-find "hlint") (warn! "Couldn't find hlint. Flycheck may have issues in haskell-mode"))) - - diff --git a/modules/lang/haskell/packages.el b/modules/lang/haskell/packages.el index b2fd48e5e..2a5329c89 100644 --- a/modules/lang/haskell/packages.el +++ b/modules/lang/haskell/packages.el @@ -6,7 +6,7 @@ (cond ((featurep! +dante) (package! dante) (package! attrap)) - ((featurep! +intero) - (package! intero)) ((featurep! +lsp) - (package! lsp-haskell))) + (package! lsp-haskell)) + ((featurep! +intero) ; DEPRECATED + (package! intero)))