From aa88b95202fcfd930a22626bd67385c6ab54d890 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:54:07 -0500 Subject: [PATCH] vimPlugins.tup: move to non-generated Looks like it was missed in `overrides.nix` when it should be in non-generated. Signed-off-by: Austin Horstman --- .../vim/plugins/non-generated/tup/default.nix | 21 +++++++++++++++++++ .../editors/vim/plugins/overrides.nix | 19 ----------------- 2 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix diff --git a/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix new file mode 100644 index 000000000000..6a92e835a642 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vimUtils, + tup, +}: +let + # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim + ftdetect = builtins.toFile "tup.vim" '' + au BufNewFile,BufRead Tupfile,*.tup setf tup + ''; +in +vimUtils.buildVimPlugin { + inherit (tup) pname version src; + preInstall = '' + mkdir -p vim-plugin/syntax vim-plugin/ftdetect + cp contrib/syntax/tup.vim vim-plugin/syntax/tup.vim + cp "${ftdetect}" vim-plugin/ftdetect/tup.vim + cd vim-plugin + ''; + meta.maintainers = with lib.maintainers; [ enderger ]; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d6f00e994604..e51deb33832d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -47,7 +47,6 @@ stylish-haskell, tabnine, tmux, - tup, typescript, typescript-language-server, vim, @@ -3587,24 +3586,6 @@ in dependencies = [ self.nvim-treesitter ]; }; - tup = - let - # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim - ftdetect = builtins.toFile "tup.vim" '' - au BufNewFile,BufRead Tupfile,*.tup setf tup - ''; - in - buildVimPlugin { - inherit (tup) pname version src; - preInstall = '' - mkdir -p vim-plugin/syntax vim-plugin/ftdetect - cp contrib/syntax/tup.vim vim-plugin/syntax/tup.vim - cp "${ftdetect}" vim-plugin/ftdetect/tup.vim - cd vim-plugin - ''; - meta.maintainers = with lib.maintainers; [ enderger ]; - }; - typescript-nvim = super.typescript-nvim.overrideAttrs { checkInputs = [ # Optional null-ls integration