Unverified Commit 9647a2ba authored by Austin Horstman's avatar Austin Horstman Committed by GitHub
Browse files

vimPlugins: remove duplicate vscode-diff definition; vimPlugins.codediff-nvim:... 

vimPlugins: remove duplicate vscode-diff definition; vimPlugins.codediff-nvim: rename from vscode-diff-nvim (#479502)
parents dd521cd9 8c95f0d9

pkgs/applications/editors/vim/plugins/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ mapAliases ( 
    vimproc = vimproc-vim;

    vimshell = vimshell-vim;

    vinegar = vim-vinegar;

    vscode-diff-nvim = codediff-nvim; # Added 2026-01-12

    watchdogs = vim-watchdogs;

    WebAPI = webapi-vim;

    wombat256 = wombat256-vim; # backwards compat, added 2015-7-8

pkgs/applications/editors/vim/plugins/generated.nix

+0 −13
Original line number Diff line number Diff line
@@ -22598,19 +22598,6 @@ final: prev: { 
    meta.hydraPlatforms = [ ];

  };













  vscode-diff-nvim = buildVimPlugin {













    pname = "vscode-diff.nvim";













    version = "2.8.0-unstable-2026-01-10";













    src = fetchFromGitHub {













      owner = "esmuellert";













      repo = "codediff.nvim";













      rev = "5c52cdd4d007e72062cb0fd2fb398197b6d51040";













      hash = "sha256-pGDjzwjz3OOpMOAJGR5oHAv/LBlUlbMbYGenvB8SNiU=";













    };













    meta.homepage = "https://github.com/esmuellert/codediff.nvim/";













    meta.hydraPlatforms = [ ];













  };



























  vscode-nvim = buildVimPlugin {















    pname = "vscode.nvim";















    version = "0-unstable-2025-12-03";

























pkgs/applications/editors/vim/plugins/non-generated/vscode-diff-nvim/default.nix→pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix



+4
−4






























Original line number
Diff line number
Diff line








@@ -7,14 +7,14 @@













  vimPlugins,















}:















vimUtils.buildVimPlugin rec {













  pname = "vscode-diff.nvim";













  version = "1.6.2";













  pname = "codediff.nvim";













  version = "2.9.1";































  src = fetchFromGitHub {















    owner = "esmuellert";













    repo = "vscode-diff.nvim";













    repo = "codediff.nvim";















    tag = "v${version}";













    hash = "sha256-FyfVmxX40hAk1ch1PWtNi3FszAKfDk7XKEpnZfBw4I4=";













    hash = "sha256-xIm3/Dxn77rRtUwaKE+3xed8Yyrfnte/aroRcgqiuXM=";















  };































  dependencies = [ vimPlugins.nui-nvim ];

































pkgs/applications/editors/vim/plugins/vim-plugin-names



+0
−1






























Original line number
Diff line number
Diff line








@@ -246,7 +246,6 @@ https://github.com/ravitemer/codecompanion-history.nvim/,HEAD,













https://github.com/franco-ruggeri/codecompanion-lualine.nvim/,HEAD,















https://github.com/franco-ruggeri/codecompanion-spinner.nvim/,HEAD,















https://github.com/olimorris/codecompanion.nvim/,HEAD,













https://github.com/esmuellert/codediff.nvim/,HEAD,















https://github.com/mrjones2014/codesettings.nvim/,HEAD,















https://github.com/gorbit99/codewindow.nvim/,HEAD,















https://github.com/metakirby5/codi.vim/,,