talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

vimPlugins.git-conflict-nvim: 2024-12-27 -> 2.1.0 (#375221)

Browse Source
This commit is contained in:
Gaétan Lepage 2025-01-20 08:42:40 +01:00 committed by GitHub
commit 99e012954d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -1725,6 +1725,18 @@ in
dependencies = [ self.plenary-nvim ];
};
git-conflict-nvim = super.git-conflict-nvim.overrideAttrs {
# TODO: Remove after next fixed version
# https://github.com/akinsho/git-conflict.nvim/issues/103
version = "2.1.0";
src = fetchFromGitHub {
owner = "akinsho";
repo = "git-conflict.nvim";
tag = "v2.1.0";
hash = "sha256-1t0kKxTGLuOvuRkoLgkoqMZpF+oKo8+gMsTdgPsSb+8=";
};
};
minimap-vim = super.minimap-vim.overrideAttrs {
preFixup = ''
substituteInPlace $out/plugin/minimap.vim \