summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2018-04-30 07:35:47 -0400
committerJoey Hess2018-04-30 07:35:47 -0400
commit345536941eeec4a4562222408d9f4326ce9b2645 (patch)
tree7a491d8df377e75f5d493c0d875513027c0aa855 /src/Propellor
parent584a0ebdb5579bc13f0cf209aa148845bf84947d (diff)
parent96ea8e04251bc23dd27faf1f486a2a9f9c29ff98 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Types.hs8
1 files changed, 5 insertions, 3 deletions
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)