Skip to content

En-enable pip for mason #1430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
josh wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

En-enable pip for mason #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions pkgs/LazyVim.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,9 @@ in
inherit neovim;
pluginName = "mason";
loadLazyPluginName = "mason.nvim";
ignoreLines = [
# FIXME: Add pip back to mason.nvim extraPackages
"WARNING pip: not available"
]
++ (lib.lists.optional (
ignoreLines = lib.lists.optional (
!lib.meta.availableOn stdenv.hostPlatform julia
) "WARNING julia: not available");
) "WARNING julia: not available";
};

checkhealth-noice = neovim-checkhealth.override {
Expand Down
8 changes: 2 additions & 6 deletions pkgs/tests/mason-nvim-checkhealth.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@ callPackage ./neovim-checkhealth.nix {
};
pluginName = "mason";
loadLazyPluginName = "mason.nvim";
ignoreLines = [
# FIXME: Add pip back to mason.nvim extraPackages
"WARNING pip: not available"
]
++ (lib.lists.optional (
ignoreLines = lib.lists.optional (
!lib.meta.availableOn stdenv.hostPlatform julia
) "WARNING julia: not available");
) "WARNING julia: not available";
}
44 changes: 24 additions & 20 deletions plugins.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
nodejs_24,
php83,
php83Packages,
python312,
python312Packages,
ripgrep,
ruby,
sqlite,
Expand Down Expand Up @@ -241,25 +241,29 @@ let
registries = [ "file:${masonRegistry}" ];
};
};
extraPackages = [
# keep-sorted start
cargo
curl
gnutar
go
gzip
jdk
nodePackages.nodejs
php83
php83Packages.composer
python312
ruby
unzip
wget
yq-go
# keep-sorted end
]
++ (lib.lists.optional (lib.meta.availableOn stdenv.hostPlatform julia) julia);
extraPackages =
let
python312WithPip = python312Packages.python.withPackages (ps: with ps; [ pip ]);
in
[
# keep-sorted start
cargo
curl
gnutar
go
gzip
jdk
nodePackages.nodejs
php83
php83Packages.composer
python312WithPip
ruby
unzip
wget
yq-go
# keep-sorted end
]
++ (lib.lists.optional (lib.meta.availableOn stdenv.hostPlatform julia) julia);
};

"nvim-treesitter" = plugins."nvim-treesitter" // {
Expand Down
Loading