summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-07 16:46:24 -0400
committerJoey Hess2016-03-07 16:46:24 -0400
commit2b052b086c331379a66d47cad7ad414eb1e9f36a (patch)
tree092752546a4a0a897d29251ef2d9ae08bb6381f2
parent223c35fe5f85f94d03e7ba3a03b74af3e7eada85 (diff)
move fromString export to Propellor
My policy for config.hs is it shouldn't need to load any modules other than propellor and the desired property modules.
-rw-r--r--config-freebsd.hs1
-rw-r--r--src/Propellor.hs1
2 files changed, 1 insertions, 1 deletions
diff --git a/config-freebsd.hs b/config-freebsd.hs
index a8ceece0..02a0fdf9 100644
--- a/config-freebsd.hs
+++ b/config-freebsd.hs
@@ -14,7 +14,6 @@ import qualified Propellor.Property.Docker as Docker
import qualified Propellor.Property.FreeBSD.Pkg as Pkg
import qualified Propellor.Property.ZFS as ZFS
import qualified Propellor.Property.FreeBSD.Poudriere as Poudriere
-import Data.String (fromString)
main :: IO ()
main = defaultMain hosts
diff --git a/src/Propellor.hs b/src/Propellor.hs
index 53b209ca..9c5a85a9 100644
--- a/src/Propellor.hs
+++ b/src/Propellor.hs
@@ -72,3 +72,4 @@ import Propellor.Info
import Propellor.PropAccum
import Data.Monoid as X
+import Data.String as X (fromString)