diff options
author | John Children <john@infosum.com> | 2018-03-11 22:00:49 +0000 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2018-03-12 13:30:58 +0100 |
commit | 31db03ea14d15615ca1f8af5e23814255bc30e79 (patch) | |
tree | 6b8b9cb3d09aa25ed28481026aacab6b0d41ad1f /pkgs/misc/vim-plugins/default.nix | |
parent | d4c20ad1d90e78485ef8a1e4500397f83c032597 (diff) | |
download | nixlib-31db03ea14d15615ca1f8af5e23814255bc30e79.tar nixlib-31db03ea14d15615ca1f8af5e23814255bc30e79.tar.gz nixlib-31db03ea14d15615ca1f8af5e23814255bc30e79.tar.bz2 nixlib-31db03ea14d15615ca1f8af5e23814255bc30e79.tar.lz nixlib-31db03ea14d15615ca1f8af5e23814255bc30e79.tar.xz nixlib-31db03ea14d15615ca1f8af5e23814255bc30e79.tar.zst nixlib-31db03ea14d15615ca1f8af5e23814255bc30e79.zip |
LanguageClient-neovim: 2017-12-05 -> 2018-03-06
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.
Diffstat (limited to 'pkgs/misc/vim-plugins/default.nix')
-rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 78aed2aa833c..f9fc937d2c6e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,6 +1,6 @@ # TODO check that no license information gets lost { fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip -, which, fetchgit, llvmPackages +, which, fetchgit, llvmPackages, rustPlatform , xkb_switch, rustracerd, fzf, skim , python3, boost, icu , ycmd, makeWrapper, rake @@ -148,6 +148,31 @@ rec { 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 --- 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 name = "vim-bazel-2018-01-10"; src = fetchgit { |