From 80d0754238e9a90ad7e56023a79fe099767b8545 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@users.noreply.github.com>
Date: Mon, 1 Dec 2025 11:38:57 -0800
Subject: [PATCH] En-enable pip for mason

---
 pkgs/LazyVim.nix                      |  8 ++---
 pkgs/tests/mason-nvim-checkhealth.nix |  8 ++---
 plugins.nix                           | 44 +++++++++++++++------------
 3 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/pkgs/LazyVim.nix b/pkgs/LazyVim.nix
index a8c56400..63bd0608 100644
--- a/pkgs/LazyVim.nix
+++ b/pkgs/LazyVim.nix
@@ -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 {
diff --git a/pkgs/tests/mason-nvim-checkhealth.nix b/pkgs/tests/mason-nvim-checkhealth.nix
index a19e8e08..56d24884 100644
--- a/pkgs/tests/mason-nvim-checkhealth.nix
+++ b/pkgs/tests/mason-nvim-checkhealth.nix
@@ -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";
 }
diff --git a/plugins.nix b/plugins.nix
index aa457583..79b2a056 100644
--- a/plugins.nix
+++ b/plugins.nix
@@ -27,7 +27,7 @@
   nodejs_24,
   php83,
   php83Packages,
-  python312,
+  python312Packages,
   ripgrep,
   ruby,
   sqlite,
@@ -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" // {