diff options
Diffstat (limited to 'pkgs/misc/vim-plugins/overrides.nix')
| -rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 179 |
1 files changed, 78 insertions, 101 deletions
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index e7d95fb50b57..307681111ac2 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -1,10 +1,9 @@ -{config, lib, stdenv -, python, cmake, vim, vimUtils, ruby +{ lib, stdenv +, python, cmake, vim, ruby , which, fetchgit, llvmPackages, rustPlatform , xkb_switch, fzf, skim , python3, boost, icu, ncurses , ycmd, rake -, pythonPackages, python3Packages , substituteAll , languagetool , Cocoa, CoreFoundation, CoreServices @@ -17,34 +16,22 @@ , impl, iferr, gocode, gocode-gomod, go-tools }: -let - - _skim = skim; - -in - -generated: - -with generated; - -{ +self: super: { vim2nix = buildVimPluginFrom2Nix { name = "vim2nix"; src = ./vim2nix; - dependencies = ["vim-addon-manager"]; + dependencies = with super; [ vim-addon-manager ]; }; fzfWrapper = buildVimPluginFrom2Nix { name = fzf.name; src = fzf.src; - dependencies = []; }; skim = buildVimPluginFrom2Nix { - name = _skim.name; - src = _skim.vim; - dependencies = []; + name = skim.name; + src = skim.vim; }; LanguageClient-neovim = let @@ -70,7 +57,6 @@ with generated; name = "LanguageClient-neovim-2018-09-07"; src = LanguageClient-neovim-src; - dependencies = []; propogatedBuildInputs = [ LanguageClient-neovim-bin ]; preFixup = '' @@ -87,10 +73,9 @@ with generated; rev = "69cce66defdf131958f152ea7a7b26c21ca9d009"; sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc"; }; - dependencies = []; }; - clang_complete = clang_complete.overrideAttrs(old: { + clang_complete = super.clang_complete.overrideAttrs(old: { # In addition to the arguments you pass to your compiler, you also need to # specify the path of the C++ std header (if you are using C++). # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). @@ -107,14 +92,14 @@ with generated; ''; }); - clighter8 = clighter8.overrideAttrs(old: { + clighter8 = super.clighter8.overrideAttrs(old: { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim ''; }); - command-t = command-t.overrideAttrs(old: { + command-t = super.command-t.overrideAttrs(old: { buildInputs = [ ruby rake ]; buildPhase = '' rake make @@ -122,7 +107,7 @@ with generated; ''; }); - cpsm = cpsm.overrideAttrs(old: { + cpsm = super.cpsm.overrideAttrs(old: { buildInputs = [ python3 stdenv @@ -138,7 +123,7 @@ with generated; ''; }); - ctrlp-cmatcher = ctrlp-cmatcher.overrideAttrs(old: { + ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs(old: { buildInputs = [ python ]; buildPhase = '' patchShebangs . @@ -146,7 +131,7 @@ with generated; ''; }); - deoplete-go = deoplete-go.overrideAttrs(old: { + deoplete-go = super.deoplete-go.overrideAttrs(old: { buildInputs = [ python3 ]; buildPhase = '' pushd ./rplugin/python3/deoplete/ujson @@ -156,114 +141,106 @@ with generated; ''; }); - ensime-vim = ensime-vim.overrideAttrs(old: { + ensime-vim = super.ensime-vim.overrideAttrs(old: { passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; - dependencies = ["vimproc" "vimshell" "self" "forms"]; - }); - - forms = forms.overrideAttrs(old: { - dependencies = ["self"]; + dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ]; }); - gist-vim = gist-vim.overrideAttrs(old: { - dependencies = ["webapi-vim"]; + forms = super.forms.overrideAttrs(old: { + dependencies = with super; [ super.self ]; }); - gitv = gitv.overrideAttrs(old: { - dependencies = ["gitv"]; + gist-vim = super.gist-vim.overrideAttrs(old: { + dependencies = with super; [ webapi-vim ]; }); - ncm2 = ncm2.overrideAttrs(old: { - dependencies = ["nvim-yarp"]; + ncm2 = super.ncm2.overrideAttrs(old: { + dependencies = with super; [ nvim-yarp ]; }); - ncm2-ultisnips = ncm2-ultisnips.overrideAttrs(old: { - dependencies = ["ultisnips"]; + ncm2-jedi = super.ncm2-jedi.overrideAttrs(old: { + dependencies = with super; [ nvim-yarp ncm2 ]; + passthru.python3Dependencies = ps: with ps; [ jedi ]; }); - taglist-vim = taglist-vim.overrideAttrs(old: { - setSourceRoot = '' - export sourceRoot=taglist - mkdir taglist - mv doc taglist - mv plugin taglist - ''; + ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: { + dependencies = with super; [ ultisnips ]; }); - vimshell-vim = vimshell-vim.overrideAttrs(old: { - dependencies = [ "vimproc-vim" ]; + vimshell-vim = super.vimshell-vim.overrideAttrs(old: { + dependencies = with super; [ vimproc-vim ]; }); - vim-addon-manager = vim-addon-manager.overrideAttrs(old: { + vim-addon-manager = super.vim-addon-manager.overrideAttrs(old: { buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; }); - vim-addon-actions = vim-addon-actions.overrideAttrs(old: { - dependencies = [ "vim-addon-mw-utils" "tlib" ]; + vim-addon-actions = super.vim-addon-actions.overrideAttrs(old: { + dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); - vim-addon-async = vim-addon-async.overrideAttrs(old: { - dependencies = [ "vim-addon-signs" ]; + vim-addon-async = super.vim-addon-async.overrideAttrs(old: { + dependencies = with super; [ vim-addon-signs ]; }); - vim-addon-background-cmd = vim-addon-background-cmd.overrideAttrs(old: { - dependencies = [ "vim-addon-mw-utils" ]; + vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs(old: { + dependencies = with super; [ vim-addon-mw-utils ]; }); - vim-addon-completion = vim-addon-completion.overrideAttrs(old: { - dependencies = [ "tlib" ]; + vim-addon-completion = super.vim-addon-completion.overrideAttrs(old: { + dependencies = with super; [ tlib_vim ]; }); - vim-addon-goto-thing-at-cursor = vim-addon-goto-thing-at-cursor.overrideAttrs(old: { - dependencies = [ "tlib" ]; + vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs(old: { + dependencies = with super; [ tlib_vim ]; }); - vim-addon-mru = vim-addon-mru.overrideAttrs(old: { - dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; + vim-addon-mru = super.vim-addon-mru.overrideAttrs(old: { + dependencies = with super; [ vim-addon-other vim-addon-mw-utils ]; }); - vim-addon-nix = vim-addon-nix.overrideAttrs(old: { - dependencies = [ - "vim-addon-completion" - "vim-addon-goto-thing-at-cursor" - "vim-addon-errorformats" - "vim-addon-actions" - "vim-addon-mw-utils" "tlib" + vim-addon-nix = super.vim-addon-nix.overrideAttrs(old: { + dependencies = with super; [ + vim-addon-completion + vim-addon-goto-thing-at-cursor + vim-addon-errorformats + vim-addon-actions + vim-addon-mw-utils tlib_vim ]; }); - vim-addon-sql = vim-addon-sql.overrideAttrs(old: { - dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; + vim-addon-sql = super.vim-addon-sql.overrideAttrs(old: { + dependencies = with super; [ vim-addon-completion vim-addon-background-cmd tlib_vim ]; }); - vim-addon-syntax-checker = vim-addon-syntax-checker.overrideAttrs(old: { - dependencies = ["vim-addon-mw-utils" "tlib"]; + vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs(old: { + dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); - vim-addon-toggle-buffer = vim-addon-toggle-buffer.overrideAttrs(old: { - dependencies = [ "vim-addon-mw-utils" "tlib" ]; + vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs(old: { + dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); - vim-addon-xdebug = vim-addon-xdebug.overrideAttrs(old: { - dependencies = [ "WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async" ]; + vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs(old: { + dependencies = with super; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ]; }); - vim-bazel = vim-bazel.overrideAttrs(old: { - dependencies = ["maktaba"]; + vim-bazel = super.vim-bazel.overrideAttrs(old: { + dependencies = with super; [ vim-maktaba ]; }); - vim-codefmt = vim-codefmt.overrideAttrs(old: { - dependencies = ["maktaba"]; + vim-codefmt = super.vim-codefmt.overrideAttrs(old: { + dependencies = with super; [ vim-maktaba ]; }); - vim-easytags = vim-easytags.overrideAttrs(old: { - dependencies = ["vim-misc"]; + vim-easytags = super.vim-easytags.overrideAttrs(old: { + dependencies = with super; [ vim-misc ]; }); # change the go_bin_path to point to a path in the nix store. See the code in # fatih/vim-go here # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159 - vim-go = vim-go.overrideAttrs(old: let + vim-go = super.vim-go.overrideAttrs(old: let binPath = lib.makeBinPath [ asmfmt delve @@ -291,7 +268,7 @@ with generated; ''; }); - vim-grammarous = vim-grammarous.overrideAttrs(old: { + vim-grammarous = super.vim-grammarous.overrideAttrs(old: { # use `:GrammarousCheck` to initialize checking # In neovim, you also want to use set # let g:grammarous#show_first_error = 1 @@ -304,31 +281,31 @@ with generated; ]; }); - vim-hier = vim-hier.overrideAttrs(old: { + vim-hier = super.vim-hier.overrideAttrs(old: { buildInputs = [ vim ]; }); - vim-isort = vim-isort.overrideAttrs(old: { + vim-isort = super.vim-isort.overrideAttrs(old: { postPatch = '' substituteInPlace ftplugin/python_vimisort.vim \ - --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")' + --replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")' ''; }); - vim-snipmate = vim-snipmate.overrideAttrs(old: { - dependencies = ["vim-addon-mw-utils" "tlib"]; + vim-snipmate = super.vim-snipmate.overrideAttrs(old: { + dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); - vim-wakatime = vim-wakatime.overrideAttrs(old: { + vim-wakatime = super.vim-wakatime.overrideAttrs(old: { buildInputs = [ python ]; }); - vim-xdebug = vim-xdebug.overrideAttrs(old: { + vim-xdebug = super.vim-xdebug.overrideAttrs(old: { postInstall = false; }); - vim-xkbswitch = vim-xkbswitch.overrideAttrs(old: { + vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: { patchPhase = '' substituteInPlace plugin/xkbswitch.vim \ --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so @@ -336,14 +313,14 @@ with generated; buildInputs = [ xkb_switch ]; }); - vim-yapf = vim-yapf.overrideAttrs(old: { + vim-yapf = super.vim-yapf.overrideAttrs(old: { buildPhase = '' substituteInPlace ftplugin/python_yapf.vim \ - --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"' + --replace '"yapf"' '"${python3.pkgs.yapf}/bin/yapf"' ''; }); - vimproc-vim = vimproc-vim.overrideAttrs(old: { + vimproc-vim = super.vimproc-vim.overrideAttrs(old: { buildInputs = [ which ]; buildPhase = '' @@ -355,11 +332,11 @@ with generated; ''; }); - YankRing-vim = YankRing-vim.overrideAttrs(old: { + YankRing-vim = super.YankRing-vim.overrideAttrs(old: { sourceRoot = "."; }); - youcompleteme = youcompleteme.overrideAttrs(old: { + youcompleteme = super.youcompleteme.overrideAttrs(old: { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ --replace "'ycm_path_to_python_interpreter', '''" \ @@ -378,9 +355,9 @@ with generated; }; }); - jedi-vim = jedi-vim.overrideAttrs(old: { + jedi-vim = super.jedi-vim.overrideAttrs(old: { # checking for python3 support in vim would be neat, too, but nobody else seems to care - buildInputs = [ python3Packages.jedi ]; + buildInputs = [ python3.pkgs.jedi ]; meta = { description = "code-completion for python using python-jedi"; license = stdenv.lib.licenses.mit; |