summaryrefslogtreecommitdiff
path: root/src/Propellor/Types.hs
diff options
context:
space:
mode:
authorJoey Hess2018-04-30 09:06:08 -0400
committerJoey Hess2018-04-30 09:06:08 -0400
commitbb32fad83db093c30ee6132c5d982cc25fe89bda (patch)
treec106cf941167fa16f9489ba2f49410dc38d814af /src/Propellor/Types.hs
parent345536941eeec4a4562222408d9f4326ce9b2645 (diff)
parent14fe4c4d6b5a29be94ecfc0572e0f9a9a081e795 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Types.hs')
-rw-r--r--src/Propellor/Types.hs12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs
index 4b4378a9..7cbe9f13 100644
--- a/src/Propellor/Types.hs
+++ b/src/Propellor/Types.hs
@@ -235,7 +235,7 @@ instance SingI metatypes => Monoid (Property (MetaTypes metatypes))
where
-- | A property that does nothing.
mempty = Property sing "noop property" Nothing mempty mempty
- mappend = (<>)
+ mappend = (Sem.<>)
-- | Any type of RevertableProperty is a Semigroup. When revertable
-- properties x and y are appended together, the resulting revertable
@@ -253,10 +253,12 @@ instance
RevertableProperty (s1 <> s2) (u2 <> u1)
instance
- ( Monoid (Property setupmetatypes)
- , Monoid (Property undometatypes)
+ ( Monoid (Property (MetaTypes setupmetatypes))
+ , Monoid (Property (MetaTypes undometatypes))
+ , SingI setupmetatypes
+ , SingI undometatypes
)
- => Monoid (RevertableProperty setupmetatypes undometatypes)
+ => Monoid (RevertableProperty (MetaTypes setupmetatypes) (MetaTypes undometatypes))
where
mempty = RevertableProperty mempty mempty
- mappend = (<>)
+ mappend = (Sem.<>)