diff options
Diffstat (limited to 'nixpkgs/pkgs/misc/vim-plugins/overrides.nix')
| -rw-r--r-- | nixpkgs/pkgs/misc/vim-plugins/overrides.nix | 304 |
1 files changed, 100 insertions, 204 deletions
diff --git a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 73c5690b192..18515293655 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -2,6 +2,7 @@ , python, cmake, meson, vim, ruby , which, fetchFromGitHub, fetchgit, fetchurl, fetchzip, fetchpatch , llvmPackages, rustPlatform +, pkgconfig, curl, openssl, libgit2, libiconv , xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses , ycmd, rake @@ -13,9 +14,6 @@ , nodePackages , dasht -# coc-go dependency -, go - # deoplete-khard dependency , khard @@ -24,6 +22,7 @@ , gomodifytags, gotags, gotools, go-motion , gnused, reftools, gogetdoc, golangci-lint , impl, iferr, gocode, gocode-gomod, go-tools +, gopls # direnv-vim dependencies , direnv @@ -60,16 +59,18 @@ self: super: { }; LanguageClient-neovim = let - version = "0.1.157"; - LanguageClient-neovim-src = fetchurl { - url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz"; - sha256 = "1ccq5akkm8n612ni5g7w7v5gv73g7p1d9i92k0bnsy33fvi3pmnh"; + version = "0.1.158"; + LanguageClient-neovim-src = fetchFromGitHub { + owner = "autozimu"; + repo = "LanguageClient-neovim"; + rev = version; + sha256 = "14xggdgp5qw4yj4gdsgr8s2nxm098m88q8rx6fzd2j20njv308ki"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - cargoSha256 = "0r3f7sixkvgfrw0j81bxj1jpam5si9dnivrw63s29cvjxrdbnmqz"; + cargoSha256 = "0nin1gydf6q4mmxljm2xbd1jfl3wpzx3pvlqwspahblv9j2bf5ck"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. @@ -97,8 +98,6 @@ self: super: { # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). # The linked ruby code shows generates the required '.clang_complete' for cmake based projects # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 - # as an alternative you can execute the following command: - # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile') preFixup = '' substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc.lib}/lib/libclang.so'" @@ -123,199 +122,6 @@ self: super: { ''; }); - coc-go = super.coc-go.overrideAttrs(old: { - preFixup = '' - substituteInPlace "$out"/share/vim-plugins/coc-go/src/utils/tools.ts \ - --replace 'const cmd = `GOPATH=''${gopath}; go ''${args}`' 'const cmd = `GOPATH=''${gopath}; ${go}/bin/go ''${args}`' - ''; - }); - - coc-css = buildVimPluginFrom2Nix { - pname = "coc-css"; - version = nodePackages.coc-css.version; - src = "${nodePackages.coc-css}/lib/node_modules/coc-css"; - }; - - coc-emmet = buildVimPluginFrom2Nix { - pname = "coc-emmet"; - version = nodePackages.coc-emmet.version; - src = "${nodePackages.coc-emmet}/lib/node_modules/coc-emmet"; - }; - - coc-eslint = buildVimPluginFrom2Nix { - pname = "coc-eslint"; - version = nodePackages.coc-eslint.version; - src = "${nodePackages.coc-eslint}/lib/node_modules/coc-eslint"; - }; - - coc-git = buildVimPluginFrom2Nix { - pname = "coc-git"; - version = nodePackages.coc-git.version; - src = "${nodePackages.coc-git}/lib/node_modules/coc-git"; - }; - - coc-highlight = buildVimPluginFrom2Nix { - pname = "coc-highlight"; - version = nodePackages.coc-highlight.version; - src = "${nodePackages.coc-highlight}/lib/node_modules/coc-highlight"; - }; - - coc-html = buildVimPluginFrom2Nix { - pname = "coc-html"; - version = nodePackages.coc-html.version; - src = "${nodePackages.coc-html}/lib/node_modules/coc-html"; - }; - - coc-imselect = buildVimPluginFrom2Nix { - pname = "coc-imselect"; - version = nodePackages.coc-imselect.version; - src = "${nodePackages.coc-imselect}/lib/node_modules/coc-imselect"; - }; - - coc-java = buildVimPluginFrom2Nix { - pname = "coc-java"; - version = nodePackages.coc-java.version; - src = "${nodePackages.coc-java}/lib/node_modules/coc-java"; - }; - - coc-jest = buildVimPluginFrom2Nix { - pname = "coc-jest"; - version = nodePackages.coc-jest.version; - src = "${nodePackages.coc-jest}/lib/node_modules/coc-jest"; - }; - - coc-json = buildVimPluginFrom2Nix { - pname = "coc-json"; - version = nodePackages.coc-json.version; - src = "${nodePackages.coc-json}/lib/node_modules/coc-json"; - }; - - coc-lists = buildVimPluginFrom2Nix { - pname = "coc-lists"; - version = nodePackages.coc-lists.version; - src = "${nodePackages.coc-lists}/lib/node_modules/coc-lists"; - }; - - coc-metals = buildVimPluginFrom2Nix { - pname = "coc-metals"; - version = nodePackages.coc-metals.version; - src = "${nodePackages.coc-metals}/lib/node_modules/coc-metals"; - }; - - coc-pairs = buildVimPluginFrom2Nix { - pname = "coc-pairs"; - version = nodePackages.coc-pairs.version; - src = "${nodePackages.coc-pairs}/lib/node_modules/coc-pairs"; - }; - - coc-prettier = buildVimPluginFrom2Nix { - pname = "coc-prettier"; - version = nodePackages.coc-prettier.version; - src = "${nodePackages.coc-prettier}/lib/node_modules/coc-prettier"; - }; - - coc-python = buildVimPluginFrom2Nix { - pname = "coc-python"; - version = nodePackages.coc-python.version; - src = "${nodePackages.coc-python}/lib/node_modules/coc-python"; - }; - - coc-r-lsp = buildVimPluginFrom2Nix { - pname = "coc-r-lsp"; - version = nodePackages.coc-r-lsp.version; - src = "${nodePackages.coc-r-lsp}/lib/node_modules/coc-r-lsp"; - }; - - coc-rls = buildVimPluginFrom2Nix { - pname = "coc-rls"; - version = nodePackages.coc-rls.version; - src = "${nodePackages.coc-rls}/lib/node_modules/coc-rls"; - }; - - coc-rust-analyzer = buildVimPluginFrom2Nix { - pname = "coc-rust-analyzer"; - version = nodePackages.coc-rust-analyzer.version; - src = "${nodePackages.coc-rust-analyzer}/lib/node_modules/coc-rust-analyzer"; - }; - - coc-smartf = buildVimPluginFrom2Nix { - pname = "coc-smartf"; - version = nodePackages.coc-smartf.version; - src = "${nodePackages.coc-smartf}/lib/node_modules/coc-smartf"; - }; - - coc-snippets = buildVimPluginFrom2Nix { - pname = "coc-snippets"; - version = nodePackages.coc-snippets.version; - src = "${nodePackages.coc-snippets}/lib/node_modules/coc-snippets"; - }; - - coc-solargraph = buildVimPluginFrom2Nix { - pname = "coc-solargraph"; - version = nodePackages.coc-solargraph.version; - src = "${nodePackages.coc-solargraph}/lib/node_modules/coc-solargraph"; - }; - - coc-stylelint = buildVimPluginFrom2Nix { - pname = "coc-stylelint"; - version = nodePackages.coc-stylelint.version; - src = "${nodePackages.coc-stylelint}/lib/node_modules/coc-stylelint"; - }; - - coc-tabnine = buildVimPluginFrom2Nix { - pname = "coc-tabnine"; - version = nodePackages.coc-tabnine.version; - src = "${nodePackages.coc-tabnine}/lib/node_modules/coc-tabnine"; - }; - - coc-tslint = buildVimPluginFrom2Nix { - pname = "coc-tslint"; - version = nodePackages.coc-tslint.version; - src = "${nodePackages.coc-tslint}/lib/node_modules/coc-tslint"; - }; - - coc-tslint-plugin = buildVimPluginFrom2Nix { - pname = "coc-tslint-plugin"; - version = nodePackages.coc-tslint-plugin.version; - src = "${nodePackages.coc-tslint-plugin}/lib/node_modules/coc-tslint-plugin"; - }; - - coc-tsserver = buildVimPluginFrom2Nix { - pname = "coc-tsserver"; - version = nodePackages.coc-tsserver.version; - src = "${nodePackages.coc-tsserver}/lib/node_modules/coc-tsserver"; - }; - - coc-vetur = buildVimPluginFrom2Nix { - pname = "coc-vetur"; - version = nodePackages.coc-vetur.version; - src = "${nodePackages.coc-vetur}/lib/node_modules/coc-vetur"; - }; - - coc-vimtex = buildVimPluginFrom2Nix { - pname = "coc-vimtex"; - version = nodePackages.coc-vimtex.version; - src = "${nodePackages.coc-vimtex}/lib/node_modules/coc-vimtex"; - }; - - coc-wxml = buildVimPluginFrom2Nix { - pname = "coc-wxml"; - version = nodePackages.coc-wxml.version; - src = "${nodePackages.coc-wxml}/lib/node_modules/coc-wxml"; - }; - - coc-yaml = buildVimPluginFrom2Nix { - pname = "coc-yaml"; - version = nodePackages.coc-yaml.version; - src = "${nodePackages.coc-yaml}/lib/node_modules/coc-yaml"; - }; - - coc-yank = buildVimPluginFrom2Nix { - pname = "coc-yank"; - version = nodePackages.coc-yank.version; - src = "${nodePackages.coc-yank}/lib/node_modules/coc-yank"; - }; - command-t = super.command-t.overrideAttrs(old: { buildInputs = [ ruby rake ]; buildPhase = '' @@ -441,6 +247,18 @@ self: super: { passthru.python3Dependencies = ps: with ps; [ jedi ]; }); + ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs(old: { + dependencies = with super; [ neoinclude-vim ]; + }); + + ncm2-neosnippet = super.ncm2-neosnippet.overrideAttrs(old: { + dependencies = with super; [ neosnippet-vim ]; + }); + + ncm2-syntax = super.ncm2-syntax.overrideAttrs(old: { + dependencies = with super; [ neco-syntax ]; + }); + ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: { dependencies = with super; [ ultisnips ]; }); @@ -449,6 +267,10 @@ self: super: { dependencies = [ self.fzfWrapper ]; }); + skim-vim = super.skim-vim.overrideAttrs(old: { + dependencies = [ self.skim ]; + }); + sved = let # we put the script in its own derivation to benefit the magic of wrapGAppsHook svedbackend = stdenv.mkDerivation { @@ -555,6 +377,10 @@ self: super: { dependencies = with super; [ vim-maktaba ]; }); + vim-beancount = super.vim-beancount.overrideAttrs(old: { + passthru.python3Dependencies = ps: with ps; [ beancount ]; + }); + vim-codefmt = super.vim-codefmt.overrideAttrs(old: { dependencies = with super; [ vim-maktaba ]; }); @@ -593,6 +419,7 @@ self: super: { golint golangci-lint gomodifytags + gopls gotags gotools iferr @@ -742,4 +569,73 @@ self: super: { ${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null ''; }); -} + + vim-clap = super.vim-clap.overrideAttrs(old: { + preFixup = let + maple-bin = rustPlatform.buildRustPackage { + name = "maple"; + src = old.src; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + openssl + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + CoreServices + curl + libgit2 + libiconv + ]; + + cargoSha256 = "0qqys51slz85rnx6knjyivnmyq4rj6rrnz7w72kqcl8da8zjbx7b"; + }; + in '' + ln -s ${maple-bin}/bin/maple $target/bin/maple + ''; + }); +} // ( + let + nodePackageNames = [ + "coc-go" + "coc-css" + "coc-emmet" + "coc-eslint" + "coc-git" + "coc-highlight" + "coc-html" + "coc-imselect" + "coc-java" + "coc-jest" + "coc-json" + "coc-lists" + "coc-metals" + "coc-pairs" + "coc-prettier" + "coc-python" + "coc-r-lsp" + "coc-rls" + "coc-rust-analyzer" + "coc-smartf" + "coc-snippets" + "coc-solargraph" + "coc-stylelint" + "coc-tabnine" + "coc-tslint" + "coc-tslint-plugin" + "coc-tsserver" + "coc-vetur" + "coc-vimtex" + "coc-wxml" + "coc-yaml" + "coc-yank" + ]; + nodePackage2VimPackage = name: buildVimPluginFrom2Nix { + pname = name; + inherit (nodePackages.${name}) version meta; + src = "${nodePackages.${name}}/lib/node_modules/${name}"; + }; + in + lib.genAttrs nodePackageNames nodePackage2VimPackage +) |