Merge remote-tracking branch 'refs/remotes/origin/haskell-updates' into haskell-updates

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

@@ -1469,6 +1469,16 @@ Superuser created successfully.
           extent.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <literal>pkgs.haskell-language-server</literal> will now by
+          default be linked dynamically to improve TemplateHaskell
+          compatibility. To mitigate the increased closure size it will
+          now by default only support our current default ghc (at the
+          moment 9.0.2). Add other ghc versions via e.g.
+          <literal>pkgs.haskell-language-server.override { supportedGhcVersions = [ &quot;90&quot; &quot;92&quot; ]; }</literal>.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-21.11-notable-changes">

nixos/doc/manual/release-notes/rl-2111.section.md

@@ -437,6 +437,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 - `/usr` will always be included in the initial ramdisk. See the `fileSystems.<name>.neededForBoot` option.
   If any files exist under `/usr` (which is not typical for NixOS), they will be included in the initial ramdisk, increasing its size to a possibly problematic extent.
 
+- `pkgs.haskell-language-server` will now by default be linked dynamically to improve TemplateHaskell compatibility. To mitigate the increased closure size it will now by default only support our current default ghc (at the moment 9.0.2). Add other ghc versions via e.g. `pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }`.
+
 ## Other Notable Changes {#sec-release-21.11-notable-changes}
 
 

pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix

@@ -1,14 +1,14 @@
 { lib
 , stdenv
-, supportedGhcVersions ? [ "88" "810" "90" "92" ]
-, dynamic ? false
+, supportedGhcVersions ? [ "90" ]
+, dynamic ? true
 , haskellPackages
 , haskell
 }:
 #
 # The recommended way to override this package is
 #
-# pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" ]; }
+# pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92"]; }
 #
 # for example. Read more about this in the haskell-language-server section of the nixpkgs manual.
 #
@@ -57,8 +57,7 @@ in stdenv.mkDerivation {
         concatMapStringsSep ", " (x: concatStringsSep ", " (targets x))
         supportedGhcVersions
       }.
-
-      You can override the list supportedGhcVersions.
+      You can choose for which ghc versions to install hls with pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }.
     '';
   };
 }