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 2727 nodejs_24 ,
2828 php83 ,
2929 php83Packages ,
30- python312 ,
30+ python312Packages ,
3131 ripgrep ,
3232 ruby ,
3333 sqlite ,
@@ -241,25 +241,29 @@ let
241241 registries = [ "file:${ masonRegistry } " ] ;
242242 } ;
243243 } ;
244- extraPackages = [
245- # keep-sorted start
246- cargo
247- curl
248- gnutar
249- go
250- gzip
251- jdk
252- nodePackages . nodejs
253- php83
254- php83Packages . composer
255- python312
256- ruby
257- unzip
258- wget
259- yq-go
260- # keep-sorted end
261- ]
262- ++ ( lib . lists . optional ( lib . meta . availableOn stdenv . hostPlatform julia ) julia ) ;
244+ extraPackages =
245+ let
246+ python312WithPip = python312Packages . python . withPackages ( ps : with ps ; [ pip ] ) ;
247+ in
248+ [
249+ # keep-sorted start
250+ cargo
251+ curl
252+ gnutar
253+ go
254+ gzip
255+ jdk
256+ nodePackages . nodejs
257+ php83
258+ php83Packages . composer
259+ python312WithPip
260+ ruby
261+ unzip
262+ wget
263+ yq-go
264+ # keep-sorted end
265+ ]
266+ ++ ( lib . lists . optional ( lib . meta . availableOn stdenv . hostPlatform julia ) julia ) ;
263267 } ;
264268
265269 "nvim-treesitter" = plugins . "nvim-treesitter" // {
You can’t perform that action at this time.
0 commit comments