diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-22 16:39:12 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-22 16:39:12 +0200 |
commit | 11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27 (patch) | |
tree | c137efcba7e4188db3b58c60f7b5565e3c6ca05c /pkgs/misc/vim-plugins | |
parent | 76b7dd1ba95c6cef48a2e71c427287a2d12c07ab (diff) | |
parent | 1bd03f0379318a370563ae721a7ab3af6ef8e095 (diff) | |
download | nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.tar nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.tar.gz nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.tar.bz2 nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.tar.lz nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.tar.xz nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.tar.zst nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/misc/vim-plugins')
-rw-r--r-- | pkgs/misc/vim-plugins/generated.nix | 11 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/vim-plugin-names | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d6537ad820ed..cb0e37782013 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -775,6 +775,17 @@ let }; }; + defx-nvim = buildVimPluginFrom2Nix { + pname = "defx-nvim"; + version = "2019-08-19"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "defx.nvim"; + rev = "dbd2dceea914ecaa71d24a1d6036f1981becdca5"; + sha256 = "1gl18s39v7k1p6z7hchq1k16f6f1i2ccq76as562c0nvn68jdqi8"; + }; + }; + delimitMate = buildVimPluginFrom2Nix { pname = "delimitMate"; version = "2017-06-19"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 5fff24e9e5f9..4d127c20e31a 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -166,6 +166,10 @@ self: super: { ''; }); + defx-nvim = super.defx-nvim.overrideAttrs(old: { + dependencies = with super; [ nvim-yarp ]; + }); + deoplete-fish = super.deoplete-fish.overrideAttrs(old: { dependencies = with super; [ deoplete-nvim vim-fish ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 9a177c91d294..926c509d12f0 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -340,6 +340,7 @@ sebastianmarkow/deoplete-rust sheerun/vim-polyglot Shougo/context_filetype.vim Shougo/denite.nvim +Shougo/defx.nvim Shougo/deol.nvim Shougo/deoplete-lsp Shougo/deoplete.nvim |