summaryrefslogtreecommitdiff
path: root/src/Propellor/Property.hs
diff options
context:
space:
mode:
authorJoey Hess2019-01-18 02:19:41 -0400
committerJoey Hess2019-01-18 02:19:41 -0400
commitd004b02c1704168ab59e59ec76d7d572c79a0423 (patch)
tree14ef7f324cace020c036d393d7dac5eeb65e3f55 /src/Propellor/Property.hs
parent3328fb83373adad786e57d4ed47e1d801e14260f (diff)
parentb9d9333e030ac59ea11d435b7e2e4758daff4b4a (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property.hs')
-rw-r--r--src/Propellor/Property.hs10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs
index 8c0a5859..cb2f01a8 100644
--- a/src/Propellor/Property.hs
+++ b/src/Propellor/Property.hs
@@ -330,15 +330,9 @@ pickOS a b = c `addChildren` [toChildProperty a, toChildProperty b]
withOS
:: (SingI metatypes)
=> Desc
- -> (OuterMetaTypesWitness '[] -> Maybe System -> Propellor Result)
+ -> (OuterMetaTypesWitness metatypes -> Maybe System -> Propellor Result)
-> Property (MetaTypes metatypes)
-withOS desc a = property desc $ a dummyoutermetatypes =<< getOS
- where
- -- Using this dummy value allows ensureProperty to be used
- -- even though the inner property probably doesn't target everything
- -- that the outer withOS property targets.
- dummyoutermetatypes :: OuterMetaTypesWitness ('[])
- dummyoutermetatypes = OuterMetaTypesWitness sing
+withOS desc a = property' desc $ \w -> a w =<< getOS
-- | A property that always fails with an unsupported OS error.
unsupportedOS :: Property UnixLike