Merge remote-tracking branch 'upstream/master' into hardened-stdenv

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

@@ -30,6 +30,9 @@ self: super: {
     hardeningDisable = [ "format" ];
   });
 
+  # This test keeps being aborted because it runs too quietly for too long
+  Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
+
   # Use the default version of mysql to build this package (which is actually mariadb).
   mysql = super.mysql.override { mysql = pkgs.mysql.lib; };