From d7820aa294bd4426503b73dd8cc08e0092dd2f2b Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 21 Jun 2022 18:38:02 -0700 Subject: vimPlugins: cleanup overrides --- .../applications/editors/vim/plugins/overrides.nix | 84 +++++++++++----------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a99b2fa52f2..f7e1645d707 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -191,6 +191,10 @@ self: super: { dependencies = with self; [ nvim-cmp ]; }); + cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs (old: { dependencies = with self; [ nvim-cmp pandoc plenary-nvim ]; }); @@ -212,22 +216,18 @@ self: super: { ''; }); - cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (old: { - dependencies = with self; [ nvim-cmp ]; - }); - cmp-tmux = super.cmp-tmux.overrideAttrs (old: { dependencies = with self; [ nvim-cmp tmux ]; }); - cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (old: { - dependencies = with self; [ nvim-cmp vimwiki ]; - }); - cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs (old: { dependencies = with self; [ nvim-cmp vim-lsp ]; }); + cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp vimwiki ]; + }); + cmp-zsh = super.cmp-zsh.overrideAttrs (old: { dependencies = with self; [ nvim-cmp zsh ]; }); @@ -328,15 +328,15 @@ self: super: { }; }); - diffview-nvim = super.diffview-nvim.overrideAttrs (oa: { + diffview-nvim = super.diffview-nvim.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; doInstallCheck = true; nvimRequireCheck = "diffview"; }); - direnv-vim = super.direnv-vim.overrideAttrs (oa: { - preFixup = oa.preFixup or "" + '' + direnv-vim = super.direnv-vim.overrideAttrs (old: { + preFixup = old.preFixup or "" + '' substituteInPlace $out/autoload/direnv.vim \ --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" @@ -376,7 +376,7 @@ self: super: { patches = [ (substituteAll { src = ./patches/fruzzy/get_version.patch; - version = old.version; + inherit (old) version; }) ]; configurePhase = '' @@ -445,31 +445,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); - # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); - - plenary-nvim = super.plenary-nvim.overrideAttrs (old: { - postPatch = '' - sed -Ei lua/plenary/curl.lua \ - -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' - ''; - - doInstallCheck = true; - nvimRequireCheck = "plenary"; - }); - gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { dependencies = with self; [ lush-nvim ]; }); - jedi-vim = super.jedi-vim.overrideAttrs (old: { - # checking for python3 support in vim would be neat, too, but nobody else seems to care - buildInputs = [ python3.pkgs.jedi ]; - meta = { - description = "code-completion for python using python-jedi"; - license = lib.licenses.mit; - }; - }); - himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; inherit (himalaya) src version; @@ -485,6 +464,15 @@ self: super: { ''; }; + jedi-vim = super.jedi-vim.overrideAttrs (old: { + # checking for python3 support in vim would be neat, too, but nobody else seems to care + buildInputs = [ python3.pkgs.jedi ]; + meta = { + description = "code-completion for python using python-jedi"; + license = lib.licenses.mit; + }; + }); + LanguageClient-neovim = let version = "0.1.161"; @@ -659,7 +647,19 @@ self: super: { configurePhase = "cd vim"; }); - parinfer-rust = parinfer-rust; + inherit parinfer-rust; + + # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); + + plenary-nvim = super.plenary-nvim.overrideAttrs (old: { + postPatch = '' + sed -Ei lua/plenary/curl.lua \ + -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' + ''; + + doInstallCheck = true; + nvimRequireCheck = "plenary"; + }); range-highlight-nvim = super.range-highlight-nvim.overrideAttrs (old: { dependencies = with self; [ cmd-parser-nvim ]; @@ -676,7 +676,7 @@ self: super: { skim = buildVimPluginFrom2Nix { pname = "skim"; - version = skim.version; + inherit (skim) version; src = skim.vim; }; @@ -789,16 +789,16 @@ self: super: { dependencies = with self; [ sqlite-lua telescope-nvim ]; }); - telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: { - dependencies = with self; [ telescope-nvim ]; - }); - telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; buildPhase = "make"; meta.platforms = lib.platforms.all; }); + telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + }); + telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; preFixup = @@ -1103,13 +1103,13 @@ self: super: { vim-markdown-composer = let - vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { + vim-markdown-composer-bin = rustPlatform.buildRustPackage { pname = "vim-markdown-composer-bin"; inherit (super.vim-markdown-composer) src version; cargoSha256 = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4="; }; in - super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { + super.vim-markdown-composer.overrideAttrs (old: { preFixup = '' substituteInPlace "$out"/after/ftplugin/markdown/composer.vim \ --replace "s:plugin_root . '/target/release/markdown-composer'" \ @@ -1287,9 +1287,9 @@ self: super: { "coc-smartf" "coc-snippets" "coc-solargraph" + "coc-sqlfluff" "coc-stylelint" "coc-sumneko-lua" - "coc-sqlfluff" "coc-tabnine" "coc-texlab" "coc-toml" -- cgit 1.4.1