Skip to content

Commit

Permalink
Added nix LSP
Browse files Browse the repository at this point in the history
  • Loading branch information
hrajchert committed Nov 29, 2022
1 parent 6e57a11 commit baf601c
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 15 deletions.
101 changes: 89 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions flake.nix
Expand Up @@ -12,10 +12,12 @@
# texlive-nixpkgs.url = "nixpkgs/nixos-22.05";

tullia.url = "github:input-output-hk/tullia";

nixLsp.url = "github:oxalica/nil";
};


outputs = { self, flake-utils, nixpkgs, haskellNix, isabelle-nixpkgs, tullia }:
outputs = { self, flake-utils, nixpkgs, haskellNix, isabelle-nixpkgs, tullia, nixLsp }:
let
inherit (flake-utils.lib) eachSystem system;

Expand All @@ -26,7 +28,7 @@
let
evalSystem = evalSystem';

overlays = [ haskellNix.overlay ];
overlays = [ haskellNix.overlay nixLsp.overlays.nil];

pkgs = import nixpkgs { inherit system overlays; inherit (haskellNix) config; };

Expand Down Expand Up @@ -89,7 +91,7 @@
shell.tools.cabal = { inherit evalSystem; };
shell.tools.haskell-language-server = { inherit evalSystem; };
shell.inputsFrom = [ packages.isabelle-test ];
shell.nativeBuildInputs = [build-marlowe-proofs edit-marlowe-proofs build-marlowe-docs latex pkgs.haskellPackages.lhs2tex tulliaPackage];
shell.nativeBuildInputs = [build-marlowe-proofs edit-marlowe-proofs build-marlowe-docs latex pkgs.haskellPackages.lhs2tex tulliaPackage pkgs.nil];
};

flake = project.flake { };
Expand Down

0 comments on commit baf601c

Please sign in to comment.