HostPreference conflict #769

yesod-bin/Devel.hs

@@ -258,7 +258,7 @@ devel opts passThroughArgs = withSocketsDo $ withManager $ \manager -> do
            list <- liftIO $ getFileList hsSourceDirs [cabal]
            success <- liftIO rebuild
            pkgArgs <- liftIO (ghcPackageArgs opts)
-           let devArgs = pkgArgs ++ ["devel.hs"]
+           let devArgs = pkgArgs ++ ["+RTS", "-I0", "-RTS", "devel.hs"]
            let loop list0 = do
                    (haskellFileChanged, list1) <- liftIO $
                        watchForChanges filesModified hsSourceDirs [cabal] list0 (eventTimeout opts)

yesod-bin/yesod-bin.cabal

@@ -95,7 +95,7 @@ executable             yesod
                      , data-default-class
                      , streaming-commons
 
-    ghc-options:       -Wall -threaded -rtsopts
+    ghc-options:       -Wall -threaded -rtsopts -with-rtsopts=-I0
     main-is:           main.hs
     other-modules:     Scaffolding.Scaffolder
                        Devel

yesod/Yesod/Default/Config.hs

@@ -23,7 +23,7 @@ import Data.Maybe (fromMaybe)
 import qualified Data.HashMap.Strict as M
 import System.Environment (getArgs, getProgName, getEnvironment)
 import System.Exit (exitFailure)
-import Data.Conduit.Network (HostPreference)
+import Data.Streaming.Network (HostPreference)
 import Data.String (fromString)
 
 -- | A yesod-provided @'AppEnv'@, allows for Development, Testing, and

yesod/yesod.cabal

@@ -1,5 +1,5 @@
 name:            yesod
-version:         1.2.6
+version:         1.2.6.1
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -50,6 +50,7 @@ library
                    , fast-logger
                    , conduit-extra
                    , shakespeare
+                   , streaming-commons
 
     exposed-modules: Yesod
                    , Yesod.Default.Config