Merge remote-tracking branch 'upstream/master' into HEAD

This commit is contained in:
Frederik Rietdijk
2016-10-26 13:06:43 +02:00
177 changed files with 4107 additions and 1641 deletions

View File

@@ -2038,4 +2038,26 @@ rec {
dependencies = [];
};
auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "auto-pairs-2016-07-17";
src = fetchgit {
url = "git://github.com/jiangmiao/auto-pairs";
rev = "1b3a1efb078fdf74d4013308b63de57dfda0cc8e";
sha256 = "1g5gb9xvc9xw3rxg8p4w3qcsdl3xfpi5ax380916aq237kmrnzdk";
};
dependencies = [];
};
editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "editorconfig-vim-2016-07-16";
src = fetchgit {
url = "git://github.com/editorconfig/editorconfig-vim";
rev = "a459b8cfef00100da40fd69c8ae92c4d1e63e1d2";
sha256 = "03slzk7jgr348f59pxghmd9giwla63lxmwvripg99zrlgl0pvp5g";
};
dependencies = [];
};
}

View File

@@ -165,3 +165,5 @@
"vimwiki"
"vinegar"
"vundle"
"github:jiangmiao/auto-pairs"
"github:editorconfig/editorconfig-vim"