Merge remote-tracking branch 'origin/master' into hkm/defer-errors

Author: hamishmack

overlays/hackage-quirks.nix

@@ -72,7 +72,7 @@ in { haskell-nix = prev.haskell-nix // {
       cabalProject = ''
         packages: .
         allow-newer: haskell-language-server:ghcide
-        constraints: ghcide <0.7.4, hls-plugin-api <0.7.1.0, hls-retrie-plugin <0.1.1.1
+        constraints: ghcide <0.7.4, hls-plugin-api <0.7.1.0, hls-retrie-plugin <0.1.1.1, haddock-library <1.10
       '';
     };