Skip to content

Commit 870e19f

Browse files
authored
Merge pull request #1406 from josh/codex/disable-java-and-openjdk-dependencies
Disable Mason Java and Julia dependencies
2 parents e2db6a6 + c825fd9 commit 870e19f

File tree

3 files changed

+11
-16
lines changed

3 files changed

+11
-16
lines changed

pkgs/LazyVim.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
lib,
3-
stdenv,
43
callPackage,
5-
julia,
64
lazy-nvim-nix,
75
lazygit,
86
lazy-nvim ? lazy-nvim-nix.lazy-nvim,
@@ -90,9 +88,11 @@ in
9088
inherit neovim;
9189
pluginName = "mason";
9290
loadLazyPluginName = "mason.nvim";
93-
ignoreLines = lib.lists.optional (
94-
!lib.meta.availableOn stdenv.hostPlatform julia
95-
) "WARNING julia: not available";
91+
ignoreLines = [
92+
"WARNING java: not available"
93+
"WARNING javac: not available"
94+
"WARNING julia: not available"
95+
];
9696
};
9797

9898
checkhealth-noice = neovim-checkhealth.override {
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{
2-
lib,
32
callPackage,
4-
stdenv,
53
lazy-nvim-nix,
6-
julia,
74
}:
85
callPackage ./neovim-checkhealth.nix {
96
neovim = lazy-nvim-nix.lazy-nvim.override {
@@ -12,7 +9,9 @@ callPackage ./neovim-checkhealth.nix {
129
};
1310
pluginName = "mason";
1411
loadLazyPluginName = "mason.nvim";
15-
ignoreLines = lib.lists.optional (
16-
!lib.meta.availableOn stdenv.hostPlatform julia
17-
) "WARNING julia: not available";
12+
ignoreLines = [
13+
"WARNING java: not available"
14+
"WARNING javac: not available"
15+
"WARNING julia: not available"
16+
];
1817
}

plugins.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
go,
2020
gzip,
2121
imagemagick,
22-
jdk,
23-
julia,
2422
lazygit,
2523
mermaid-cli,
2624
nodePackages,
@@ -247,7 +245,6 @@ let
247245
gnutar
248246
go
249247
gzip
250-
jdk
251248
nodePackages.nodejs
252249
php83
253250
php83Packages.composer
@@ -256,8 +253,7 @@ let
256253
unzip
257254
wget
258255
yq-go
259-
]
260-
++ (lib.lists.optional (lib.meta.availableOn stdenv.hostPlatform julia) julia);
256+
];
261257
};
262258

263259
"nvim-treesitter" = plugins."nvim-treesitter" // {

0 commit comments

Comments
 (0)