diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-04-23 13:20:13 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-04-23 13:20:13 -0400 |
| commit | 9228bda32f0a3f6d52e7cc5eb444376e7b024d8c (patch) | |
| tree | e3ada017b0f625db8b39a2212ab82c8e32a62b7c /src/Propellor/Property/Mount.hs | |
| parent | 5ecbec11127449fefe4812fd6b374801ce8499c1 (diff) | |
semigroup monoid change fallout; drop ghc 7 support
Fix build with ghc 8.4, which broke due to the Semigroup Monoid change.
See https://prime.haskell.org/wiki/Libraries/Proposals/SemigroupMonoid
Dropped support for building propellor with ghc 7 (as in debian
oldstable), to avoid needing to depend on the semigroups transitional
package, but also because it's just too old to be worth supporting.
If we indeed drop ghc 7 support entirely, some code to support "jessie"
can be removed; concurrent-output can be de-embedded, and the Singletons
code can be simplified.
This commit was sponsored by Jack Hill on Patreon.
Diffstat (limited to 'src/Propellor/Property/Mount.hs')
| -rw-r--r-- | src/Propellor/Property/Mount.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Property/Mount.hs b/src/Propellor/Property/Mount.hs index 71f1733e..53129f50 100644 --- a/src/Propellor/Property/Mount.hs +++ b/src/Propellor/Property/Mount.hs @@ -10,6 +10,7 @@ import Propellor.Base import Utility.Path import Data.List +import qualified Data.Semigroup as Sem -- | type of filesystem to mount ("auto" to autodetect) type FsType = String @@ -24,7 +25,7 @@ type MountPoint = FilePath -- -- For default mount options, use `mempty`. newtype MountOpts = MountOpts [String] - deriving Monoid + deriving (Sem.Semigroup, Monoid) class ToMountOpts a where toMountOpts :: a -> MountOpts |