diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-26 13:06:43 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-26 13:06:43 +0200 |
| commit | 7077a270bf625b320ab61e3951aa19c9d514b5dc (patch) | |
| tree | 42660271ea34c60368a6e3393ac5eedb65fe4a78 /pkgs/misc | |
| parent | fea23020fef87f20fe81477d33eb9b8ca72e7f2e (diff) | |
| parent | 2273849a85e49d3a1fe55d11110cebb3377dddf6 (diff) | |
| download | nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.gz nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.bz2 nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.lz nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.xz nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.zst nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-plugin-names | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index d2eee8c2cac5..a8abd86e1941 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -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 = []; + + }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1e04ab992212..bebfbd1b7c02 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -165,3 +165,5 @@ "vimwiki" "vinegar" "vundle" +"github:jiangmiao/auto-pairs" +"github:editorconfig/editorconfig-vim" |