diff --git a/pkgs/LazyVim.nix b/pkgs/LazyVim.nix index 63bd0608..ac20deed 100644 --- a/pkgs/LazyVim.nix +++ b/pkgs/LazyVim.nix @@ -1,8 +1,6 @@ { lib, - stdenv, callPackage, - julia, lazy-nvim-nix, lazygit, lazy-nvim ? lazy-nvim-nix.lazy-nvim, @@ -90,9 +88,11 @@ in inherit neovim; pluginName = "mason"; loadLazyPluginName = "mason.nvim"; - ignoreLines = lib.lists.optional ( - !lib.meta.availableOn stdenv.hostPlatform julia - ) "WARNING julia: not available"; + ignoreLines = [ + "WARNING java: not available" + "WARNING javac: not available" + "WARNING julia: not available" + ]; }; checkhealth-noice = neovim-checkhealth.override { diff --git a/pkgs/tests/mason-nvim-checkhealth.nix b/pkgs/tests/mason-nvim-checkhealth.nix index 56d24884..59194e89 100644 --- a/pkgs/tests/mason-nvim-checkhealth.nix +++ b/pkgs/tests/mason-nvim-checkhealth.nix @@ -1,9 +1,6 @@ { - lib, callPackage, - stdenv, lazy-nvim-nix, - julia, }: callPackage ./neovim-checkhealth.nix { neovim = lazy-nvim-nix.lazy-nvim.override { @@ -12,7 +9,9 @@ callPackage ./neovim-checkhealth.nix { }; pluginName = "mason"; loadLazyPluginName = "mason.nvim"; - ignoreLines = lib.lists.optional ( - !lib.meta.availableOn stdenv.hostPlatform julia - ) "WARNING julia: not available"; + ignoreLines = [ + "WARNING java: not available" + "WARNING javac: not available" + "WARNING julia: not available" + ]; } diff --git a/plugins.nix b/plugins.nix index 3b3f8734..8693f86b 100644 --- a/plugins.nix +++ b/plugins.nix @@ -19,8 +19,6 @@ go, gzip, imagemagick, - jdk, - julia, lazygit, mermaid-cli, nodePackages, @@ -247,7 +245,6 @@ let gnutar go gzip - jdk nodePackages.nodejs php83 php83Packages.composer @@ -256,8 +253,7 @@ let unzip wget yq-go - ] - ++ (lib.lists.optional (lib.meta.availableOn stdenv.hostPlatform julia) julia); + ]; }; "nvim-treesitter" = plugins."nvim-treesitter" // {