tests/lsp-servers: de-couple from grouped tests

Follow up to cab6b0c9fe

flake-modules/tests.nix

@@ -50,6 +50,8 @@
         generated = pkgs.callPackage ../tests/generated.nix { };
 
         package-options = pkgs.callPackage ../tests/package-options.nix { inherit nixvimConfiguration; };
+
+        lsp-all-servers = pkgs.callPackage ../tests/lsp-servers.nix { inherit nixvimConfiguration; };
       } // import ../tests { inherit pkgs pkgsUnfree helpers; };
     };
 }

tests/default.nix

@@ -42,14 +42,7 @@ let
   };
 in
 # We attempt to build & execute all configurations
-(lib.pipe
-  (
-    testFiles
-    ++ [
-      exampleFiles
-    ]
-  )
-  [
+lib.pipe (testFiles ++ [ exampleFiles ]) [
   (builtins.map (
     {
       name,
@@ -70,9 +63,3 @@ in
   ))
   builtins.listToAttrs
 ]
-)
-// {
-  all-lsp-servers = moduleToTest ./lsp-servers.nix "all-lsp-servers" (
-    import ./lsp-servers.nix { inherit pkgs; }
-  );
-}

tests/lsp-servers.nix

@@ -1,38 +1,59 @@
-{ pkgs, ... }:
-{ lib, options, ... }:
-pkgs.lib.optionalAttrs
-  # This fails on darwin
-  # See https://github.com/NixOS/nix/issues/4119
-  (!pkgs.stdenv.isDarwin)
 {
+  lib,
+  nixvimConfiguration,
+  stdenv,
+  runCommandNoCCLocal,
+  name ? "lsp-all-servers",
+}:
+let
+  _file = ./lsp-servers.nix;
+
+  renamed = builtins.attrNames (import ../plugins/lsp/language-servers/_renamed.nix);
+
+  enable-lsp-module = {
+    inherit _file;
+
     plugins.lsp = {
       enable = true;
 
-      servers =
+      servers.rust_analyzer = {
+        installCargo = true;
+        installRustc = true;
+      };
+    };
+  };
+
+  enable-servers-module =
+    {
+      lib,
+      options,
+      pkgs,
+      ...
+    }:
     let
       disabled =
-            (lib.optionals pkgs.stdenv.isDarwin [
+        lib.optionals pkgs.stdenv.isDarwin [
           "fsautocomplete"
-            ])
-            ++ (lib.optionals pkgs.stdenv.isAarch64 [
+        ]
+        ++ lib.optionals pkgs.stdenv.isAarch64 [
           # Broken
           "scheme_langserver"
-            ])
-            ++ (lib.optionals (pkgs.stdenv.hostPlatform.system == "aarch64-linux") [
+        ]
+        ++ lib.optionals (pkgs.stdenv.hostPlatform.system == "aarch64-linux") [
           # Binary package not available for this architecture
           "starpls"
           # TODO: 2024-10-05 build failure
           "fstar"
-            ])
-            ++ (lib.optionals (pkgs.stdenv.hostPlatform.system == "x86_64-darwin") [
+        ]
+        ++ lib.optionals (pkgs.stdenv.hostPlatform.system == "x86_64-darwin") [
           # Binary package not available for this architecture
           "starpls"
-            ]);
-
-          renamed = lib.attrNames (import ../plugins/lsp/language-servers/_renamed.nix);
+        ];
     in
-        lib.mkMerge [
-          (lib.pipe options.plugins.lsp.servers [
+    {
+      inherit _file;
+
+      plugins.lsp.servers = lib.pipe options.plugins.lsp.servers [
         (lib.mapAttrs (
           server: opts:
           {
@@ -41,13 +62,22 @@ pkgs.lib.optionalAttrs
           // lib.optionalAttrs (opts ? package && !(opts.package ? default)) { package = null; }
         ))
         (lib.filterAttrs (server: _: !(lib.elem server renamed)))
-          ])
-          {
-            rust_analyzer = {
-              installCargo = true;
-              installRustc = true;
-            };
-          }
       ];
     };
-  }
+
+  result = nixvimConfiguration.extendModules {
+    modules = [
+      enable-lsp-module
+      enable-servers-module
+      { test.name = name; }
+    ];
+  };
+in
+# This fails on darwin
+# See https://github.com/NixOS/nix/issues/4119
+if stdenv.isDarwin then
+  runCommandNoCCLocal name { } ''
+    touch $out
+  ''
+else
+  result.config.build.test