Tidy up and switch back to cabal helper implicit cradle

Author: lukel97

.github/workflows/build.yml

@@ -48,7 +48,6 @@ jobs:
       shell: bash
       run: |
         echo '::set-env name=EXE_EXT::.exe'
-        echo '::set-env name=WIN_CABAL_ARGS::-j1'
 
     - name: Set some linux specific things
       if: matrix.os == 'ubuntu-latest'
@@ -59,8 +58,8 @@ jobs:
       shell: bash
       # Try building it twice in case of flakey builds on Windows
       run: |
-        cabal build exe:hls -O2 --disable-documentation $WIN_CABAL_ARGS $LINUX_CABAL_ARGS || \
-        cabal build exe:hls -O2 --disable-documentation $WIN_CABAL_ARGS $LINUX_CABAL_ARGS
+        cabal build exe:hls -O2 --disable-documentation $LINUX_CABAL_ARGS || \
+        cabal build exe:hls -O2 --disable-documentation $LINUX_CABAL_ARGS
 
     - name: Find Server Binary
       id: find_server_binary

docs/releases.md

@@ -45,6 +45,22 @@ will most almost certainly not exist on the end user's machine.
 Therefore, hie-bios provides `getGhcRuntimeLibDir` to obtain this path on the fly
 by consulting the cradle.
 
+### Static binaries
+We use the word "distributable" here because technically only the Linux builds
+are static. They are built by passing `--enable-executable-static` to cabal.
+Static binaries don't really exist on macOS, and there are issues with
+proprietary code being linked in on Windows. However, the `.dylib`s linked on
+macOS are all already provided by the system:
+
+```
+$ objdump -macho --dylibs-used  haskell-language-server
+haskell-language-server:
+	/usr/lib/libncurses.5.4.dylib (compatibility version 5.4.0, current version 5.4.0)
+	/usr/lib/libiconv.2.dylib (compatibility version 7.0.0, current version 7.0.0)
+	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1281.100.1)
+	/usr/lib/libcharset.1.dylib (compatibility version 2.0.0, current version 2.0.0)
+```
+
 ## The GitHub Actions workflow
 It just kicks off a matrix of jobs varying across GHC versions and OSs, building
 the binaries with Cabal and extracting them from the dist-newstyle directory.

exe/Main.hs

@@ -1,6 +1,6 @@
 -- Copyright (c) 2019 The DAML Authors. All rights reserved.
 -- SPDX-License-Identifier: Apache-2.0
-{-# LANGUAGE CPP #-} -- To get precise GHC version and check if distributed binary
+{-# LANGUAGE CPP #-} -- To get precise GHC version
 {-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -Wno-dodgy-imports #-} -- GHC no longer exports def in GHC 8.6 and above
 {-# LANGUAGE DeriveGeneric #-}
@@ -72,7 +72,6 @@ import Ide.Plugin.StylishHaskell          as StylishHaskell
 import Ide.Plugin.Brittany                as Brittany
 #endif
 import Ide.Plugin.Pragmas                 as Pragmas
--- import Data.Typeable (Typeable)
 
 
 -- ---------------------------------------------------------------------

src/Ide/Cradle.hs

@@ -54,7 +54,7 @@ findLocalCradle fp = do
       debugm $ "Found \"" ++ yaml ++ "\" for \"" ++ fp ++ "\""
       crdl <- Bios.loadCradle yaml
       return $ fmap (const CabalNone) crdl
-    Nothing -> Bios.loadImplicitCradle fp -- cabalHelperCradle fp
+    Nothing -> cabalHelperCradle fp
   logm $ "Module \"" ++ fp ++ "\" is loaded by Cradle: " ++ show crdl
   return crdl