yesod-bin 1.4.13.2 → 1.4.13.3
raw patch · 9 files changed
+47/−38 lines, 9 files
Files
- Keter.hs +8/−3
- hsfiles/mongo.hsfiles +6/−6
- hsfiles/mysql.hsfiles +6/−6
- hsfiles/postgres-fay.hsfiles +6/−6
- hsfiles/postgres.hsfiles +6/−6
- hsfiles/simple.hsfiles +3/−3
- hsfiles/sqlite.hsfiles +6/−6
- main.hs +5/−1
- yesod-bin.cabal +1/−1
Keter.hs view
@@ -11,6 +11,7 @@ import Control.Monad import System.Directory hiding (findFiles) import Data.Maybe (mapMaybe)+import Data.Monoid import System.FilePath ((</>)) import qualified Codec.Archive.Tar as Tar import Control.Exception@@ -27,8 +28,9 @@ keter :: String -- ^ cabal command -> Bool -- ^ no build? -> Bool -- ^ no copy to?+ -> [String] -- ^ build args -> IO ()-keter cabal noBuild noCopyTo = do+keter cabal noBuild noCopyTo buildArgs = do ketercfg <- keterConfig mvalue <- decodeFile ketercfg value <-@@ -76,8 +78,11 @@ then do run "stack" ["clean"] createDirectoryIfMissing True "./dist/bin" run "stack"- (words "--local-bin-path ./dist/bin build --copy-bins")- else mapM_ (\x -> run cabal [x]) ["clean", "configure", "build"]+ ((words "--local-bin-path ./dist/bin build --copy-bins")+ <> buildArgs)+ else do run cabal ["clean"]+ run cabal ["configure"]+ run cabal ("build" : buildArgs) _ <- try' $ removeDirectoryRecursive "static/tmp"
hsfiles/mongo.hsfiles view
@@ -519,9 +519,9 @@ , classy-prelude-yesod >= 0.10.2 , bytestring >= 0.9 && < 0.11 , text >= 0.11 && < 2.0- , persistent >= 2.0 && < 2.2- , persistent-mongoDB >= 2.1.2 && < 2.2- , persistent-template >= 2.0 && < 2.2+ , persistent >= 2.0 && < 2.3+ , persistent-mongoDB >= 2.1.2 && < 2.3+ , persistent-template >= 2.0 && < 2.3 , template-haskell , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2@@ -530,12 +530,12 @@ , yaml >= 0.8 && < 0.9 , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3- , warp >= 3.0 && < 3.1+ , warp >= 3.0 && < 3.2 , data-default- , aeson >= 0.6 && < 0.9+ , aeson >= 0.6 && < 0.10 , conduit >= 1.0 && < 2.0 , monad-logger >= 0.3 && < 0.4- , fast-logger >= 2.2 && < 2.4+ , fast-logger >= 2.2 && < 2.5 , wai-logger >= 2.2 && < 2.3 , file-embed , safe
hsfiles/mysql.hsfiles view
@@ -533,9 +533,9 @@ , classy-prelude-yesod >= 0.10.2 , bytestring >= 0.9 && < 0.11 , text >= 0.11 && < 2.0- , persistent >= 2.0 && < 2.2- , persistent-mysql >= 2.1.2 && < 2.2- , persistent-template >= 2.0 && < 2.2+ , persistent >= 2.0 && < 2.3+ , persistent-mysql >= 2.1.2 && < 2.3+ , persistent-template >= 2.0 && < 2.3 , template-haskell , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2@@ -544,12 +544,12 @@ , yaml >= 0.8 && < 0.9 , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3- , warp >= 3.0 && < 3.1+ , warp >= 3.0 && < 3.2 , data-default- , aeson >= 0.6 && < 0.9+ , aeson >= 0.6 && < 0.10 , conduit >= 1.0 && < 2.0 , monad-logger >= 0.3 && < 0.4- , fast-logger >= 2.2 && < 2.4+ , fast-logger >= 2.2 && < 2.5 , wai-logger >= 2.2 && < 2.3 , file-embed , safe
hsfiles/postgres-fay.hsfiles view
@@ -576,9 +576,9 @@ , classy-prelude-yesod >= 0.10.2 , bytestring >= 0.9 && < 0.11 , text >= 0.11 && < 2.0- , persistent >= 2.0 && < 2.2- , persistent-postgresql >= 2.1.1 && < 2.2- , persistent-template >= 2.0 && < 2.2+ , persistent >= 2.0 && < 2.3+ , persistent-postgresql >= 2.1.1 && < 2.3+ , persistent-template >= 2.0 && < 2.3 , template-haskell , shakespeare >= 2.0 && < 2.1 , monad-control >= 0.3 && < 1.1@@ -586,12 +586,12 @@ , yaml >= 0.8 && < 0.9 , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3- , warp >= 3.0 && < 3.1+ , warp >= 3.0 && < 3.2 , data-default- , aeson >= 0.6 && < 0.9+ , aeson >= 0.6 && < 0.10 , conduit >= 1.0 && < 2.0 , monad-logger >= 0.3 && < 0.4- , fast-logger >= 2.2 && < 2.4+ , fast-logger >= 2.2 && < 2.5 , wai-logger >= 2.2 && < 2.3 , file-embed , safe
hsfiles/postgres.hsfiles view
@@ -533,9 +533,9 @@ , classy-prelude-yesod >= 0.10.2 , bytestring >= 0.9 && < 0.11 , text >= 0.11 && < 2.0- , persistent >= 2.0 && < 2.2- , persistent-postgresql >= 2.1.1 && < 2.2- , persistent-template >= 2.0 && < 2.2+ , persistent >= 2.0 && < 2.3+ , persistent-postgresql >= 2.1.1 && < 2.3+ , persistent-template >= 2.0 && < 2.3 , template-haskell , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2@@ -544,12 +544,12 @@ , yaml >= 0.8 && < 0.9 , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3- , warp >= 3.0 && < 3.1+ , warp >= 3.0 && < 3.2 , data-default- , aeson >= 0.6 && < 0.9+ , aeson >= 0.6 && < 0.10 , conduit >= 1.0 && < 2.0 , monad-logger >= 0.3 && < 0.4- , fast-logger >= 2.2 && < 2.4+ , fast-logger >= 2.2 && < 2.5 , wai-logger >= 2.2 && < 2.3 , file-embed , safe
hsfiles/simple.hsfiles view
@@ -457,12 +457,12 @@ , yaml >= 0.8 && < 0.9 , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3- , warp >= 3.0 && < 3.1+ , warp >= 3.0 && < 3.2 , data-default- , aeson >= 0.6 && < 0.9+ , aeson >= 0.6 && < 0.10 , conduit >= 1.0 && < 2.0 , monad-logger >= 0.3 && < 0.4- , fast-logger >= 2.2 && < 2.4+ , fast-logger >= 2.2 && < 2.5 , wai-logger >= 2.2 && < 2.3 , file-embed , safe
hsfiles/sqlite.hsfiles view
@@ -533,9 +533,9 @@ , classy-prelude-yesod >= 0.10.2 , bytestring >= 0.9 && < 0.11 , text >= 0.11 && < 2.0- , persistent >= 2.0 && < 2.2- , persistent-sqlite >= 2.1.1 && < 2.2- , persistent-template >= 2.0 && < 2.2+ , persistent >= 2.0 && < 2.3+ , persistent-sqlite >= 2.1.1 && < 2.3+ , persistent-template >= 2.0 && < 2.3 , template-haskell , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2@@ -544,12 +544,12 @@ , yaml >= 0.8 && < 0.9 , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3- , warp >= 3.0 && < 3.1+ , warp >= 3.0 && < 3.2 , data-default- , aeson >= 0.6 && < 0.9+ , aeson >= 0.6 && < 0.10 , conduit >= 1.0 && < 2.0 , monad-logger >= 0.3 && < 0.4- , fast-logger >= 2.2 && < 2.4+ , fast-logger >= 2.2 && < 2.5 , wai-logger >= 2.2 && < 2.3 , file-embed , safe
main.hs view
@@ -70,6 +70,7 @@ | Keter { _keterNoRebuild :: Bool , _keterNoCopyTo :: Bool+ , _keterBuildArgs :: [String] } | Version deriving (Show, Eq)@@ -106,7 +107,7 @@ Configure -> cabal ["configure"] Build es -> touch' >> cabal ("build":es) Touch -> touch'- Keter{..} -> keter (cabalCommand o) _keterNoRebuild _keterNoCopyTo+ Keter{..} -> keter (cabalCommand o) _keterNoRebuild _keterNoCopyTo _keterBuildArgs Version -> putStrLn ("yesod-bin version: " ++ showVersion Paths_yesod_bin.version) AddHandler{..} -> addHandler addHandlerRoute addHandlerPattern addHandlerMethods Test -> cabalTest cabal@@ -189,6 +190,9 @@ keterOptions = Keter <$> switch ( long "nobuild" <> short 'n' <> help "Skip rebuilding" ) <*> switch ( long "nocopyto" <> help "Ignore copy-to directive in keter config file" )+ <*> optStrToList ( long "build-args" <> help "Build arguments" )+ where+ optStrToList m = option (words <$> str) $ value [] <> m defaultRescan :: Int defaultRescan = 10
yesod-bin.cabal view
@@ -1,5 +1,5 @@ name: yesod-bin-version: 1.4.13.2+version: 1.4.13.3 license: MIT license-file: LICENSE author: Michael Snoyman <michael@snoyman.com>