feat(xan): Use haskell-language-server
Use haskell-language-server instead of haskell-ide-engine for Xanthous. Change-Id: I7ef1433d5cd561e659fc06b3f373a6f29dfa5690 Reviewed-on: https://cl.tvl.fyi/c/depot/+/904 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: BuildkiteCI
This commit is contained in:
parent
64ce8522fe
commit
6480a81c16
6 changed files with 17 additions and 37 deletions
|
@ -689,12 +689,6 @@
|
|||
(add-to-list #'company-backends #'company-lsp)
|
||||
(setq company-lsp-async t))
|
||||
|
||||
(use-package! lsp-treemacs
|
||||
:config
|
||||
(map! :map lsp-mode-map
|
||||
(:leader
|
||||
"c X" #'lsp-treemacs-errors-list)))
|
||||
|
||||
(use-package! dap-mode)
|
||||
|
||||
(defun +grfn/haskell-mode-setup ()
|
||||
|
@ -728,11 +722,10 @@
|
|||
;; :hook
|
||||
;; (haskell-mode . lsp-haskell-enable)
|
||||
:config
|
||||
(add-hook 'haskell-mode-hook #'+grfn/haskell-mode-setup 't)
|
||||
(setq
|
||||
;; lsp-haskell-process-path-hie "/home/griffin/.nix-profile/bin/hie-8.6.5"
|
||||
(setq lsp-haskell-process-path-hie "haskell-language-server-wrapper"
|
||||
lsp-haskell-process-args-hie
|
||||
'("-d" "-l" "/tmp/hie.log" "+RTS" "-M4G" "-H1G" "-K4G" "-A16M" "-RTS")))
|
||||
'("-d" "-l" "/tmp/hie.log" "+RTS" "-M4G" "-H1G" "-K4G" "-A16M" "-RTS"))
|
||||
(add-hook 'haskell-mode-hook #'+grfn/haskell-mode-setup 't))
|
||||
|
||||
(use-package! lsp-imenu
|
||||
:after (lsp-mode lsp-ui)
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
{ pkgs ? (import ../../../. {}).third_party }:
|
||||
|
||||
let
|
||||
all-hies = (fetchTarball {
|
||||
url = "https://github.com/infinisil/all-hies/archive/eff5d9a5e1a84150014095494331cf63e59923af.tar.gz";
|
||||
sha256 = "19bws9fyjhgiikig86cri05fxz1wrz60n69zrigq5wzbyn4hwv9h";
|
||||
});
|
||||
|
||||
sources = import "${all-hies}/sources.nix";
|
||||
build = import "${all-hies}/build.nix";
|
||||
|
||||
in (build {
|
||||
glibcName = pkgs.glibc.name;
|
||||
inherit sources;
|
||||
ghcVersion = "8.8.3";
|
||||
}).combined
|
|
@ -1,6 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1
|
||||
|
||||
exec nix-shell --run "$(nix-build -o dist/bin/hie hie.nix)/bin/hie $*"
|
10
users/glittershark/xanthous/hie.yaml
Normal file
10
users/glittershark/xanthous/hie.yaml
Normal file
|
@ -0,0 +1,10 @@
|
|||
cradle:
|
||||
cabal:
|
||||
- path: './src'
|
||||
component: 'lib:xanthous'
|
||||
- path: './test'
|
||||
component: 'test:test'
|
||||
- path: './src'
|
||||
component: 'exe:xanthous'
|
||||
- path: './bench'
|
||||
component: 'bench:benchmark'
|
|
@ -31,6 +31,7 @@ dependencies:
|
|||
- comonad-extras
|
||||
- constraints
|
||||
- containers
|
||||
- criterion
|
||||
- data-default
|
||||
- deepseq
|
||||
- directory
|
||||
|
|
|
@ -5,13 +5,11 @@
|
|||
})).shellFor {
|
||||
packages = p: [p.xanthous];
|
||||
withHoogle = true;
|
||||
doBenchmark = true;
|
||||
buildInputs = with pkgs.haskellPackages; [
|
||||
cabal-install
|
||||
ghc-prof-flamegraph
|
||||
hp2pretty
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
(import ./hie.nix { inherit pkgs; })
|
||||
pkgs.haskell-language-server.ghc883
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue