Merge branch 'master' into hs-vulkan

pkgs/development/haskell-modules/configuration-common.nix

@@ -866,6 +866,9 @@ self: super: {
   # https://github.com/fpco/stackage/issues/3126
   stack = doJailbreak super.stack;
 
+  # https://github.com/snoyberg/monad-logger/issues/1
+  monad-logger = self.monad-logger_0_3_28_5;
+
   # These packages depend on each other, forming an infinite loop.
   scalendar = markBroken (super.scalendar.override { SCalendar = null; });
   SCalendar = markBroken (super.SCalendar.override { scalendar = null; });
@@ -1022,6 +1025,11 @@ self: super: {
 
   # This package refers to the wrong library (itself in fact!)
   vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
+
+  # Both need a more up-to-date version
+  hlint = super.hlint.override { extra = self.extra_1_6_6; };
+  hoogle = super.hoogle.override { extra = self.extra_1_6_6; };
+
 }
 
 //