From 10586634b5c804ef5a51a75eb7eab6aadfc3f70c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 23 Dec 2024 18:45:44 -0600 Subject: [PATCH] vimPlugins.fzf-lua: migrate to buildNeovimPlugin --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ------------ pkgs/applications/editors/vim/plugins/overrides.nix | 5 ++--- .../editors/vim/plugins/vim-plugin-names | 1 - 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a87e266d2a96..0586be14cd93 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4320,18 +4320,6 @@ final: prev: meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; - fzf-lua = buildNeovimPlugin { - pname = "fzf-lua"; - version = "2024-12-20"; - src = fetchFromGitHub { - owner = "ibhagwan"; - repo = "fzf-lua"; - rev = "7de67daddd5d4cd7757481d5fdc2a879b7ced1ad"; - sha256 = "08rry48ipdz4mcbf834ips3y29lk54k7iqhzzgan1b7iqk3x0j70"; - }; - meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; - }; - fzf-vim = buildVimPlugin { pname = "fzf.vim"; version = "2024-10-29"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a2024e3be6c7..8997249a61fb 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1061,10 +1061,9 @@ in dependencies = [ self.plenary-nvim ]; }; - fzf-lua = super.fzf-lua.overrideAttrs { + fzf-lua = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.fzf-lua; propagatedBuildInputs = [ fzf ]; - # FIXME: address already in use - # nvimRequireCheck = "fzf-lua"; }; fzf-vim = super.fzf-vim.overrideAttrs { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 72a15c5aa4fd..3184ecc5b400 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -357,7 +357,6 @@ https://github.com/rktjmp/fwatch.nvim/,, https://github.com/stsewd/fzf-checkout.vim/,, https://github.com/monkoose/fzf-hoogle.vim/,HEAD, https://github.com/gfanto/fzf-lsp.nvim/,, -https://github.com/ibhagwan/fzf-lua/,HEAD, https://github.com/junegunn/fzf.vim/,, https://github.com/NTBBloodbath/galaxyline.nvim/,, https://github.com/gbprod/nord.nvim/,,gbprod-nord