From 2f2e7f8842770c3bf82fb285c14e82a2642f0337 Mon Sep 17 00:00:00 2001 From: "\"The Hedgehog\"" <"me@thehedgehog.me"> Date: Wed, 27 Jul 2022 11:37:25 -0400 Subject: [PATCH 1/3] vimPlugins.mason-nvim: init at 2022-07-27 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 263c0428ff14..8de72284fc2f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4665,6 +4665,18 @@ final: prev: meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; + mason-nvim = buildVimPluginFrom2Nix { + pname = "mason.nvim"; + version = "2022-07-27"; + src = fetchFromGitHub { + owner = "williamboman"; + repo = "mason.nvim"; + rev = "269ee222f76e705619da2c0130c0a06e76419b88"; + sha256 = "1bngr68gfv33p989dqhz6xmhips7i2yjni96qgnqwhdjczfw865v"; + }; + meta.homepage = "https://github.com/williamboman/mason.nvim/"; + }; + matchit-zip = buildVimPluginFrom2Nix { pname = "matchit.zip"; version = "2010-10-18"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index f729c240f5df..a9ddfea76515 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -391,6 +391,7 @@ https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, https://github.com/iamcco/markdown-preview.nvim/,, https://github.com/chentoast/marks.nvim/,, +https://github.com/williamboman/mason.nvim/,HEAD, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, https://github.com/kaicataldo/material.vim/,HEAD, From 8ea667c3f1a5a3a82b60ced067353b0d34593502 Mon Sep 17 00:00:00 2001 From: The Hedgehog Date: Wed, 27 Jul 2022 11:51:08 -0400 Subject: [PATCH 2/3] vimPlugins.mason-tool-installer-nvim: init at 2022-07-26 vimPlugins.mason-lspconfig-nvim: init at 2022-07-25 --- .../editors/vim/plugins/generated.nix | 25 +++++++++++++++++++ .../editors/vim/plugins/vim-plugin-names | 2 ++ 2 files changed, 27 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8de72284fc2f..72f2dd526867 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4665,6 +4665,31 @@ final: prev: meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; + mason-lspconfig-nvim = buildVimPluginFrom2Nix { + pname = "mason-lspconfig.nvim"; + version = "2022-07-25"; + src = fetchFromGitHub { + owner = "williamboman"; + repo = "mason-lspconfig.nvim"; + rev = "ad3b109cff22af979ab3d15564cd63dc3ae2f0f0"; + sha256 = "0jvnc9zlr5cazdrhjm1v0bjkrz5lb2z8dzlkq59b433f52qv9zrf"; + }; + meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; + }; + + mason-tool-installer-nvim = buildVimPluginFrom2Nix { + pname = "mason-tool-installer.nvim"; + version = "2022-07-26"; + src = fetchFromGitHub { + owner = "WhoIsSethDaniel"; + repo = "mason-tool-installer.nvim"; + rev = "6d9276655c09ef2358ddb105cac4a34cfa8853c0"; + sha256 = "0j5k9fhjffkx3b5asnwxzj22fvncs69vs0rkx13ii3gdvwczbc5w"; + }; + meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; + }; + + mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; version = "2022-07-27"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a9ddfea76515..4cfe4228ea9f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -391,6 +391,8 @@ https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, https://github.com/iamcco/markdown-preview.nvim/,, https://github.com/chentoast/marks.nvim/,, +https://github.com/williamboman/mason-lspconfig.nvim/,HEAD, +https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD, https://github.com/williamboman/mason.nvim/,HEAD, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, From bc7d5cea0aa5e24c097d301630a105b8938ee9ed Mon Sep 17 00:00:00 2001 From: The Hedgehog Date: Wed, 27 Jul 2022 11:58:39 -0400 Subject: [PATCH 3/3] add overrides for vimPlugins.mason-tool-install-nvim and vimPlugins.mason-lspconfig-nvim --- pkgs/applications/editors/vim/plugins/overrides.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e94ac82659d7..8d5f6bcd27d3 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -598,6 +598,14 @@ self: super: { ''; }); + mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs (old: { + dependencies = with self; [ mason-nvim nvim-lspconfig ]; + }); + + mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs (old: { + dependencies = with self; [ mason-nvim ]; + }); + meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim";