summaryrefslogtreecommitdiff
path: root/src/Propellor/Types
diff options
context:
space:
mode:
authorJoey Hess2018-04-23 15:20:25 -0400
committerJoey Hess2018-04-23 15:20:25 -0400
commitf2bb9a3db7ccb5fc0e64920017d305715b34ba95 (patch)
tree11bc94d6ff739eb6f959381f954821cb0c7348cc /src/Propellor/Types
parent237a8a8b7035447f83731bf83d236c31d6a89e88 (diff)
more ghc 8.4 build fixes
Tested build with ghc 8.4 now.
Diffstat (limited to 'src/Propellor/Types')
-rw-r--r--src/Propellor/Types/Chroot.hs3
-rw-r--r--src/Propellor/Types/Docker.hs3
-rw-r--r--src/Propellor/Types/ResultCheck.hs1
3 files changed, 5 insertions, 2 deletions
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.