From f2bb9a3db7ccb5fc0e64920017d305715b34ba95 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 23 Apr 2018 15:20:25 -0400 Subject: more ghc 8.4 build fixes Tested build with ghc 8.4 now. --- src/Propellor/Types/Chroot.hs | 3 ++- src/Propellor/Types/Docker.hs | 3 ++- src/Propellor/Types/ResultCheck.hs | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Types') diff --git a/src/Propellor/Types/Chroot.hs b/src/Propellor/Types/Chroot.hs index b27203e5..b3751a9a 100644 --- a/src/Propellor/Types/Chroot.hs +++ b/src/Propellor/Types/Chroot.hs @@ -6,9 +6,10 @@ import Propellor.Types import Propellor.Types.Empty import Propellor.Types.Info -import Data.Monoid import qualified Data.Semigroup as Sem import qualified Data.Map as M +import Data.Monoid +import Prelude data ChrootInfo = ChrootInfo { _chroots :: M.Map FilePath Host diff --git a/src/Propellor/Types/Docker.hs b/src/Propellor/Types/Docker.hs index 79577591..72703b82 100644 --- a/src/Propellor/Types/Docker.hs +++ b/src/Propellor/Types/Docker.hs @@ -6,9 +6,10 @@ import Propellor.Types import Propellor.Types.Empty import Propellor.Types.Info -import Data.Monoid import qualified Data.Semigroup as Sem import qualified Data.Map as M +import Data.Monoid +import Prelude data DockerInfo = DockerInfo { _dockerRunParams :: [DockerRunParam] diff --git a/src/Propellor/Types/ResultCheck.hs b/src/Propellor/Types/ResultCheck.hs index f03c174f..8c161850 100644 --- a/src/Propellor/Types/ResultCheck.hs +++ b/src/Propellor/Types/ResultCheck.hs @@ -14,6 +14,7 @@ import Propellor.Exception import Utility.Monad import Data.Monoid +import Prelude -- | This is a `Property` but its `Result` is not accurate; in particular -- it may return `NoChange` despite having made a change. -- cgit v1.2.3