about summary refs log tree commit diff
path: root/users/glittershark/xanthous/src/Xanthous/Prelude.hs
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-06-29T01·45-0400
committerglittershark <grfn@gws.fyi>2020-07-03T14·41+0000
commitbeb29128b65f163997881fd4f6a3e06fdd4c3569 (patch)
tree3ccf6a76459979c68e368b10efbdd24548d34ffe /users/glittershark/xanthous/src/Xanthous/Prelude.hs
parent96fa6c465b434de3cd6b1fb7dc03a16e9376638c (diff)
fix(xan): fix compat with new base+ghc r/1187
A couple of changes necessary to get things working with both ghc 8.8.3
and the new base:

- Explicitly import fail from Control.Monad.Fail in the prelude, since
  it's there instead of the base prelude now
- GHC no longer allows type family equality constraints in quantified
  constraints - which is a bummer - but is avoidable in the one case
  where it was happening
- Explicitly import a constructor from Data.List.NonEmpty

Change-Id: Ia06fc724ddc2d6a3f9024c047ed55eea40bcf408
Reviewed-on: https://cl.tvl.fyi/c/depot/+/744
Tested-by: BuildkiteCI
Reviewed-by: BuildkiteCI
Reviewed-by: Profpatsch <mail@profpatsch.de>
Diffstat (limited to '')
-rw-r--r--users/glittershark/xanthous/src/Xanthous/Prelude.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/users/glittershark/xanthous/src/Xanthous/Prelude.hs b/users/glittershark/xanthous/src/Xanthous/Prelude.hs
index b4f1333246..9bec777de7 100644
--- a/users/glittershark/xanthous/src/Xanthous/Prelude.hs
+++ b/users/glittershark/xanthous/src/Xanthous/Prelude.hs
@@ -8,6 +8,7 @@ module Xanthous.Prelude
   , module Data.Void
   , module Control.Comonad
   , module Data.Witherable
+  , fail
 
   , (&!)
 
@@ -27,6 +28,7 @@ import Control.Lens hiding (levels, Level)
 import Data.Void
 import Control.Comonad
 import Data.Witherable
+import Control.Monad.Fail (fail)
 --------------------------------------------------------------------------------
 
 ninsertSet