From 96ea8e04251bc23dd27faf1f486a2a9f9c29ff98 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Apr 2018 07:34:30 -0400 Subject: fix build with ghc 8.2 Seems newer ghc can figure out that metatypes is SingI, but not this one? --- src/Propellor/Types.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs index c3926229..4b4378a9 100644 --- a/src/Propellor/Types.hs +++ b/src/Propellor/Types.hs @@ -242,10 +242,12 @@ instance SingI metatypes => Monoid (Property (MetaTypes metatypes)) -- property has a description like "x and y". -- Note that when x fails to be ensured, it will not try to ensure y. instance - ( Sem.Semigroup (Property setupmetatypes) - , Sem.Semigroup (Property undometatypes) + ( Sem.Semigroup (Property (MetaTypes setupmetatypes)) + , Sem.Semigroup (Property (MetaTypes undometatypes)) + , SingI setupmetatypes + , SingI undometatypes ) - => Sem.Semigroup (RevertableProperty setupmetatypes undometatypes) + => Sem.Semigroup (RevertableProperty (MetaTypes setupmetatypes) (MetaTypes undometatypes)) where RevertableProperty s1 u1 <> RevertableProperty s2 u2 = RevertableProperty (s1 <> s2) (u2 <> u1) -- cgit v1.2.3