From 4593fc5ed14f4cb1dc54f13aee3e595b11f310df Mon Sep 17 00:00:00 2001
From: Montmorency <lamberh@tcd.ie>
Date: Fri, 26 Jul 2024 10:55:54 +0100
Subject: [PATCH 1/3] adding appName to flake options and trying to work around
 hls issue.

---
 devenv-module.nix |  3 ++-
 flake-module.nix  | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

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 `./.`.

From 040962d2c6fc7ab6004c66afa2e9353418e41a8d Mon Sep 17 00:00:00 2001
From: Montmorency <lamberh@tcd.ie>
Date: Fri, 26 Jul 2024 10:57:36 +0100
Subject: [PATCH 2/3] Revert "adding appName to flake options and trying to
 work around hls issue." Undoing push to master.

This reverts commit 4593fc5ed14f4cb1dc54f13aee3e595b11f310df.
---
 devenv-module.nix |  3 +--
 flake-module.nix  | 23 -----------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/devenv-module.nix b/devenv-module.nix
index 4c62683b5..1205c97dd 100644
--- 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
index cf767675e..e11b36e9d 100644
--- 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 `./.`.

From 762814a0052661b3c02f433ddb2f60b650f2b8d0 Mon Sep 17 00:00:00 2001
From: Montmorency <lamberh@tcd.ie>
Date: Wed, 18 Dec 2024 16:16:02 +0000
Subject: [PATCH 3/3] restoring enable-executable-dynamic to help with
 VisualStudio loading of hls.

---
 NixSupport/mkGhcCompiler.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NixSupport/mkGhcCompiler.nix b/NixSupport/mkGhcCompiler.nix
index a6f576a17..474cdda80 100644
--- a/NixSupport/mkGhcCompiler.nix
+++ b/NixSupport/mkGhcCompiler.nix
@@ -57,5 +57,7 @@ in ghcCompiler.override {
     manualOverrides
 
     (self: super: { websockets = super.websockets_0_13_0_0; })
+    (self: super: { haskell-language-server = pkgs.haskell.lib.appendConfigureFlag super.haskell-language-server "--enable-executable-dynamic"; })
+
   ];
 }