Merge pull request #244 from digitallyinduced/ghcide

Added integration for ghcide
digitallyinduced · Oct 16, 2020 · b1e786e · b1e786e
2 parents 0cf3c37 + ba5be74
commit b1e786e
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 6 deletions.
diff --git a/NixSupport/default.nix b/NixSupport/default.nix
@@ -11,7 +11,7 @@ let
     }) {};
 
     ghc = pkgs.haskell.packages.${compiler};
-    allHaskellPackages = ghc.ghcWithPackages (p: haskellDeps p);
+    allHaskellPackages = ghc.ghcWithPackages (p: builtins.concatLists [ (haskellDeps p) [p.haskell-language-server] ] );
     allNativePackages = builtins.concatLists [ (otherDeps pkgs) [pkgs.postgresql] (if pkgs.stdenv.isDarwin then [pkgs.darwin.apple_sdk.frameworks.Cocoa] else []) ];
 in
     pkgs.stdenv.mkDerivation {

diff --git a/NixSupport/haskell-packages/hslogger.nix b/NixSupport/haskell-packages/hslogger.nix
@@ -0,0 +1,16 @@
+{ mkDerivation, base, bytestring, containers, deepseq, HUnit
+, network, network-bsd, old-locale, stdenv, time, unix
+}:
+mkDerivation {
+  pname = "hslogger";
+  version = "1.3.1.0";
+  sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz";
+  libraryHaskellDepends = [
+    base bytestring containers deepseq network network-bsd old-locale
+    time unix
+  ];
+  testHaskellDepends = [ base HUnit ];
+  homepage = "https://github.com/hvr/hslogger/wiki";
+  description = "Versatile logging framework";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/NixSupport/haskell-packages/network-bsd.nix b/NixSupport/haskell-packages/network-bsd.nix
@@ -0,0 +1,10 @@
+{ mkDerivation, base, deepseq, network, stdenv }:
+mkDerivation {
+  pname = "network-bsd";
+  version = "2.8.1.0";
+  sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr";
+  libraryHaskellDepends = [ base deepseq network ];
+  homepage = "https://github.com/haskell/network-bsd";
+  description = "POSIX network database (<netdb.h>) API";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/NixSupport/haskell-packages/network.nix b/NixSupport/haskell-packages/network.nix
@@ -0,0 +1,14 @@
+{ mkDerivation, base, bytestring, deepseq, directory, hspec
+, hspec-discover, HUnit, stdenv, unix
+}:
+mkDerivation {
+  pname = "network";
+  version = "3.0.0.1";
+  sha256 = "03f7gi3skz2ivack73wgn0zsppxwscl6j6xvwjal6i7y3rzajiam";
+  libraryHaskellDepends = [ base bytestring deepseq unix ];
+  testHaskellDepends = [ base bytestring directory hspec HUnit ];
+  testToolDepends = [ hspec-discover ];
+  homepage = "https://github.com/haskell/network";
+  description = "Low-level networking interface";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/NixSupport/pkgs.nix b/NixSupport/pkgs.nix
@@ -6,6 +6,7 @@ let
         "tz"
         "http2-client"
         "typerep-map"
+        "hslogger"
     ];
 
     doJailbreakPackages = [
@@ -14,13 +15,15 @@ let
         "ihp"
         "http-media"
         "countable-inflections"
+        "haskell-language-server"
+        "hslogger"
     ];
 
     dontHaddockPackages = [
     ];
 
-    nixPkgsRev = "da7ddd822e32aeebea00e97ab5aeca9758250a40";
-    nixPkgsSha256 = "0zbxbk4m72psbvd5p4qprcpiadndq1j2v517synijwp2vxc7cnv6";
+    nixPkgsRev = "07e5844fdf6fe99f41229d7392ce81cfe191bcfc";
+    nixPkgsSha256 = "0p2z6jidm4rlp2yjfl553q234swj1vxl8z0z8ra1hm61lfrlcmb9";
 
     compiler = "ghc883";
 

diff --git a/ihp.nix b/ihp.nix
@@ -105,6 +105,6 @@ mkDerivation {
     cp exe/IHP/CLI/run-script $out/bin/run-script
 
     mkdir -p $out/lib/IHP
-    cp -r lib/IHP/* $out/lib/IHP
+    cp -r lib/IHP/* lib/IHP/.hie-bios $out/lib/IHP
   '';
 }
diff --git a/lib/IHP/.hie-bios b/lib/IHP/.hie-bios
@@ -0,0 +1 @@
+make print-ghc-options GHC_RTS_FLAGS='' | tr ' ' '\n' > "$HIE_BIOS_OUTPUT"
diff --git a/lib/IHP/Makefile.dist b/lib/IHP/Makefile.dist
@@ -57,10 +57,16 @@ GHC_EXTENSIONS+= -XDerivingVia
 GHC_EXTENSIONS+= -Werror=missing-fields
 GHC_EXTENSIONS+= -fwarn-incomplete-patterns
 
-GHC_OPTIONS=-threaded -i. -ibuild -iConfig
+GHC_RTS_FLAGS := -A256m -n2m
+
+GHC_OPTIONS=-threaded -i. -ibuild -iConfig -iIHP
 GHC_OPTIONS+= ${GHC_EXTENSIONS}
 GHC_OPTIONS+= -j2
-GHC_OPTIONS+= +RTS -A256m -n2m --RTS
+
+ifneq ($(GHC_RTS_FLAGS),)
+GHC_OPTIONS+= +RTS ${GHC_RTS_FLAGS} --RTS
+endif
+
 GHC_OPTIONS+= -package ihp
 GHC_OPTIONS+= -rtsopts=all
 
@@ -171,3 +177,8 @@ build/Script/Main/%.hs: Application/Script/%.hs
 	echo "import qualified Config" >> $@
 	echo "import Application.Script.$* (run)" >> $@
 	echo "main = runScript run" >> $@
+
+hie.yaml: # Configuration for haskell-language-server
+	echo "cradle:" > hie.yaml
+	echo "  bios:" >> hie.yaml
+	echo "    program: build/ihp-lib/.hie-bios" >> hie.yaml