Revert "adding appName to flake options and trying to work around hls…

… issue." Undoing push to master. This reverts commit 4593fc5.
Montmorency · Jul 26, 2024 · 040962d · 040962d
1 parent 4593fc5
commit 040962d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 25 deletions.
diff --git a/devenv-module.nix b/devenv-module.nix
@@ -90,7 +90,6 @@ that is defined in flake-module.nix
                         hspec
                         ihp-hsx
                         ihp-postgresql-simple-extra
-                        haskell-language-server
                     ]);
 
             scripts.tests.exec = ''
@@ -112,7 +111,7 @@ that is defined in flake-module.nix
             '';
 
             languages.haskell.stack = null; # Stack is not used in IHP
-            #languages.haskell.languageServer = ghcCompiler.haskell-language-server;
+            languages.haskell.languageServer = ghcCompiler.haskell-language-server;
         };
 
         packages = {

diff --git a/flake-module.nix b/flake-module.nix
@@ -52,29 +52,6 @@ ihpFlake:
                     ];
                 };
 
-                appName = lib.mkOption {
-                  description ='' 
-                  The derivation name.
-                  Can be omitted if pname and version are set, in which case it is automatically set to ''${pname}-''${version}.
-                '';
-                 type= lib.types.str;
-                 default="app";
-                };
-
-                pName = lib.mkOption {
-                  description = ''
-                      The package name.
-                  '';
-                 type= lib.types.str;
-                };
-
-                version = lib.mkOption {
-                  description = ''
-                      The package version.
-                  '';
-                 type= lib.types.str;
-                };
-
                 projectPath = lib.mkOption {
                     description = ''
                         Path to the IHP project. You likely want to set this to `./.`.