Merge pull request #1410 from josh/revert-1406-codex/disable-java-and-openjdk-dependencies

Restore Mason Java and Julia dependencies

Author: josh

pkgs/LazyVim.nix

@@ -1,6 +1,8 @@
 {
   lib,
+  stdenv,
   callPackage,
+  julia,
   lazy-nvim-nix,
   lazygit,
   lazy-nvim ? lazy-nvim-nix.lazy-nvim,
@@ -88,11 +90,9 @@ in
           inherit neovim;
           pluginName = "mason";
           loadLazyPluginName = "mason.nvim";
-          ignoreLines = [
-            "WARNING java: not available"
-            "WARNING javac: not available"
-            "WARNING julia: not available"
-          ];
+          ignoreLines = lib.lists.optional (
+            !lib.meta.availableOn stdenv.hostPlatform julia
+          ) "WARNING julia: not available";
         };
 
         checkhealth-noice = neovim-checkhealth.override {

pkgs/tests/mason-nvim-checkhealth.nix

@@ -1,6 +1,9 @@
 {
+  lib,
   callPackage,
+  stdenv,
   lazy-nvim-nix,
+  julia,
 }:
 callPackage ./neovim-checkhealth.nix {
   neovim = lazy-nvim-nix.lazy-nvim.override {
@@ -9,9 +12,7 @@ callPackage ./neovim-checkhealth.nix {
   };
   pluginName = "mason";
   loadLazyPluginName = "mason.nvim";
-  ignoreLines = [
-    "WARNING java: not available"
-    "WARNING javac: not available"
-    "WARNING julia: not available"
-  ];
+  ignoreLines = lib.lists.optional (
+    !lib.meta.availableOn stdenv.hostPlatform julia
+  ) "WARNING julia: not available";
 }

plugins.nix

@@ -19,6 +19,8 @@
   go,
   gzip,
   imagemagick,
+  jdk,
+  julia,
   lazygit,
   nodePackages,
   nodejs_24,
@@ -243,6 +245,7 @@ let
         gnutar
         go
         gzip
+        jdk
         nodePackages.nodejs
         php83
         php83Packages.composer
@@ -251,7 +254,8 @@ let
         unzip
         wget
         yq-go
-      ];
+      ]
+      ++ (lib.lists.optional (lib.meta.availableOn stdenv.hostPlatform julia) julia);
     };
 
     "nvim-treesitter" = plugins."nvim-treesitter" // {