summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--src/Propellor/Debug.hs3
-rw-r--r--src/Propellor/Engine.hs3
-rw-r--r--src/Propellor/Gpg.hs3
-rw-r--r--src/Propellor/Info.hs1
-rw-r--r--src/Propellor/Message.hs3
-rw-r--r--src/Propellor/PrivData.hs5
-rw-r--r--src/Propellor/Property.hs3
-rw-r--r--src/Propellor/Property/Apt.hs3
-rw-r--r--src/Propellor/Property/Chroot/Util.hs3
-rw-r--r--src/Propellor/Property/Cmd.hs3
-rw-r--r--src/Propellor/Types.hs3
-rw-r--r--src/Propellor/Types/Dns.hs3
-rw-r--r--src/Propellor/Types/Info.hs3
-rw-r--r--src/Propellor/Types/Result.hs3
-rw-r--r--src/System/Console/Concurrent/Internal.hs3
-rw-r--r--src/wrapper.hs3
17 files changed, 33 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index a4857ba4..c1de1d0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ propellor (2.15.1) UNRELEASED; urgency=medium
* Gpg.keyImported converted to not use a flag file and instead check
if gpg has the provided key already.
Thanks, FĂ©lix Sipma.
+ * Clean build with ghc 7.10.
-- Joey Hess <id@joeyh.name> Tue, 08 Dec 2015 11:59:43 -0400
diff --git a/src/Propellor/Debug.hs b/src/Propellor/Debug.hs
index ac4a56cc..790a9a4b 100644
--- a/src/Propellor/Debug.hs
+++ b/src/Propellor/Debug.hs
@@ -1,6 +1,5 @@
module Propellor.Debug where
-import Control.Applicative
import Control.Monad.IfElse
import System.IO
import System.Directory
@@ -8,6 +7,8 @@ import System.Log.Logger
import System.Log.Formatter
import System.Log.Handler (setFormatter)
import System.Log.Handler.Simple
+import Control.Applicative
+import Prelude
import Utility.Monad
import Utility.Env
diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs
index 36a05b28..2e914d67 100644
--- a/src/Propellor/Engine.hs
+++ b/src/Propellor/Engine.hs
@@ -14,12 +14,13 @@ module Propellor.Engine (
import System.Exit
import System.IO
import Data.Monoid
-import Control.Applicative
import "mtl" Control.Monad.RWS.Strict
import System.PosixCompat
import System.Posix.IO
import System.FilePath
import System.Directory
+import Control.Applicative
+import Prelude
import Propellor.Types
import Propellor.Message
diff --git a/src/Propellor/Gpg.hs b/src/Propellor/Gpg.hs
index 949eb5b5..5043782b 100644
--- a/src/Propellor/Gpg.hs
+++ b/src/Propellor/Gpg.hs
@@ -1,6 +1,5 @@
module Propellor.Gpg where
-import Control.Applicative
import System.IO
import System.FilePath
import System.Directory
@@ -9,6 +8,8 @@ import Data.List.Utils
import Control.Monad
import System.Console.Concurrent
import System.Console.Concurrent.Internal (ConcurrentProcessHandle(..))
+import Control.Applicative
+import Prelude
import Propellor.PrivData.Paths
import Propellor.Message
diff --git a/src/Propellor/Info.hs b/src/Propellor/Info.hs
index 889f8439..499b901c 100644
--- a/src/Propellor/Info.hs
+++ b/src/Propellor/Info.hs
@@ -11,6 +11,7 @@ import qualified Data.Map as M
import Data.Maybe
import Data.Monoid
import Control.Applicative
+import Prelude
pureInfoProperty :: (IsInfo v) => Desc -> v -> Property HasInfo
pureInfoProperty desc v = pureInfoProperty' desc (addInfo mempty v)
diff --git a/src/Propellor/Message.hs b/src/Propellor/Message.hs
index 576e58ee..32625e6a 100644
--- a/src/Propellor/Message.hs
+++ b/src/Propellor/Message.hs
@@ -22,10 +22,11 @@ module Propellor.Message (
import System.Console.ANSI
import System.IO
import Control.Monad.IO.Class (liftIO, MonadIO)
-import Control.Applicative
import System.IO.Unsafe (unsafePerformIO)
import Control.Concurrent
import System.Console.Concurrent
+import Control.Applicative
+import Prelude
import Propellor.Types
import Utility.PartialPrelude
diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs
index a1e34abc..2ed75e33 100644
--- a/src/Propellor/PrivData.hs
+++ b/src/Propellor/PrivData.hs
@@ -23,11 +23,9 @@ module Propellor.PrivData (
forceHostContext,
) where
-import Control.Applicative
import System.IO
import System.Directory
import Data.Maybe
-import Data.Monoid
import Data.List
import Data.Typeable
import Control.Monad
@@ -38,6 +36,9 @@ import qualified Data.Set as S
import qualified Data.ByteString.Lazy as L
import System.Console.Concurrent
import System.Console.Concurrent.Internal (ConcurrentProcessHandle(..))
+import Control.Applicative
+import Data.Monoid
+import Prelude
import Propellor.Types
import Propellor.Types.PrivData
diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs
index e862fb44..a83bffc4 100644
--- a/src/Propellor/Property.hs
+++ b/src/Propellor/Property.hs
@@ -38,12 +38,13 @@ module Propellor.Property (
import System.Directory
import System.FilePath
import Control.Monad
-import Control.Applicative
import Data.Monoid
import Control.Monad.IfElse
import "mtl" Control.Monad.RWS.Strict
import System.Posix.Files
import qualified Data.Hash.MD5 as MD5
+import Control.Applicative
+import Prelude
import Propellor.Types
import Propellor.Types.ResultCheck
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index a177c42f..d16c4855 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -3,10 +3,11 @@
module Propellor.Property.Apt where
import Data.Maybe
-import Control.Applicative
import Data.List
import System.IO
import Control.Monad
+import Control.Applicative
+import Prelude
import Propellor.Base
import qualified Propellor.Property.File as File
diff --git a/src/Propellor/Property/Chroot/Util.hs b/src/Propellor/Property/Chroot/Util.hs
index 3ebda28f..ff227f52 100644
--- a/src/Propellor/Property/Chroot/Util.hs
+++ b/src/Propellor/Property/Chroot/Util.hs
@@ -6,8 +6,9 @@ import Utility.Exception
import Utility.Env
import Utility.Directory
-import Control.Applicative
import System.Directory
+import Control.Applicative
+import Prelude
-- | When chrooting, it's useful to ensure that PATH has all the standard
-- directories in it. This adds those directories to whatever PATH is
diff --git a/src/Propellor/Property/Cmd.hs b/src/Propellor/Property/Cmd.hs
index 83414dcb..6da2e643 100644
--- a/src/Propellor/Property/Cmd.hs
+++ b/src/Propellor/Property/Cmd.hs
@@ -44,9 +44,10 @@ module Propellor.Property.Cmd (
waitForProcess,
) where
-import Control.Applicative
import Data.List
import "mtl" Control.Monad.Reader
+import Control.Applicative
+import Prelude
import Propellor.Types
import Propellor.Property
diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs
index 58e86247..35e95df7 100644
--- a/src/Propellor/Types.hs
+++ b/src/Propellor/Types.hs
@@ -39,10 +39,11 @@ module Propellor.Types
) where
import Data.Monoid
-import Control.Applicative
import "mtl" Control.Monad.RWS.Strict
import Control.Monad.Catch
import Data.Typeable
+import Control.Applicative
+import Prelude
import Propellor.Types.Info
import Propellor.Types.OS
diff --git a/src/Propellor/Types/Dns.hs b/src/Propellor/Types/Dns.hs
index d95f1a8b..8f15d156 100644
--- a/src/Propellor/Types/Dns.hs
+++ b/src/Propellor/Types/Dns.hs
@@ -7,11 +7,12 @@ import Propellor.Types.Empty
import Propellor.Types.Info
import Data.Word
-import Data.Monoid
import qualified Data.Map as M
import qualified Data.Set as S
import Data.List
import Data.String.Utils (split, replace)
+import Data.Monoid
+import Prelude
type Domain = String
diff --git a/src/Propellor/Types/Info.hs b/src/Propellor/Types/Info.hs
index 2c95b6fc..53fa9e77 100644
--- a/src/Propellor/Types/Info.hs
+++ b/src/Propellor/Types/Info.hs
@@ -13,8 +13,9 @@ module Propellor.Types.Info (
) where
import Data.Dynamic
-import Data.Monoid
import Data.Maybe
+import Data.Monoid
+import Prelude
-- | Information about a Host, which can be provided by its properties.
newtype Info = Info [InfoEntry]
diff --git a/src/Propellor/Types/Result.hs b/src/Propellor/Types/Result.hs
index 9def9a3f..e8510abf 100644
--- a/src/Propellor/Types/Result.hs
+++ b/src/Propellor/Types/Result.hs
@@ -1,7 +1,8 @@
module Propellor.Types.Result where
-import Data.Monoid
import System.Console.ANSI
+import Data.Monoid
+import Prelude
-- | There can be three results of satisfying a Property.
data Result = NoChange | MadeChange | FailedChange
diff --git a/src/System/Console/Concurrent/Internal.hs b/src/System/Console/Concurrent/Internal.hs
index f538a7de..a4cafb61 100644
--- a/src/System/Console/Concurrent/Internal.hs
+++ b/src/System/Console/Concurrent/Internal.hs
@@ -19,7 +19,6 @@ import System.Directory
import System.Exit
import Control.Monad
import Control.Monad.IO.Class (liftIO, MonadIO)
-import Control.Applicative
import System.IO.Unsafe (unsafePerformIO)
import Control.Concurrent
import Control.Concurrent.STM
@@ -30,6 +29,8 @@ import Data.Monoid
import qualified System.Process as P
import qualified Data.Text as T
import qualified Data.Text.IO as T
+import Control.Applicative
+import Prelude
import Utility.Monad
import Utility.Exception
diff --git a/src/wrapper.hs b/src/wrapper.hs
index 0cfe319d..a204b60c 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -24,13 +24,14 @@ import Utility.Exception
import Control.Monad
import Control.Monad.IfElse
-import Control.Applicative
import System.Directory
import System.FilePath
import System.Environment (getArgs)
import System.Exit
import System.Posix.Directory
import System.IO
+import Control.Applicative
+import Prelude
distdir :: FilePath
distdir = "/usr/src/propellor"