public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LanguageClient-neovim: 2017-12-05 -> 2018-03-06

Browse Source 
Following up from issue #33391, building LanguageClient-neovim now
requires some rust dependencies. This patch makes the plugin now longer
listed in vim-plugin-names file so that it will not be automatically
generated and instead lists it in non-generated plugins.

Also adds rustPlatform to arguments for vim plugins set.
This commit is contained in:
John Children 2018-03-11 22:00:49 +00:00 committed by Rok Garbas
parent d4c20ad1d9
commit 31db03ea14
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/misc/vim-plugins/default.nix
View File

@ -1,6 +1,6 @@
# TODO check that no license information gets lost # TODO check that no license information gets lost
{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip { fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
, which, fetchgit, llvmPackages , which, fetchgit, llvmPackages, rustPlatform
, xkb_switch, rustracerd, fzf, skim , xkb_switch, rustracerd, fzf, skim
, python3, boost, icu , python3, boost, icu
, ycmd, makeWrapper, rake , ycmd, makeWrapper, rake
@ -148,6 +148,31 @@ rec {
dependencies = []; dependencies = [];
}; };
LanguageClient-neovim = let
LanguageClient-neovim-src = fetchgit {
url = "https://github.com/autozimu/LanguageClient-neovim";
rev = "fbc46862af7fa254f74f1108149fd0669c46f1ad";
sha256 = "1wrrmikriyw8an8hn7240igcaca9a0ykh1j0dfy45kslxkmqkk3r";
};
LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
name = "LanguageClient-neovim-bin";
src = LanguageClient-neovim-src;
cargoSha256 = "0c2sklpvab63a1f1mhcq9abq5m2srkj52ypq7dq44g8ngn2a05ka";
};
in buildVimPluginFrom2Nix {
name = "LanguageClient-neovim-2018-03-06";
src = LanguageClient-neovim-src;
dependencies = [];
propogatedBuildInputs = [ LanguageClient-neovim-bin ];
preFixup = ''
substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/plugin/LanguageClient.vim \
--replace "let l:command = [s:root . '/bin/languageclient']" "let l:command = ['${LanguageClient-neovim-bin}/bin/languageclient']"
'';
};
# --- generated packages bellow this line --- # --- generated packages bellow this line ---
CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
@ -598,17 +623,6 @@ rec {
}; };
LanguageClient-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "LanguageClient-neovim-2017-12-05";
src = fetchgit {
url = "https://github.com/autozimu/LanguageClient-neovim";
rev = "eac16849eb5cb5592cf043fa222282a7082f257b";
sha256 = "07j7zm8xbvsanr9ghwxaw88m0kfr0ih262g299n5rr972s93wpg6";
};
dependencies = [];
};
vim-bazel = buildVimPluginFrom2Nix { # created by nix#NixDerivation vim-bazel = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-bazel-2018-01-10"; name = "vim-bazel-2018-01-10";
src = fetchgit { src = fetchgit {

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -37,7 +37,6 @@
"github:andsild/peskcolor.vim.git" "github:andsild/peskcolor.vim.git"
"github:andviro/flake8-vim" "github:andviro/flake8-vim"
"github:ap/vim-css-color" "github:ap/vim-css-color"
"github:autozimu/LanguageClient-neovim"
"github:bazelbuild/vim-bazel" "github:bazelbuild/vim-bazel"
"github:bbchung/clighter8" "github:bbchung/clighter8"
"github:benekastah/neomake" "github:benekastah/neomake"