Try to disable plugins properly

Author: berberman

configuration-ghc-901.nix

@@ -10,6 +10,7 @@ let
       "hls-fourmolu-plugin"
       "hls-splice-plugin"
       "hls-ormolu-plugin"
+      "hls-eval-plugin"
     ];
   hpkgsOverride = hself: hsuper:
     with pkgs.haskell.lib;
@@ -84,17 +85,17 @@ let
 
       ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_0_0_4;
 
-      # Disable plugins
+      # Re-generate HLS drv excluding some plugins
       haskell-language-server =
-        appendConfigureFlags hsuper.haskell-language-server [
-          "-brittany"
-          "-eval"
-          "-fourmolu"
-          "-ormolu"
-          "-splice"
-          "-stylishhaskell"
-          "-tactic"
-          "-refineImports"
-        ];
+        hself.callCabal2nixWithOptions "haskell-language-server" ./.
+        (pkgs.lib.concatStringsSep " " [
+          "-f-brittany"
+          "-f-eval"
+          "-f-fourmolu"
+          "-f-ormolu"
+          "-f-splice"
+          "-f-stylishhaskell"
+          "-f-tactic"
+        ]) { };
     };
-in { tweakHpkgs = hpkgs: (removePluginPackages hpkgs).extend hpkgsOverride; }
+in { tweakHpkgs = hpkgs: removePluginPackages (hpkgs.extend hpkgsOverride); }

flake.nix

@@ -179,7 +179,7 @@
               # we can remove sources attrs from hpkgs to exclude HLS plugins,
               # so hpkgs may not be the superset of hlsSources
               pipe (attrNames hlsSources) [
-                (xs: map (name: p.${name} or null) xs)
+                (xs: map (name: if hpkgs ? name then p.${name} else null) xs)
                 (xs: remove null xs)
               ];
             buildInputs = [ gmp zlib ncurses capstone tracy (gen-hls-changelogs hpkgs) ]