diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
| commit | 59b5bbeae91109007e36a269a94cccc865dc5175 (patch) | |
| tree | 1ee3d18aedace6d66034ea72fea571d20d8d0fee /pkgs/misc/vim-plugins/vim-plugin-names | |
| parent | Do not use old stdenv version in faust wrap functions. (-8 alias, -15 unpatch... (diff) | |
| parent | Merge pull request #19675 from edwtjo/dictd-touchup (diff) | |
| download | nixpkgs-origin/security-updates.tar.gz | |
Merge branch master into security-updatesorigin/security-updates
This merge mostly take the changes made to the master branch.
Some conflict happen in top-level/default.nix due to a reformating of the
code of which is computing the fix-point. This merge fixes these issues by
adding the pkgsIndex argument, needed to re-evaluate the fix-point with
another set of packages, and also re-add the second fix-point made to
support the dependencies.
Diffstat (limited to 'pkgs/misc/vim-plugins/vim-plugin-names')
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-plugin-names | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 91b10a6b26f7..bebfbd1b7c02 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -2,6 +2,7 @@ "CheckAttach" "Gist" "Hoogle" +"Rename" "Solarized" "Supertab" "Syntastic" @@ -32,6 +33,7 @@ "github:christoomey/vim-tmux-navigator" "github:ctjhoa/spacevim" "github:ctrlpvim/ctrlp.vim" +"github:derekelkins/agda-vim" "github:digitaltoad/vim-jade" "github:eagletmt/neco-ghc" "github:eikenb/acp" @@ -78,6 +80,7 @@ "github:osyo-manga/vim-watchdogs" "github:racer-rust/vim-racer" "github:raichoo/purescript-vim" +"github:rhysd/vim-grammarous" "github:rust-lang/rust.vim" "github:sbdchd/neoformat" "github:sheerun/vim-polyglot" @@ -111,6 +114,7 @@ "github:vim-scripts/wombat256.vim" "github:wakatime/vim-wakatime" "github:wincent/command-t" +"github:xolox/vim-easytags" "github:zchee/deoplete-jedi" "goyo" "matchit.zip" @@ -161,3 +165,5 @@ "vimwiki" "vinegar" "vundle" +"github:jiangmiao/auto-pairs" +"github:editorconfig/editorconfig-vim" |