vimPlugins: remove rust-tools-nvim and reject aliases that shadow plugins (#568027)

This commit is contained in:
Austin Horstman
2026-09-29 21:01:38 +00:00
committed by GitHub
5 changed files with 10 additions and 30 deletions

View File

@@ -17,16 +17,8 @@ let
# sets from building on Hydra.
removeDistribute = alias: if lib.isDerivation alias then lib.dontDistribute alias else alias;
# Make sure that we are not shadowing something from
# all-packages.nix.
checkInPkgs =
n: alias: if builtins.hasAttr n prev then throw "Alias ${n} is still in vim-plugins" else alias;
mapAliases =
aliases:
lib.mapAttrs (
n: alias: removeDistribute (removeRecurseForDerivations (checkInPkgs n alias))
) aliases;
aliases: lib.mapAttrs (_: alias: removeDistribute (removeRecurseForDerivations alias)) aliases;
deprecations = lib.mapAttrs (
old: info:
@@ -64,7 +56,7 @@ mapAliases (
playground = throw "'vimPlugins.playground' has been archived"; # Added 2025-12-18
pure-lua = lib.warnOnInstantiate "Please replace 'vimPlugins.pure-lua' with 'vimPlugins.moonlight-nvim' as this name was an error" moonlight-nvim; # Added 2025-11-17
registers-nvim = throw "'vimPlugins.registers-nvim' has been removed: the upstream repository got deleted"; # Added 2026-04-30
rust-tools-nvim = lib.warnOnInstantiate "'vimPlugins.rust-tools-nvim' is abandoned by upstream; you should use 'vimPlugins.rustaceanvim'" rust-tools-nvim; # Added 2026-02-04
rust-tools-nvim = throw "'vimPlugins.rust-tools-nvim' has been removed: abandoned by upstream. Use rustaceanvim"; # Added 2026-09-28
Spacegray-vim = throw "'vimPlugins.Spacegray-vim' has been removed: abandoned by upstream"; # Added 2025-03-24
SpaceVim = throw "'vimPlugins.SpaceVim' didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # Added 2024-11-27
spacevim = throw "'vimPlugins.spacevim' was unmaintained for the last 6 years, please use top-level 'spacevim'"; # Added 2024-11-27

View File

@@ -55,7 +55,14 @@ let
inherit llvmPackages;
};
aliases = if config.allowAliases then (import ./aliases.nix lib) else final: prev: { };
aliases =
final: prev:
let
defined = import ./aliases.nix lib final prev;
shadowed = builtins.attrNames (builtins.intersectAttrs prev defined);
in
assert lib.assertMsg (shadowed == [ ]) "vimPlugins aliases shadow plugins: ${toString shadowed}";
lib.optionalAttrs config.allowAliases defined;
in
lib.pipe initialPackages [
(extends plugins)

View File

@@ -16086,20 +16086,6 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
rust-tools-nvim = buildVimPlugin {
pname = "rust-tools.nvim";
version = "0-unstable-2024-01-03";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
rev = "676187908a1ce35ffcd727c654ed68d851299d3e";
hash = "sha256-kFane5ze7VDiOzF7jdmXkr50XQsNvdb+a9HQtybEVE0=";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
meta.license = getLicenseFromSpdxId "MIT";
meta.hydraPlatforms = [ ];
};
rust-vim = buildVimPlugin {
pname = "rust.vim";
version = "0-unstable-2022-11-27";

View File

@@ -4144,10 +4144,6 @@ assertNoAdditions {
};
});
rust-tools-nvim = super.rust-tools-nvim.overrideAttrs {
dependencies = [ self.nvim-lspconfig ];
};
rustaceanvim = super.rustaceanvim.overrideAttrs {
checkInputs = [
# Optional integration

View File

@@ -1147,7 +1147,6 @@ https://github.com/keith/rspec.vim/,,
https://github.com/ccarpita/rtorrent-syntax-file/,,
https://codeberg.org/ssnoer/run.nvim,,
https://github.com/TheLazyCat00/runner-nvim/,,
https://github.com/simrat39/rust-tools.nvim/,,
https://github.com/rust-lang/rust.vim/,,
https://github.com/tris203/rzls.nvim/,,
https://github.com/hauleth/sad.vim/,,