diff options
author | Matthieu Coudron <teto@users.noreply.github.com> | 2022-05-27 11:34:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-27 11:34:48 +0200 |
commit | bd4e0644db593348ce9dbf5c891bb0964220d8e2 (patch) | |
tree | c2f22d35c0ad8e7970cbabdce1f468e6e8477e9a /pkgs/applications/editors/vim | |
parent | 60aed1ea595b240f1af3aec60b78e181a24d7342 (diff) | |
parent | d7bfa0dcc49491c7683a84e7edbf24b1c3bddcc6 (diff) |
Merge pull request #173312 from teto/vim-add-checks
vim add checks
Diffstat (limited to 'pkgs/applications/editors/vim')
4 files changed, 36 insertions, 2 deletions
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4e35fd632b1f2..4fec127eda6f8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2143,7 +2143,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; - diffview-nvim = buildVimPluginFrom2Nix { + diffview-nvim = buildNeovimPluginFrom2Nix { pname = "diffview.nvim"; version = "2022-05-09"; src = fetchFromGitHub { @@ -4666,6 +4666,18 @@ final: prev: meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; + nvim-biscuits = buildVimPluginFrom2Nix { + pname = "nvim-biscuits"; + version = "2021-11-12"; + src = fetchFromGitHub { + owner = "code-biscuits"; + repo = "nvim-biscuits"; + rev = "15a0cb1273bd36d5a734210cdc3406fb4bcfb733"; + sha256 = "15incx76ps8k4bra3s6ml66ckjhzjgbc7q2njs61yzfg46vdbhsd"; + }; + meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; + }; + nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; version = "2022-04-30"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3958c8c7fd7ee..0c74eb495d8cf 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -230,6 +230,13 @@ self: super: { }; }); + diffview-nvim = super.diffview-nvim.overrideAttrs (oa: { + dependencies = with self; [ plenary-nvim ]; + + doInstallCheck = true; + nvimRequireCheck = "diffview"; + }); + direnv-vim = super.direnv-vim.overrideAttrs (oa: { preFixup = oa.preFixup or "" + '' substituteInPlace $out/autoload/direnv.vim \ @@ -316,6 +323,10 @@ self: super: { configurePhase = "cd plugins/nvim"; }); + gitlinker-nvim = super.gitlinker-nvim.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; + }); + gitsigns-nvim = super.gitsigns-nvim.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; }); @@ -526,6 +537,10 @@ self: super: { }); }); + octo-nvim = super.octo-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim plenary-nvim ]; + }); + onehalf = super.onehalf.overrideAttrs (old: { configurePhase = "cd vim"; }); diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index 1214e36372a62..f63bd867f3682 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -116,7 +116,13 @@ class VimEditor(pluginupdate.Editor): def main(): global luaPlugins - luaPlugins = run_nix_expr(GET_PLUGINS_LUA) + + # whitelist + luaPlugins = run_nix_expr(GET_PLUGINS_LUA) + [ + "diffview-nvim", + "marks-nvim", + "nvim-biscuits" + ] editor = VimEditor("vim", ROOT, GET_PLUGINS) parser = editor.create_parser() diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e3806c71a2f65..1e2b24db37f59 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -393,6 +393,7 @@ https://github.com/catppuccin/nvim/,,catppuccin-nvim https://github.com/nathanmsmith/nvim-ale-diagnostic/,, https://github.com/windwp/nvim-autopairs/,, https://github.com/RRethy/nvim-base16/,, +https://github.com/code-biscuits/nvim-biscuits/,HEAD, https://github.com/kevinhwang91/nvim-bqf/,, https://github.com/ojroques/nvim-bufdel/,, https://github.com/roxma/nvim-cm-racer/,, |