fix(mason): rename and pin to v1

This commit is contained in:
Folke Lemaitre 2025-05-12 10:39:04 +02:00
parent ec5981dfb1
commit c20c402295
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
24 changed files with 37 additions and 31 deletions

View file

@ -24,7 +24,7 @@ local supported = {
return { return {
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "biome" } }, opts = { ensure_installed = { "biome" } },
}, },

View file

@ -1,6 +1,6 @@
return { return {
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = function(_, opts) opts = function(_, opts)
table.insert(opts.ensure_installed, "black") table.insert(opts.ensure_installed, "black")
end, end,

View file

@ -58,7 +58,7 @@ M.has_parser = LazyVim.memoize(M.has_parser)
return { return {
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "prettier" } }, opts = { ensure_installed = { "prettier" } },
}, },

View file

@ -6,7 +6,7 @@ return {
}) })
end, end,
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "ansible-lint" } }, opts = { ensure_installed = { "ansible-lint" } },
}, },
{ {

View file

@ -117,7 +117,7 @@ return {
optional = true, optional = true,
dependencies = { dependencies = {
-- Ensure C/C++ debugger is installed -- Ensure C/C++ debugger is installed
"williamboman/mason.nvim", "mason-org/mason.nvim",
optional = true, optional = true,
opts = { ensure_installed = { "codelldb" } }, opts = { ensure_installed = { "codelldb" } },
}, },

View file

@ -10,7 +10,7 @@ return {
}, },
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "elm-format" } }, opts = { ensure_installed = { "elm-format" } },
}, },

View file

@ -75,7 +75,7 @@ return {
}, },
-- Ensure Go tools are installed -- Ensure Go tools are installed
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "goimports", "gofumpt" } }, opts = { ensure_installed = { "goimports", "gofumpt" } },
}, },
{ {
@ -83,7 +83,7 @@ return {
optional = true, optional = true,
dependencies = { dependencies = {
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "gomodifytags", "impl" } }, opts = { ensure_installed = { "gomodifytags", "impl" } },
}, },
}, },
@ -111,7 +111,7 @@ return {
optional = true, optional = true,
dependencies = { dependencies = {
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "delve" } }, opts = { ensure_installed = { "delve" } },
}, },
{ {

View file

@ -28,7 +28,7 @@ return {
}, },
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "haskell-language-server" } }, opts = { ensure_installed = { "haskell-language-server" } },
}, },
@ -37,7 +37,7 @@ return {
optional = true, optional = true,
dependencies = { dependencies = {
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "haskell-debug-adapter" } }, opts = { ensure_installed = { "haskell-debug-adapter" } },
}, },
}, },

View file

@ -56,7 +56,7 @@ return {
end, end,
dependencies = { dependencies = {
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "java-debug-adapter", "java-test" } }, opts = { ensure_installed = { "java-debug-adapter", "java-test" } },
}, },
}, },

View file

@ -14,7 +14,7 @@ return {
end, end,
-- Add packages(linting, debug adapter) -- Add packages(linting, debug adapter)
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "ktlint" } }, opts = { ensure_installed = { "ktlint" } },
}, },
-- Add syntax highlighting -- Add syntax highlighting
@ -35,7 +35,7 @@ return {
{ {
"mfussenegger/nvim-lint", "mfussenegger/nvim-lint",
optional = true, optional = true,
dependencies = "williamboman/mason.nvim", dependencies = "mason-org/mason.nvim",
opts = { opts = {
linters_by_ft = { kotlin = { "ktlint" } }, linters_by_ft = { kotlin = { "ktlint" } },
}, },
@ -64,7 +64,7 @@ return {
{ {
"mfussenegger/nvim-dap", "mfussenegger/nvim-dap",
optional = true, optional = true,
dependencies = "williamboman/mason.nvim", dependencies = "mason-org/mason.nvim",
opts = function() opts = function()
local dap = require("dap") local dap = require("dap")
if not dap.adapters.kotlin then if not dap.adapters.kotlin then

View file

@ -40,7 +40,7 @@ return {
}, },
}, },
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "markdownlint-cli2", "markdown-toc" } }, opts = { ensure_installed = { "markdownlint-cli2", "markdown-toc" } },
}, },
{ {

View file

@ -36,7 +36,7 @@ return {
}, },
}, },
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "csharpier", "netcoredbg" } }, opts = { ensure_installed = { "csharpier", "netcoredbg" } },
}, },
{ {

View file

@ -35,7 +35,7 @@ return {
}, },
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { opts = {
ensure_installed = { ensure_installed = {
"phpcs", "phpcs",

View file

@ -48,7 +48,7 @@ return {
}, },
}, },
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "erb-formatter", "erb-lint" } }, opts = { ensure_installed = { "erb-formatter", "erb-lint" } },
}, },
{ {

View file

@ -43,7 +43,7 @@ return {
-- Ensure Rust debugger is installed -- Ensure Rust debugger is installed
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
optional = true, optional = true,
opts = function(_, opts) opts = function(_, opts)
opts.ensure_installed = opts.ensure_installed or {} opts.ensure_installed = opts.ensure_installed or {}

View file

@ -143,7 +143,7 @@ return {
-- Linters & formatters -- Linters & formatters
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "sqlfluff" } }, opts = { ensure_installed = { "sqlfluff" } },
}, },
{ {

View file

@ -20,7 +20,7 @@ return {
}, },
-- ensure terraform tools are installed -- ensure terraform tools are installed
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "tflint" } }, opts = { ensure_installed = { "tflint" } },
}, },
{ {

View file

@ -194,7 +194,7 @@ return {
optional = true, optional = true,
dependencies = { dependencies = {
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = function(_, opts) opts = function(_, opts)
opts.ensure_installed = opts.ensure_installed or {} opts.ensure_installed = opts.ensure_installed or {}
table.insert(opts.ensure_installed, "js-debug-adapter") table.insert(opts.ensure_installed, "js-debug-adapter")

View file

@ -18,7 +18,7 @@ return {
}, },
}, },
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "shellcheck" } }, opts = { ensure_installed = { "shellcheck" } },
}, },
-- add some stuff to treesitter -- add some stuff to treesitter

View file

@ -2,7 +2,7 @@ return {
-- Ensure GitUI tool is installed -- Ensure GitUI tool is installed
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "gitui" } }, opts = { ensure_installed = { "gitui" } },
keys = { keys = {
{ {

View file

@ -5,7 +5,7 @@ return {
event = "LazyFile", event = "LazyFile",
dependencies = { dependencies = {
"mason.nvim", "mason.nvim",
{ "williamboman/mason-lspconfig.nvim", config = function() end }, { "mason-org/mason-lspconfig.nvim", config = function() end },
}, },
opts = function() opts = function()
---@class PluginLspOpts ---@class PluginLspOpts
@ -257,7 +257,7 @@ return {
-- cmdline tools and lsp servers -- cmdline tools and lsp servers
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
cmd = "Mason", cmd = "Mason",
keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } }, keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
build = ":MasonUpdate", build = ":MasonUpdate",
@ -292,4 +292,8 @@ return {
end) end)
end, end,
}, },
-- pin to v1 for now
{ "mason-org/mason.nvim", version = "^1.0.0" },
{ "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
} }

View file

@ -35,6 +35,8 @@ M.renames = {
["romgrk/nvim-treesitter-context"] = "nvim-treesitter/nvim-treesitter-context", ["romgrk/nvim-treesitter-context"] = "nvim-treesitter/nvim-treesitter-context",
["glepnir/dashboard-nvim"] = "nvimdev/dashboard-nvim", ["glepnir/dashboard-nvim"] = "nvimdev/dashboard-nvim",
["markdown.nvim"] = "render-markdown.nvim", ["markdown.nvim"] = "render-markdown.nvim",
["williamboman/mason.nvim"] = "mason-org/mason.nvim",
["williamboman/mason-lspconfig.nvim"] = "mason-org/mason-lspconfig.nvim",
} }
function M.save_core() function M.save_core()

View file

@ -44,7 +44,7 @@ describe("Extra", function()
local mod = require(extra.modname) local mod = require(extra.modname)
assert.is_not_nil(mod) assert.is_not_nil(mod)
local spec = Plugin.Spec.new({ local spec = Plugin.Spec.new({
{ "williamboman/mason.nvim", opts = { ensure_installed = {} } }, { "mason-org/mason.nvim", opts = { ensure_installed = {} } },
{ "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } }, { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
mod, mod,
}, { optional = true }) }, { optional = true })
@ -60,7 +60,7 @@ describe("Extra", function()
local mod = require(extra.modname) local mod = require(extra.modname)
local spec = Plugin.Spec.new({ local spec = Plugin.Spec.new({
{ "williamboman/mason.nvim", opts = { ensure_installed = {} } }, { "mason-org/mason.nvim", opts = { ensure_installed = {} } },
{ "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } }, { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
mod, mod,
}, { optional = true }) }, { optional = true })

View file

@ -8,8 +8,8 @@ require("lazy.minit").setup({
spec = { spec = {
{ dir = vim.uv.cwd() }, { dir = vim.uv.cwd() },
"LazyVim/starter", "LazyVim/starter",
"williamboman/mason-lspconfig.nvim", "mason-org/mason-lspconfig.nvim",
"williamboman/mason.nvim", "mason-org/mason.nvim",
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
{ "echasnovski/mini.icons", opts = {} }, { "echasnovski/mini.icons", opts = {} },
}, },