yesod-bin 1.2.7.3 → 1.2.7.4

raw patch · 4 files changed

+16/−12 lines, 4 filesdep +conduit-extradep +streaming-commonsdep ~conduitdep ~resourcetdep ~shakespeare

Dependencies added: conduit-extra, streaming-commons

Dependency ranges changed: conduit, resourcet, shakespeare, shakespeare-css, shakespeare-js, shakespeare-text

Files

• Devel.hs +2/−3
• HsFile.hs +2/−1
• Scaffolding/Scaffolder.hs +2/−1
• yesod-bin.cabal +10/−7

@@ -64,8 +64,7 @@                                                         getBuildFlags, getPackageArgs)  import qualified Config                                as GHC-import           Data.Conduit.Network                  (HostPreference (HostIPv4),-                                                        bindPort)+import           Data.Streaming.Network                (bindPortTCP) import           Network                               (withSocketsDo) #if MIN_VERSION_http_conduit(2, 0, 0) import           Network.HTTP.Conduit                  (conduitManagerSettings, newManager)@@ -171,7 +170,7 @@  checkPort :: Int -> IO Bool checkPort p = do-    es <- Ex.try $ bindPort p HostIPv4+    es <- Ex.try $ bindPortTCP p "*4"     case es of         Left (_ :: Ex.IOException) -> return False         Right s -> do

@@ -2,7 +2,8 @@ module HsFile (mkHsFile) where import Text.ProjectTemplate (createTemplate) import Data.Conduit -    ( ($$), (=$), runResourceT, ResourceT, ConduitM, awaitForever, yield, Source )+    ( ($$), (=$), ConduitM, awaitForever, yield, Source )+import Control.Monad.Trans.Resource (ResourceT, runResourceT) import qualified Data.Conduit.List as CL import Prelude hiding (FilePath) import Filesystem.Path ( FilePath )

@@ -4,7 +4,8 @@  import           Control.Arrow         ((&&&)) import qualified Data.ByteString.Char8 as S-import           Data.Conduit          (runResourceT, yield, ($$), ($$+-))+import           Data.Conduit          (yield, ($$), ($$+-))+import Control.Monad.Trans.Resource (runResourceT) import           Data.FileEmbed        (embedFile) import           Data.String           (fromString) import qualified Data.Text             as T

@@ -1,5 +1,5 @@ name:            yesod-bin-version:         1.2.7.3+version:         1.2.7.4 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -51,10 +51,11 @@                      , ghc-paths          >= 0.1                      , parsec             >= 2.1          && < 4                      , text               >= 0.11-                     , shakespeare-text   >= 1.0          && < 1.1-                     , shakespeare        >= 1.0.2        && < 1.3-                     , shakespeare-js     >= 1.0.2        && < 1.3-                     , shakespeare-css    >= 1.0.2        && < 1.1+                     , shakespeare+                     , shakespeare-text   >= 1.0+                     , shakespeare        >= 1.0.2        && < 2.1+                     , shakespeare-js     >= 1.0.2+                     , shakespeare-css    >= 1.0.2                      , bytestring         >= 0.9.1.4                      , time               >= 1.1.4                      , template-haskell@@ -77,8 +78,9 @@                      , fsnotify           >= 0.0          && < 0.1                      , split              >= 0.2          && < 0.3                      , file-embed-                     , conduit            >= 0.5          && < 1.1-                     , resourcet          >= 0.3          && < 0.5+                     , conduit            >= 0.5          && < 1.2+                     , conduit-extra+                     , resourcet          >= 0.3          && < 1.2                      , base64-bytestring                      , lifted-base                      , http-reverse-proxy >= 0.1.1@@ -90,6 +92,7 @@                      , warp               >= 1.3.7.5                      , wai                >= 1.4                      , data-default-class+                     , streaming-commons      ghc-options:       -Wall -threaded     main-is:           main.hs