Merge remote-tracking branch 'upstream/master' into staging

2018-05-21 20:20:29 -04:00
parent 60a666507c 0106dfcbeb
commit db4d77779c
83 changed files with 798 additions and 265 deletions
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -408,6 +408,9 @@ self: super: {
    jailbreak       = true;
  });

+  # https://github.com/jcristovao/enclosed-exceptions/issues/12
+  enclosed-exceptions = dontCheck super.enclosed-exceptions;
+
  # Older versions don't compile.
  base-compat = self.base-compat_0_10_1;
  brick = self.brick_0_37;