From fe9090bb4d00a7839e6081b56b45e7b192d5230b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 3 Jun 2026 15:22:50 -0500 Subject: [PATCH] vimPlugins: remove stale nvimSkipModules Drop skip entries that are no longer part of neovim-require-check discovery after the scope fixes. --- .../vim/plugins/nvim-treesitter/overrides.nix | 2 - .../editors/vim/plugins/overrides.nix | 143 ------------------ pkgs/development/lua-modules/overrides.nix | 4 - 3 files changed, 149 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 6f1fb384f9af..84051feecadc 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -144,8 +144,6 @@ let grammarPlugins = lib.mapAttrs (_: grammarToPlugin) parsersWithMeta; in { - nvimSkipModules = [ "nvim-treesitter._meta.parsers" ]; - passthru = super.nvim-treesitter.passthru or { } // { inherit buildQueries diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 99b1a62768ca..68273102f7f2 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -305,9 +305,6 @@ assertNoAdditions { "bamboo.colors" "bamboo.terminal" "bamboo.highlights" - "bamboo-light" - "bamboo-vulgaris" - "bamboo-multiplex" "barbecue.theme.bamboo" ]; meta = old.meta // { @@ -350,15 +347,6 @@ assertNoAdditions { base46 = super.base46.overrideAttrs (old: { dependencies = [ self.nvchad-ui ]; - # Requires global config setup - nvimSkipModules = [ - "nvchad.configs.cmp" - "nvchad.configs.gitsigns" - "nvchad.configs.luasnip" - "nvchad.configs.mason" - "nvchad.configs.nvimtree" - "nvchad.configs.telescope" - ]; meta = old.meta // { license = lib.licenses.mit; }; @@ -411,12 +399,6 @@ assertNoAdditions { blink-cmp-npm-nvim = super.blink-cmp-npm-nvim.overrideAttrs { nvimSkipModules = [ - # Test files - "blink-cmp-npm.utils.compute_meta_spec" - "blink-cmp-npm.utils.generate_doc_spec" - "blink-cmp-npm.utils.ignore_version_spec" - "blink-cmp-npm.utils.is_cursor_in_dependencies_node_spec" - "blink-cmp-npm.utils.semantic_sort_spec" "minit" ]; }; @@ -483,8 +465,6 @@ assertNoAdditions { catppuccin-nvim = super.catppuccin-nvim.overrideAttrs { nvimSkipModules = [ "catppuccin.groups.integrations.noice" - "catppuccin.groups.integrations.feline" - "catppuccin.lib.vim.init" # TODO(@mrcjkb): re-enable when https://github.com/catppuccin/nvim/pull/995 # has been merged and released. @@ -709,13 +689,6 @@ assertNoAdditions { cmp-dictionary = super.cmp-dictionary.overrideAttrs { checkInputs = [ self.nvim-cmp ]; - nvimSkipModules = [ - # Test files - "cmp_dictionary.dict.external_spec" - "cmp_dictionary.dict.trie_spec" - "cmp_dictionary.lib.trie_spec" - "cmp_dictionary.lib.unknown_spec" - ]; }; cmp-digraphs = super.cmp-digraphs.overrideAttrs { @@ -947,12 +920,6 @@ assertNoAdditions { ]; dependencies = [ self.plenary-nvim ]; nvimSkipModules = [ - # Requires setup call - "codecompanion.actions.static" - "codecompanion.actions.init" - # Address in use error from fzf-lua on darwin - # https://github.com/NixOS/nixpkgs/issues/431458 - "codecompanion.providers.actions.fzf_lua" # Test "minimal" ]; @@ -1033,13 +1000,6 @@ assertNoAdditions { conjure = super.conjure.overrideAttrs { dependencies = [ self.plenary-nvim ]; nvimSkipModules = [ - # Test mismatch of directory because of nix generated path - "conjure-spec.client.clojure.nrepl.server_spec" - "conjure-spec.client.common-lisp.swank_spec" - "conjure-spec.client.fennel.nfnl_spec" - "conjure-spec.client.guile.socket_spec" - "conjure-spec.client.scheme.stdio_spec" - "conjure-spec.process_spec" # No parser for fennel "conjure.client.fennel.def-str-util" ]; @@ -1206,8 +1166,6 @@ assertNoAdditions { darkearth-nvim = super.darkearth-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; - # Lua module used to build theme - nvimSkipModules = [ "shipwright_build" ]; }; ddc-filter-matcher_head = super.ddc-filter-matcher_head.overrideAttrs { @@ -1363,12 +1321,6 @@ assertNoAdditions { dependencies = [ self.image-nvim ]; }; - diffs-nvim = super.diffs-nvim.overrideAttrs { - nvimSkipModules = [ - "minimal_init" - ]; - }; - diffview-nvim = super.diffview-nvim.overrideAttrs (old: { dependencies = [ self.plenary-nvim ]; @@ -1571,17 +1523,6 @@ assertNoAdditions { ]; }; - fyler-nvim = super.fyler-nvim.overrideAttrs { - nvimSkipModules = [ - # Requires setup call - "fyler.views.explorer.init" - "fyler.views.explorer.actions" - "fyler.views.explorer.ui" - "fyler.explorer.ui" - "fyler.explorer" - ]; - }; - fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs { # The plugin has a makefile which tries to run tests in a docker container. # This prevents it. @@ -1611,7 +1552,6 @@ assertNoAdditions { fzf-lua = super.fzf-lua.overrideAttrs { runtimeDeps = [ fzf ]; nvimSkipModules = [ - "fzf-lua.shell_helper" "fzf-lua.spawn" "fzf-lua.rpc" "fzf-lua.types" @@ -1699,7 +1639,6 @@ assertNoAdditions { "go.ginkgo" "go.gotest" "go.gotests" - "go.inlay" "go.project" "go.snips" "go.tags" @@ -1832,10 +1771,6 @@ assertNoAdditions { ]; }; - helpview-nvim = super.helpview-nvim.overrideAttrs { - nvimSkipModules = [ "definitions.__vimdoc" ]; - }; - hex-nvim = super.hex-nvim.overrideAttrs { runtimeDeps = [ xxd ]; }; @@ -2055,14 +1990,6 @@ assertNoAdditions { ]; }; - kanagawa-paper-nvim = super.kanagawa-paper-nvim.overrideAttrs { - nvimSkipModules = [ - # skipping wezterm theme switcher since it relies on a wezterm module - # that does not seem to be available, tried to build setting wezterm-nvim as a dep - "wezterm.theme_switcher" - ]; - }; - kulala-nvim = super.kulala-nvim.overrideAttrs ( old: let @@ -2152,10 +2079,8 @@ assertNoAdditions { "lazyvim.plugins.extras.formatting.prettier" "lazyvim.plugins.extras.lang.dotnet" "lazyvim.plugins.extras.lang.markdown" - "lazyvim.plugins.extras.lang.omnisharp" "lazyvim.plugins.extras.lang.python" "lazyvim.plugins.extras.lang.svelte" - "lazyvim.plugins.extras.lang.typescript" "lazyvim.plugins.extras.lang.typescript.init" "lazyvim.plugins.extras.lang.typescript.vtsls" "lazyvim.plugins.init" @@ -2374,11 +2299,6 @@ assertNoAdditions { telescope-nvim ]; - nvimSkipModules = [ - # Ignore livepreview._spec as it fails nvimRequireCheck. - # This file runs tests on require which unfortunately fails as it attempts to require the base plugin. See https://github.com/brianhuster/live-preview.nvim/blob/5890c4f7cb81a432fd5f3b960167757f1b4d4702/lua/livepreview/_spec.lua#L25 - "livepreview._spec" - ]; meta = old.meta // { license = lib.licenses.gpl3Only; }; @@ -2626,7 +2546,6 @@ assertNoAdditions { "minuet.backends.claude" "minuet.backends.codestral" "minuet.backends.gemini" - "minuet.backends.huggingface" "minuet.backends.openai" "minuet.backends.openai_compatible" "minuet.backends.openai_fim_compatible" @@ -3328,17 +3247,6 @@ assertNoAdditions { doInstallCheck = true; }; - nvim-highlight-colors = super.nvim-highlight-colors.overrideAttrs { - # Test module - nvimSkipModules = [ - "nvim-highlight-colors.utils_spec" - "nvim-highlight-colors.buffer_utils_spec" - "nvim-highlight-colors.color.converters_spec" - "nvim-highlight-colors.color.patterns_spec" - "nvim-highlight-colors.color.utils_spec" - ]; - }; - nvim-highlite = super.nvim-highlite.overrideAttrs (old: { meta = old.meta // { license = lib.licenses.gpl3Plus; @@ -3557,35 +3465,6 @@ assertNoAdditions { }; nvim-tree-lua = super.nvim-tree-lua.overrideAttrs (old: { - nvimSkipModules = [ - # Meta can't be required - "nvim-tree._meta.api" - "nvim-tree._meta.api_decorator" - "nvim-tree._meta.api.decorator_example" - "nvim-tree._meta.classes" - "nvim-tree._meta.config.filters" - "nvim-tree._meta.config.actions" - "nvim-tree._meta.config.git" - "nvim-tree._meta.config.renderer" - "nvim-tree._meta.config.experimental" - "nvim-tree._meta.config.tab" - "nvim-tree._meta.config.modified" - "nvim-tree._meta.config.help" - "nvim-tree._meta.config.notify" - "nvim-tree._meta.config.sort" - "nvim-tree._meta.config.view" - "nvim-tree._meta.config.update_focused_file" - "nvim-tree._meta.config.diagnostics" - "nvim-tree._meta.config.log" - "nvim-tree._meta.config.system_open" - "nvim-tree._meta.config.ui" - "nvim-tree._meta.config.hijack_directories" - "nvim-tree._meta.config.trash" - "nvim-tree._meta.config.filesystem_watchers" - "nvim-tree._meta.config.live_filter" - "nvim-tree._meta.config.bookmarks" - "nvim-tree._meta.config" - ]; meta = old.meta // { license = lib.licenses.gpl3Plus; }; @@ -3595,11 +3474,6 @@ assertNoAdditions { callPackage ./nvim-treesitter/overrides.nix { } self super ); - nvim-treesitter-context = super.nvim-treesitter-context.overrideAttrs { - # Meant for CI installing parsers - nvimSkipModules = [ "install_parsers" ]; - }; - # TODO: raise warning at 26.05; drop at 26.11 nvim-treesitter-legacy = let @@ -4027,16 +3901,6 @@ assertNoAdditions { qmk-nvim = super.qmk-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimSkipModules = [ - # Test assertions - "qmk.config.init_spec" - "qmk.format.keymap_spec" - "qmk.format.qmk_spec" - "qmk.format.zmk_spec" - "qmk.parse.qmk.init_spec" - "qmk.parse.zmk.init_spec" - "qmk_spec" - ]; }; quarto-nvim = super.quarto-nvim.overrideAttrs (old: { @@ -4271,7 +4135,6 @@ assertNoAdditions { smart-splits-nvim = super.smart-splits-nvim.overrideAttrs { nvimSkipModules = [ "vimdoc-gen" - "vimdocrc" ]; }; @@ -4294,7 +4157,6 @@ assertNoAdditions { "snacks.gh.actions" "snacks.gh.buf" "snacks.gh.init" - "snacks.gh.render" "snacks.gh.render.init" "snacks.git" "snacks.image.convert" @@ -5539,11 +5401,6 @@ assertNoAdditions { }; }); - vim-matchup = super.vim-matchup.overrideAttrs { - # Optional treesitter integration - nvimSkipModules = "treesitter-matchup.third-party.query"; - }; - vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs { passthru.python3Dependencies = [ python3.pkgs.mwclient ]; }; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index aa47a9ec9a49..b5616ef99519 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1089,10 +1089,6 @@ in # TODO: figure out darwin failure doCheck = lua.luaversion == "5.1" && stdenv.hostPlatform.isLinux; - nvimSkipModules = [ - "bootstrap" # tries to install luarocks from network - ]; - bustedFlags = [ "--run=offline" ];