diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-09 18:41:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-09 18:41:27 +0000 |
| commit | fcbe48c79793e614092ba278e05d5594995a88e3 (patch) | |
| tree | 91c9cc085dbd2354fc4bb59c9b3e6a1a00313639 /pkgs/misc | |
| parent | 8ae8602bf7529fddeab29867329c21af96600a68 (diff) | |
| parent | 9d358f1f7cb833d60dacf8b52a516ec2a753c533 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vim-plugins/generated.nix | 24 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-plugin-names | 2 |
2 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e16a42f95eb11..7f6b139affb4c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -87,6 +87,18 @@ let meta.homepage = "https://github.com/vim-scripts/align/"; }; + aniseed = buildVimPluginFrom2Nix { + pname = "aniseed"; + version = "2021-01-08"; + src = fetchFromGitHub { + owner = "Olical"; + repo = "aniseed"; + rev = "50adbc5ed5bb97b73b0b0c3241d9e62621ca59f9"; + sha256 = "1wy5jd86273q7sxa50kv88flqdgmg9z2m4b6phpw3xnl5d1sj9f7"; + }; + meta.homepage = "https://github.com/Olical/aniseed/"; + }; + ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; version = "2020-10-15"; @@ -5185,6 +5197,18 @@ let meta.homepage = "https://github.com/lambdalisue/vim-gista/"; }; + vim-git = buildVimPluginFrom2Nix { + pname = "vim-git"; + version = "2020-07-13"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-git"; + rev = "4be54a3e2e300a94f6f7dfa7a6ee9e81245c9886"; + sha256 = "1061l9igdywfbqgwpf2f25yby78phb512hjbyzvqz5l1p7dw1xyd"; + }; + meta.homepage = "https://github.com/tpope/vim-git/"; + }; + vim-gitbranch = buildVimPluginFrom2Nix { pname = "vim-gitbranch"; version = "2017-05-27"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 63dee14b46925..0a29eb32f240f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -405,6 +405,7 @@ nvim-treesitter/playground ocaml/vim-ocaml octol/vim-cpp-enhanced-highlight ojroques/vim-oscyank@main +Olical/aniseed Olical/conjure OrangeT/vim-csharp osyo-manga/shabadou.vim @@ -560,6 +561,7 @@ tpope/vim-eunuch tpope/vim-fireplace tpope/vim-flagship tpope/vim-fugitive +tpope/vim-git tpope/vim-liquid tpope/vim-obsession tpope/vim-pathogen |