gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vimPlugins: disallow packaging plugins that are already in luaPackages (#376370)

Browse Source
This commit is contained in:
Gaétan Lepage
2025-02-08 11:44:34 +01:00
committed by GitHub
parent 8def06468e b1ffdffb01
commit 477ea70955
4 changed files with 43 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/vim/plugins/generated.nix
-197
View File
@@ -4535,19 +4535,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
fidget-nvim = buildNeovimPlugin {
pname = "fidget.nvim";
version = "2025-01-08";
src = fetchFromGitHub {
owner = "j-hui";
repo = "fidget.nvim";
rev = "a0abbf18084b77d28bc70e24752e4f4fd54aea17";
sha256 = "1117w5i7996vxx32vibb09zpzzgwaipj5ldkdgck3ds5vkcdlk53";
};
meta.homepage = "https://github.com/j-hui/fidget.nvim/";
meta.hydraPlatforms = [ ];
};
file-line = buildVimPlugin {
pname = "file-line";
version = "2016-10-21";
@@ -5109,19 +5096,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
gitsigns-nvim = buildNeovimPlugin {
pname = "gitsigns.nvim";
version = "2025-01-24";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "d8918f06624dd53b9a82bd0e29c31bcfd541b40d";
sha256 = "19j7y5z9sz967rcyk4lxb3l5z3rrk07fi6wakvxqnwqwqvag4x9x";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
meta.hydraPlatforms = [ ];
};
gitv = buildVimPlugin {
pname = "gitv";
version = "2019-08-22";
@@ -5904,19 +5878,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
image-nvim = buildNeovimPlugin {
pname = "image.nvim";
version = "2025-01-17";
src = fetchFromGitHub {
owner = "3rd";
repo = "image.nvim";
rev = "6ffafab2e98b5bda46bf227055aa84b90add8cdc";
sha256 = "105k4ccv18nynm70lphb4ac3ih1ad4hlh2syrhmyi1i1jwdirjgz";
};
meta.homepage = "https://github.com/3rd/image.nvim/";
meta.hydraPlatforms = [ ];
};
img-clip-nvim = buildVimPlugin {
pname = "img-clip.nvim";
version = "2025-01-24";
@@ -7116,20 +7077,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
luasnip = buildNeovimPlugin {
pname = "luasnip";
version = "2025-01-04";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "c9b9a22904c97d0eb69ccb9bab76037838326817";
sha256 = "1m9a2vka968yklknp8fcmg5lz7w0lb7rwn13b0ppy89ixy0mjxj5";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
meta.hydraPlatforms = [ ];
};
luasnip-latex-snippets-nvim = buildVimPlugin {
pname = "luasnip-latex-snippets.nvim";
version = "2024-11-25";
@@ -7156,19 +7103,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
lush-nvim = buildNeovimPlugin {
pname = "lush.nvim";
version = "2024-08-16";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "lush.nvim";
rev = "45a79ec4acb5af783a6a29673a999ce37f00497e";
sha256 = "0ac93sdhsi41hpwpshffpkvj5c3kklflsy0pln77743x69g05rcr";
};
meta.homepage = "https://github.com/rktjmp/lush.nvim/";
meta.hydraPlatforms = [ ];
};
lushtags = buildVimPlugin {
pname = "lushtags";
version = "2017-04-19";
@@ -8769,19 +8703,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
neotest = buildNeovimPlugin {
pname = "neotest";
version = "2025-01-02";
src = fetchFromGitHub {
owner = "nvim-neotest";
repo = "neotest";
rev = "d66cf4e05a116957f0d3a7755a24291c7d1e1f72";
sha256 = "09bxarrrfnqvyv22ls6lm0y03ngcp6r372b8hy4rld902psdb11q";
};
meta.homepage = "https://github.com/nvim-neotest/neotest/";
meta.hydraPlatforms = [ ];
};
neotest-bash = buildVimPlugin {
pname = "neotest-bash";
version = "2024-05-06";
@@ -9513,19 +9434,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
nui-nvim = buildNeovimPlugin {
pname = "nui.nvim";
version = "2024-12-10";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "nui.nvim";
rev = "53e907ffe5eedebdca1cd503b00aa8692068ca46";
sha256 = "1m4vlf9qcs01a8qrq3salcz966sp8cpf01gbrg8dbf255vzc8kp9";
};
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
meta.hydraPlatforms = [ ];
};
null-ls-nvim = buildVimPlugin {
pname = "null-ls.nvim";
version = "2023-08-12";
@@ -9695,19 +9603,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
nvim-cmp = buildNeovimPlugin {
pname = "nvim-cmp";
version = "2025-01-23";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
rev = "12509903a5723a876abd65953109f926f4634c30";
sha256 = "0a592vvfbyv1y1j9bbiq7wxy0vp63bwngjav0qkm0czdf8y4b3kb";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
meta.hydraPlatforms = [ ];
};
nvim-code-action-menu = buildVimPlugin {
pname = "nvim-code-action-menu";
version = "2023-12-11";
@@ -10436,19 +10331,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
nvim-nio = buildNeovimPlugin {
pname = "nvim-nio";
version = "2025-01-20";
src = fetchFromGitHub {
owner = "nvim-neotest";
repo = "nvim-nio";
rev = "21f5324bfac14e22ba26553caf69ec76ae8a7662";
sha256 = "1bz5msxwk232zkkhfxcmr7a665la8pgkdx70q99ihl4x04jg6dkq";
};
meta.homepage = "https://github.com/nvim-neotest/nvim-nio/";
meta.hydraPlatforms = [ ];
};
nvim-nonicons = buildVimPlugin {
pname = "nvim-nonicons";
version = "2023-02-04";
@@ -11386,19 +11268,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
orgmode = buildNeovimPlugin {
pname = "orgmode";
version = "2025-01-26";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
rev = "98bf44d0adfaa04bd02c0ae630b182fba892cbbd";
sha256 = "08rryqbqynaw0c8rqy7j22adyplm091x2qhxbfzq39qi15h4b2dp";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
meta.hydraPlatforms = [ ];
};
other-nvim = buildVimPlugin {
pname = "other.nvim";
version = "2024-11-30";
@@ -11543,19 +11412,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
papis-nvim = buildNeovimPlugin {
pname = "papis.nvim";
version = "2025-01-27";
src = fetchFromGitHub {
owner = "jghauser";
repo = "papis.nvim";
rev = "77e4e489ce1adfbc27b41f57a444ca2828f367c5";
sha256 = "1qwihqd0lkj22k0vvwxi6g7shiys86y7wb85f1771b8hvals2qwx";
};
meta.homepage = "https://github.com/jghauser/papis.nvim/";
meta.hydraPlatforms = [ ];
};
parpar-nvim = buildVimPlugin {
pname = "parpar.nvim";
version = "2023-09-12";
@@ -11712,19 +11568,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
plenary-nvim = buildNeovimPlugin {
pname = "plenary.nvim";
version = "2025-01-12";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
rev = "3707cdb1e43f5cea73afb6037e6494e7ce847a66";
sha256 = "1h73y4ahj8rf6qiyjkm3jw9158fbkiix4kzig78jknvq8vgdgk6p";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
meta.hydraPlatforms = [ ];
};
poimandres-nvim = buildVimPlugin {
pname = "poimandres.nvim";
version = "2024-10-19";
@@ -12326,20 +12169,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
rest-nvim = buildNeovimPlugin {
pname = "rest.nvim";
version = "2025-01-01";
src = fetchFromGitHub {
owner = "rest-nvim";
repo = "rest.nvim";
rev = "62606c3599bd304227457d6e20580965939b191e";
sha256 = "0rbp8fq0ya2rx9njxs9ynrrw4pv50rpkd1lfvvw2p1c06xr63a75";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
meta.hydraPlatforms = [ ];
};
restore-view-vim = buildVimPlugin {
pname = "restore-view-vim";
version = "2014-11-21";
@@ -13815,19 +13644,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
telescope-manix = buildNeovimPlugin {
pname = "telescope-manix";
version = "2025-01-26";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "telescope-manix";
rev = "fce4719aecfefdc7ddd15b1b82136d75f7994a4c";
sha256 = "1v5a60smjyrfsmwmjnpbapzskzf705lknn3ii7lw90xav82dj9sp";
};
meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
meta.hydraPlatforms = [ ];
};
telescope-media-files-nvim = buildVimPlugin {
pname = "telescope-media-files.nvim";
version = "2023-02-19";
@@ -13841,19 +13657,6 @@ final: prev:
meta.hydraPlatforms = [ ];
};
telescope-nvim = buildNeovimPlugin {
pname = "telescope.nvim";
version = "2025-01-08";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "415af52339215926d705cccc08145f3782c4d132";
sha256 = "1hzyqax197i36a6z1rm25grwbl0r7k3qwhybjils20lshanjqbz7";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
meta.hydraPlatforms = [ ];
};
telescope-project-nvim = buildVimPlugin {
pname = "telescope-project.nvim";
version = "2024-12-01";
pkgs/applications/editors/vim/plugins/overrides.nix
+41 -49
View File
@@ -1222,7 +1222,7 @@ in
fzf-lua = neovimUtils.buildNeovimPlugin {
luaAttr = luaPackages.fzf-lua;
propagatedBuildInputs = [ fzf ];
runtimeDeps = [ fzf ];
};
fzf-vim = super.fzf-vim.overrideAttrs {
@@ -1630,10 +1630,6 @@ in
dependencies = [ self.plenary-nvim ];
};
lsp-progress-nvim = neovimUtils.buildNeovimPlugin {
luaAttr = luaPackages.lsp-progress-nvim;
};
lsp_lines-nvim = callPackage ./non-generated/lsp_lines-nvim { };
lspecho-nvim = super.lspecho-nvim.overrideAttrs {
@@ -1671,18 +1667,6 @@ in
checkInputs = [ self.luasnip ];
};
lz-n = neovimUtils.buildNeovimPlugin {
luaAttr = luaPackages.lz-n;
};
lze = neovimUtils.buildNeovimPlugin {
luaAttr = luaPackages.lze;
};
lzn-auto-require = neovimUtils.buildNeovimPlugin {
luaAttr = luaPackages.lzn-auto-require;
};
magma-nvim = super.magma-nvim.overrideAttrs {
passthru.python3Dependencies =
ps: with ps; [
@@ -1729,7 +1713,7 @@ in
};
markid = super.markid.overrideAttrs {
dependencies = with super; [ nvim-treesitter ];
dependencies = [ self.nvim-treesitter ];
};
mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs {
@@ -1773,10 +1757,6 @@ in
meta.maintainers = with lib.maintainers; [ vcunat ];
};
middleclass = neovimUtils.buildNeovimPlugin {
luaAttr = luaPackages.middleclass;
};
mind-nvim = super.mind-nvim.overrideAttrs {
dependencies = [ self.plenary-nvim ];
};
@@ -1920,12 +1900,6 @@ in
];
};
neorg = neovimUtils.buildNeovimPlugin {
luaAttr = luaPackages.neorg;
doInstallCheck = true;
};
neorg-telescope = super.neorg-telescope.overrideAttrs {
buildInputs = [ luaPackages.lua-utils-nvim ];
dependencies = with self; [
@@ -2747,14 +2721,9 @@ in
];
};
# TODO: runtimedeps
plenary-nvim = super.plenary-nvim.overrideAttrs {
postPatch = ''
sed -Ei lua/plenary/curl.lua \
-e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@'
'';
doInstallCheck = true;
plenary-nvim = neovimUtils.buildNeovimPlugin {
luaAttr = luaPackages.plenary-nvim;
runtimeDeps = [ curl ];
};
poimandres-nvim = super.poimandres-nvim.overrideAttrs {
@@ -2862,18 +2831,6 @@ in
];
};
rocks-nvim = neovimUtils.buildNeovimPlugin {
luaAttr = luaPackages.rocks-nvim;
};
rocks-config-nvim = neovimUtils.buildNeovimPlugin {
luaAttr = luaPackages.rocks-config-nvim;
};
rtp-nvim = neovimUtils.buildNeovimPlugin {
luaAttr = luaPackages.rtp-nvim;
};
rustaceanvim = neovimUtils.buildNeovimPlugin {
checkInputs = [
# Optional integration
@@ -3022,7 +2979,7 @@ in
};
startup-nvim = super.startup-nvim.overrideAttrs {
dependencies = with super; [ plenary-nvim ];
dependencies = [ self.plenary-nvim ];
};
statix = buildVimPlugin rec {
@@ -4066,3 +4023,38 @@ in
in
lib.genAttrs nodePackageNames nodePackage2VimPackage
)
// (
let
luarocksPackageNames = [
"fidget-nvim"
"gitsigns-nvim"
"image-nvim"
"lsp-progress-nvim"
"luasnip"
"lush-nvim"
"lz-n"
"lze"
"lzn-auto-require"
"middleclass"
"neorg"
"neotest"
"nui-nvim"
"nvim-cmp"
"nvim-nio"
"orgmode"
"papis-nvim"
"rest-nvim"
"rocks-config-nvim"
"rocks-nvim"
"rtp-nvim"
"telescope-manix"
"telescope-nvim"
];
toVimPackage =
name:
neovimUtils.buildNeovimPlugin {
luaAttr = luaPackages.${name};
};
in
lib.genAttrs luarocksPackageNames toVimPackage
)
pkgs/applications/editors/vim/plugins/update.py
+2
View File
@@ -103,6 +103,8 @@ class VimEditor(pluginupdate.Editor):
def plugin2nix(
self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool
) -> str:
if isNeovim:
raise RuntimeError(f"Plugin {plugin.name} is already packaged in `luaPackages`, please use that")
repo = pdesc.repo
content = f" {plugin.normalized_name} = "
pkgs/applications/editors/vim/plugins/vim-plugin-names
-13
View File
@@ -346,7 +346,6 @@ https://github.com/lilydjwg/fcitx.vim/,fcitx5,
https://github.com/freddiehaddad/feline.nvim/,,
https://github.com/bakpakin/fennel.vim/,,
https://github.com/wincent/ferret/,,
https://github.com/j-hui/fidget.nvim/,,
https://github.com/bogado/file-line/,,
https://github.com/lewis6991/fileline.nvim/,,
https://github.com/glacambre/firenvim/,HEAD,
@@ -390,7 +389,6 @@ https://github.com/ThePrimeagen/git-worktree.nvim/,,
https://github.com/wintermute-cell/gitignore.nvim/,HEAD,
https://github.com/vim-scripts/gitignore.vim/,,
https://github.com/ruifm/gitlinker.nvim/,,
https://github.com/lewis6991/gitsigns.nvim/,,
https://github.com/gregsexton/gitv/,,
https://github.com/DNLHC/glance.nvim/,HEAD,
https://github.com/gleam-lang/gleam.vim/,,
@@ -451,7 +449,6 @@ https://github.com/cocopon/iceberg.vim/,,
https://github.com/idris-hackers/idris-vim/,,
https://github.com/idris-community/idris2-nvim/,,
https://github.com/edwinb/idris2-vim/,,
https://github.com/3rd/image.nvim/,HEAD,
https://github.com/HakonHarnes/img-clip.nvim/,HEAD,
https://github.com/lewis6991/impatient.nvim/,,
https://github.com/backdround/improved-search.nvim/,HEAD,
@@ -544,10 +541,8 @@ https://github.com/barreiroleo/ltex_extra.nvim/,HEAD,
https://github.com/nvim-java/lua-async/,HEAD,
https://github.com/arkav/lualine-lsp-progress/,,
https://github.com/nvim-lualine/lualine.nvim/,,
https://github.com/l3mon4d3/luasnip/,,
https://github.com/evesdropper/luasnip-latex-snippets.nvim/,HEAD,
https://github.com/alvarosevilla95/luatab.nvim/,,
https://github.com/rktjmp/lush.nvim/,,
https://github.com/mkasa/lushtags/,,
https://github.com/Bilal2453/luvit-meta/,HEAD,
https://github.com/dccsillag/magma-nvim/,HEAD,
@@ -671,7 +666,6 @@ https://github.com/karb94/neoscroll.nvim/,,
https://github.com/Shougo/neosnippet-snippets/,,
https://github.com/Shougo/neosnippet.vim/,,
https://github.com/kassio/neoterm/,,
https://github.com/nvim-neotest/neotest/,HEAD,
https://github.com/rcasia/neotest-bash/,HEAD,
https://github.com/sidlatau/neotest-dart/,HEAD,
https://github.com/MarkEmmons/neotest-deno/,HEAD,
@@ -728,7 +722,6 @@ https://github.com/shaunsingh/nord.nvim/,,
https://github.com/andersevenrud/nordic.nvim/,,
https://github.com/vigoux/notifier.nvim/,HEAD,
https://github.com/jlesquembre/nterm.nvim/,,
https://github.com/MunifTanjim/nui.nvim/,main,
https://github.com/jose-elias-alvarez/null-ls.nvim/,,
https://github.com/nacro90/numb.nvim/,,
https://github.com/nvchad/nvchad/,HEAD,
@@ -797,7 +790,6 @@ https://github.com/gpanders/nvim-moonwalk/,,
https://github.com/SmiteshP/nvim-navbuddy/,,
https://github.com/smiteshp/nvim-navic/,HEAD,
https://github.com/AckslD/nvim-neoclip.lua/,,
https://github.com/nvim-neotest/nvim-nio/,HEAD,
https://github.com/ya2s/nvim-nonicons/,,
https://github.com/rcarriga/nvim-notify/,,
https://github.com/LhKipp/nvim-nu/,HEAD,
@@ -870,7 +862,6 @@ https://github.com/tyru/open-browser-github.vim/,,
https://github.com/tyru/open-browser.vim/,,
https://github.com/Almo7aya/openingh.nvim/,,
https://github.com/salkin-mada/openscad.nvim/,HEAD,
https://github.com/nvim-orgmode/orgmode/,,
https://github.com/rgroli/other.nvim/,HEAD,
https://github.com/jmbuhr/otter.nvim/,,
https://github.com/hedyhli/outline.nvim/,HEAD,
@@ -882,7 +873,6 @@ https://github.com/drewtempelmeyer/palenight.vim/,,
https://github.com/JoosepAlviste/palenightfall.nvim/,,
https://github.com/roobert/palette.nvim/,HEAD,
https://github.com/NLKNguyen/papercolor-theme/,,
https://github.com/jghauser/papis.nvim/,HEAD,
https://github.com/dundalek/parpar.nvim/,,
https://github.com/tmsvg/pear-tree/,,
https://github.com/steelsojka/pears.nvim/,,
@@ -895,7 +885,6 @@ https://github.com/motus/pig.vim/,,
https://github.com/weirongxu/plantuml-previewer.vim/,HEAD,
https://github.com/aklt/plantuml-syntax/,,
https://github.com/nvim-treesitter/playground/,,
https://github.com/nvim-lua/plenary.nvim/,,
https://github.com/olivercederborg/poimandres.nvim/,HEAD,
https://github.com/epwalsh/pomo.nvim/,HEAD,
https://github.com/dleonard0/pony-vim-syntax/,,
@@ -942,7 +931,6 @@ https://github.com/MeanderingProgrammer/render-markdown.nvim/,,
https://github.com/gabrielpoca/replacer.nvim/,HEAD,
https://github.com/9seconds/repolink.nvim/,HEAD,
https://github.com/stevearc/resession.nvim/,HEAD,
https://github.com/rest-nvim/rest.nvim/,,
https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim
https://github.com/gu-fan/riv.vim/,,
https://github.com/kevinhwang91/rnvimr/,,
@@ -1069,7 +1057,6 @@ https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
https://github.com/nvim-telescope/telescope-z.nvim/,,
https://github.com/natecraddock/telescope-zf-native.nvim/,HEAD,
https://github.com/jvgrootveld/telescope-zoxide/,,
https://github.com/nvim-telescope/telescope.nvim/,,
https://github.com/luc-tielen/telescope_hoogle/,HEAD,
https://github.com/joerdav/templ.vim/,HEAD,
https://github.com/axelvc/template-string.nvim/,HEAD,