diff --git a/devenv-module.nix b/devenv-module.nix index 1205c97dd..4c62683b5 100644 --- a/devenv-module.nix +++ b/devenv-module.nix @@ -90,6 +90,7 @@ that is defined in flake-module.nix hspec ihp-hsx ihp-postgresql-simple-extra + haskell-language-server ]); scripts.tests.exec = '' @@ -111,7 +112,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 index e11b36e9d..cf767675e 100644 --- a/flake-module.nix +++ b/flake-module.nix @@ -52,6 +52,29 @@ 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 `./.`.