diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-28 03:15:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-28 03:15:06 -0400 |
| commit | d36fd00e1f42ed3adc1892baff6f12fe6ed946fb (patch) | |
| tree | 62f4ea8950041d4496b6de65df9df0fe893a686c | |
| parent | 67f4a35f08caff9efd5ec930943a02217188cc79 (diff) | |
update
| -rw-r--r-- | src/Propellor.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property.hs | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/Propellor.hs b/src/Propellor.hs index e6a52948..a371ea44 100644 --- a/src/Propellor.hs +++ b/src/Propellor.hs @@ -39,7 +39,6 @@ module Propellor ( , (&) , (!) -- * Propertries - , describe -- | Properties are often combined together in your propellor -- configuration. For example: -- @@ -48,6 +47,7 @@ module Propellor ( , requires , before , onChange + , describe , module Propellor.Property -- | Everything you need to build your own properties, -- and useful property combinators diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs index 10730710..111756ff 100644 --- a/src/Propellor/Property.hs +++ b/src/Propellor/Property.hs @@ -269,13 +269,9 @@ isNewerThan x y = do -- If neither input property supports the targeted OS, calls -- `unsupportedOS`. Using the example above on a Fedora system would -- fail that way. --- --- (It would be better if this constrained its return type to the Union --- of the targets of the inputs, but that does not seems to currently --- be possible with ghc.) -{- For some reason, ghc does not like this type signature, or indeed the - - version of this that it emits. But this does compile! Until a type - - signature can be written down, cannot add the Union constraint. +{- I have not yet managed to write down a type signature for this + - that ghc will accept. Until a type signature can be written down, + - cannot add the Union constraint. - http://stackoverflow.com/questions/36256557/what-is-the-type-of-matches-m-s-m-fromsing-s pickOS :: |