summaryrefslogtreecommitdiff
path: root/src/Propellor/Types
diff options
context:
space:
mode:
authorJoey Hess2018-04-29 14:01:18 -0400
committerJoey Hess2018-04-29 14:01:18 -0400
commit45509984bb93c24a17228fd41058da7f039b54d6 (patch)
tree553239ab39c7e1bee343db44ee725f60eb2ebe88 /src/Propellor/Types
parent279fe0fd88999919e70b07bda5f89f030dbfaaa1 (diff)
parent6b6d11a7cd4eba3adbfd4e63469f968fcfcf5dc0 (diff)
Merge branch 'master' into joeyconfig
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.