File tree Expand file tree Collapse file tree 3 files changed +28
-32
lines changed
Expand file tree Collapse file tree 3 files changed +28
-32
lines changed Original file line number Diff line number Diff line change 9090 inherit neovim ;
9191 pluginName = "mason" ;
9292 loadLazyPluginName = "mason.nvim" ;
93- ignoreLines = [
94- # FIXME: Add pip back to mason.nvim extraPackages
95- "WARNING pip: not available"
96- ]
97- ++ ( lib . lists . optional (
93+ ignoreLines = lib . lists . optional (
9894 ! lib . meta . availableOn stdenv . hostPlatform julia
99- ) "WARNING julia: not available" ) ;
95+ ) "WARNING julia: not available" ;
10096 } ;
10197
10298 checkhealth-noice = neovim-checkhealth . override {
Original file line number Diff line number Diff line change @@ -12,11 +12,7 @@ callPackage ./neovim-checkhealth.nix {
1212 } ;
1313 pluginName = "mason" ;
1414 loadLazyPluginName = "mason.nvim" ;
15- ignoreLines = [
16- # FIXME: Add pip back to mason.nvim extraPackages
17- "WARNING pip: not available"
18- ]
19- ++ ( lib . lists . optional (
15+ ignoreLines = lib . lists . optional (
2016 ! lib . meta . availableOn stdenv . hostPlatform julia
21- ) "WARNING julia: not available" ) ;
17+ ) "WARNING julia: not available" ;
2218}
Original file line number Diff line number Diff line change 2626 nodejs_24 ,
2727 php83 ,
2828 php83Packages ,
29- python312 ,
29+ python312Packages ,
3030 ripgrep ,
3131 ruby ,
3232 sqlite ,
@@ -239,25 +239,29 @@ let
239239 registries = [ "file:${ masonRegistry } " ] ;
240240 } ;
241241 } ;
242- extraPackages = [
243- # keep-sorted start
244- cargo
245- curl
246- gnutar
247- go
248- gzip
249- jdk
250- nodePackages . nodejs
251- php83
252- php83Packages . composer
253- python312
254- ruby
255- unzip
256- wget
257- yq-go
258- # keep-sorted end
259- ]
260- ++ ( lib . lists . optional ( lib . meta . availableOn stdenv . hostPlatform julia ) julia ) ;
242+ extraPackages =
243+ let
244+ python312WithPip = python312Packages . python . withPackages ( ps : with ps ; [ pip ] ) ;
245+ in
246+ [
247+ # keep-sorted start
248+ cargo
249+ curl
250+ gnutar
251+ go
252+ gzip
253+ jdk
254+ nodePackages . nodejs
255+ php83
256+ php83Packages . composer
257+ python312WithPip
258+ ruby
259+ unzip
260+ wget
261+ yq-go
262+ # keep-sorted end
263+ ]
264+ ++ ( lib . lists . optional ( lib . meta . availableOn stdenv . hostPlatform julia ) julia ) ;
261265 } ;
262266
263267 "nvim-treesitter" = plugins . "nvim-treesitter" // {
You can’t perform that action at this time.
0 commit comments