Skip to content

Commit 819caee

Browse files
authored
Merge pull request #1429 from josh/push-wwooswlrvmyr
Disable pip to workaround python bug
2 parents dcf222f + 11b2945 commit 819caee

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

pkgs/LazyVim.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,13 @@ in
9090
inherit neovim;
9191
pluginName = "mason";
9292
loadLazyPluginName = "mason.nvim";
93-
ignoreLines = lib.lists.optional (
93+
ignoreLines = [
94+
# FIXME: Add pip back to mason.nvim extraPackages
95+
"WARNING pip: not available"
96+
]
97+
++ (lib.lists.optional (
9498
!lib.meta.availableOn stdenv.hostPlatform julia
95-
) "WARNING julia: not available";
99+
) "WARNING julia: not available");
96100
};
97101

98102
checkhealth-noice = neovim-checkhealth.override {

pkgs/tests/mason-nvim-checkhealth.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ callPackage ./neovim-checkhealth.nix {
1212
};
1313
pluginName = "mason";
1414
loadLazyPluginName = "mason.nvim";
15-
ignoreLines = lib.lists.optional (
15+
ignoreLines = [
16+
# FIXME: Add pip back to mason.nvim extraPackages
17+
"WARNING pip: not available"
18+
]
19+
++ (lib.lists.optional (
1620
!lib.meta.availableOn stdenv.hostPlatform julia
17-
) "WARNING julia: not available";
21+
) "WARNING julia: not available");
1822
}

plugins.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
nodejs_24,
2727
php83,
2828
php83Packages,
29-
python312Packages,
29+
python312,
3030
ripgrep,
3131
ruby,
3232
sqlite,
@@ -240,6 +240,7 @@ let
240240
};
241241
};
242242
extraPackages = [
243+
# keep-sorted start
243244
cargo
244245
curl
245246
gnutar
@@ -249,11 +250,12 @@ let
249250
nodePackages.nodejs
250251
php83
251252
php83Packages.composer
252-
(python312Packages.python.withPackages (ps: with ps; [ pip ]))
253+
python312
253254
ruby
254255
unzip
255256
wget
256257
yq-go
258+
# keep-sorted end
257259
]
258260
++ (lib.lists.optional (lib.meta.availableOn stdenv.hostPlatform julia) julia);
259261
};

0 commit comments

Comments
 (0)