mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

plugins/nvim-lsp: update package for some language servers

Browse source
This commit is contained in:
Gaetan Lepage 2023-06-18 19:26:14 +02:00 • committed by Gaétan Lepage
parent 31f59efdc6
commit 0bd5ea6984
2 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
flake.nix
View file

@ -1,14 +1,16 @@
{ {
description = "A neovim configuration system for NixOS"; description = "A neovim configuration system for NixOS";
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs = {
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.beautysh.url = "github:lovesegfault/beautysh"; beautysh.url = "github:lovesegfault/beautysh";
inputs.beautysh.inputs.nixpkgs.follows = "nixpkgs"; beautysh.inputs.nixpkgs.follows = "nixpkgs";
inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { outputs = {
self, self,
@ -45,6 +47,12 @@
flake-utils.lib.eachDefaultSystem flake-utils.lib.eachDefaultSystem
(system: let (system: let
pkgs = import nixpkgs {inherit system;}; pkgs = import nixpkgs {inherit system;};
# Some nixvim supported plugins require the use of unfree packages.
# This unfree-friendly pkgs is used for documentation and testing only.
pkgs-unfree = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
extractRustAnalyzer = { extractRustAnalyzer = {
stdenv, stdenv,
pkgs, pkgs,
@ -70,7 +78,18 @@
(import ./tests { (import ./tests {
inherit pkgs; inherit pkgs;
inherit (pkgs) lib; inherit (pkgs) lib;
inherit (self.legacyPackages."${system}") makeNixvim; # Some nixvim supported plugins require the use of unfree packages.
# As we test as many things as possible, we need to allow unfree sources by generating
# a separate `makeNixvim` module (with pkgs-unfree).
makeNixvim = let
makeNixvimWithModuleUnfree = import ./wrappers/standalone.nix pkgs-unfree modules;
in
configuration:
makeNixvimWithModuleUnfree {
module = {
config = configuration;
};
};
}) })
// { // {
lib-tests = import ./tests/lib-tests.nix { lib-tests = import ./tests/lib-tests.nix {
@ -94,7 +113,7 @@
}; };
}; };
packages = { packages = {
docs = pkgs.callPackage (import ./docs.nix) { docs = pkgs-unfree.callPackage (import ./docs.nix) {
modules = nixvimModules; modules = nixvimModules;
}; };
runUpdates = runUpdates =

8
plugins/lsp/language-servers/default.nix
View file

@ -37,7 +37,7 @@ with lib; let
{ {
name = "cssls"; name = "cssls";
description = "Enable cssls, for CSS"; description = "Enable cssls, for CSS";
package = pkgs.nodePackages.vscode-langservers-extracted; package = pkgs.vscode-langservers-extracted;
cmd = cfg: ["${cfg.package}/bin/vscode-css-language-server" "--stdio"]; cmd = cfg: ["${cfg.package}/bin/vscode-css-language-server" "--stdio"];
} }
{ {
@ -139,7 +139,7 @@ with lib; let
{ {
name = "eslint"; name = "eslint";
description = "Enable eslint"; description = "Enable eslint";
package = pkgs.nodePackages.vscode-langservers-extracted; package = pkgs.vscode-langservers-extracted;
cmd = cfg: ["${cfg.package}/bin/vscode-eslint-language-server" "--stdio"]; cmd = cfg: ["${cfg.package}/bin/vscode-eslint-language-server" "--stdio"];
} }
{ {
@ -172,7 +172,7 @@ with lib; let
{ {
name = "html"; name = "html";
description = "Enable html, for HTML"; description = "Enable html, for HTML";
package = pkgs.nodePackages.vscode-langservers-extracted; package = pkgs.vscode-langservers-extracted;
cmd = cfg: ["${cfg.package}/bin/vscode-html-language-server" "--stdio"]; cmd = cfg: ["${cfg.package}/bin/vscode-html-language-server" "--stdio"];
} }
{ {
@ -184,7 +184,7 @@ with lib; let
{ {
name = "jsonls"; name = "jsonls";
description = "Enable jsonls, for JSON"; description = "Enable jsonls, for JSON";
package = pkgs.nodePackages.vscode-langservers-extracted; package = pkgs.vscode-langservers-extracted;
cmd = cfg: ["${cfg.package}/bin/vscode-json-language-server" "--stdio"]; cmd = cfg: ["${cfg.package}/bin/vscode-json-language-server" "--stdio"];
} }
{ {