From 07c1baefc4f3d594c831b3b80ae943086ac2cbd6 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sat, 30 Aug 2014 19:16:49 -0700
Subject: [PATCH 1/5] use -j for cabal install

---
 yesod-bin/input/done.cg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-bin/input/done.cg b/yesod-bin/input/done.cg
index 23261c5b..ff4a237e 100644
--- a/yesod-bin/input/done.cg
+++ b/yesod-bin/input/done.cg
@@ -24,4 +24,4 @@ Take part in the community: http://yesodweb.com/page/community
 
 Start your project:
 
-   cd PROJECTNAME && cabal sandbox init && cabal install --enable-tests . yesod-platform yesod-bin --max-backjumps=-1 --reorder-goals && yesod devel
+   cd PROJECTNAME && cabal sandbox init && cabal install -j --enable-tests . yesod-platform yesod-bin --max-backjumps=-1 --reorder-goals && yesod devel

From 2187c0cf8deba62b778e29d82888699e00b12208 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 1 Sep 2014 07:18:42 +0300
Subject: [PATCH 2/5] Add required to textareaField (fixes #817)

---
 yesod-form/Yesod/Form/Fields.hs | 4 ++--
 yesod-form/yesod-form.cabal     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index 00f748b4..c6091a99 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -166,9 +166,9 @@ $newline never
 htmlField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m Html
 htmlField = Field
     { fieldParse = parseHelper $ Right . preEscapedText . sanitizeBalance
-    , fieldView = \theId name attrs val _isReq -> toWidget [hamlet|
+    , fieldView = \theId name attrs val isReq -> toWidget [hamlet|
 $newline never
-<textarea id="#{theId}" name="#{name}" *{attrs}>#{showVal val}
+<textarea :isReq:required="" id="#{theId}" name="#{name}" *{attrs}>#{showVal val}
 |]
     , fieldEnctype = UrlEncoded
     }
diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal
index 3175d49f..bfe94dfd 100644
--- a/yesod-form/yesod-form.cabal
+++ b/yesod-form/yesod-form.cabal
@@ -1,5 +1,5 @@
 name:            yesod-form
-version:         1.3.15.3
+version:         1.3.15.4
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>

From 525a73a100882b8dade0e93a3ef95d81550cf51b Mon Sep 17 00:00:00 2001
From: Hugo Daniel <mr.hugo.gomes@gmail.com>
Date: Mon, 1 Sep 2014 18:12:20 +0100
Subject: [PATCH 3/5] Update yesod-bin.cabal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes the error:

[10 of 10] Compiling Main             ( main.hs, dist/build/yesod/yesod-tmp/Main.o )

main.hs:192:35:
    Not in scope: ‘reader’
    Perhaps you meant one of these:
      ‘header’ (imported from Options.Applicative),
      ‘readIO’ (imported from Prelude), ‘readLn’ (imported from Prelude)
cabal: Error: some packages failed to install:
yesod-bin-1.2.12.5 failed during the building phase. The exception was:
ExitFailure 1
---
 yesod-bin/yesod-bin.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal
index 5b367d7f..b6d836eb 100644
--- a/yesod-bin/yesod-bin.cabal
+++ b/yesod-bin/yesod-bin.cabal
@@ -74,7 +74,7 @@ executable             yesod
                      , system-fileio      >= 0.3          && < 0.4
                      , unordered-containers
                      , yaml               >= 0.8          && < 0.9
-                     , optparse-applicative >= 0.5
+                     , optparse-applicative >= 0.5        && <= 0.9.1.1
                      , fsnotify           >= 0.0          && < 0.2
                      , split              >= 0.2          && < 0.3
                      , file-embed

From ec91c8b59b9e6be94ec2f65e93ece26100a21f45 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Mon, 1 Sep 2014 20:19:25 -0700
Subject: [PATCH 4/5] version bump

---
 yesod-bin/yesod-bin.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal
index b6d836eb..7ddca9ba 100644
--- a/yesod-bin/yesod-bin.cabal
+++ b/yesod-bin/yesod-bin.cabal
@@ -1,5 +1,5 @@
 name:            yesod-bin
-version:         1.2.12.5
+version:         1.2.12.6
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>

From 67438d191d964680e9265c90df65e63dccf09dd1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 3 Sep 2014 08:20:10 +0300
Subject: [PATCH 5/5] optparse-applicative 0.10

---
 yesod-bin/main.hs         | 16 +++++++++++++---
 yesod-bin/yesod-bin.cabal |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/yesod-bin/main.hs b/yesod-bin/main.hs
index ef1882d0..deece976 100755
--- a/yesod-bin/main.hs
+++ b/yesod-bin/main.hs
@@ -155,6 +155,12 @@ keterOptions = Keter <$> switch ( long "nobuild" <> short 'n' <> help "Skip rebu
 defaultRescan :: Int
 defaultRescan = 10
 
+#if MIN_VERSION_optparse_applicative(0,10,0)
+option' = option auto
+#else
+option' = option
+#endif
+
 develOptions :: Parser Command
 develOptions = Devel <$> switch ( long "disable-api"  <> short 'd'
                             <> help "Disable fast GHC API rebuilding")
@@ -162,7 +168,7 @@ develOptions = Devel <$> switch ( long "disable-api"  <> short 'd'
                             <> help "Run COMMAND after rebuild succeeds")
                      <*> optStr ( long "failure-hook" <> short 'f' <> metavar "COMMAND"
                             <> help "Run COMMAND when rebuild fails")
-                     <*> option ( long "event-timeout" <> short 't' <> value defaultRescan <> metavar "N"
+                     <*> option' ( long "event-timeout" <> short 't' <> value defaultRescan <> metavar "N"
                             <> help ("Force rescan of files every N seconds (default "
                                      ++ show defaultRescan
                                      ++ ", use -1 to rely on FSNotify alone)") )
@@ -172,9 +178,9 @@ develOptions = Devel <$> switch ( long "disable-api"  <> short 'd'
                                    <> help "ignore file changes in DIR" )
                               )
                      <*> extraCabalArgs
-                     <*> option ( long "port" <> short 'p' <> value 3000 <> metavar "N"
+                     <*> option' ( long "port" <> short 'p' <> value 3000 <> metavar "N"
                             <> help "Devel server listening port" )
-                     <*> option ( long "proxy-timeout" <> short 'x' <> value 0 <> metavar "N"
+                     <*> option' ( long "proxy-timeout" <> short 'x' <> value 0 <> metavar "N"
                             <> help "Devel server timeout before returning 'not ready' message (in seconds, 0 for none)" )
                      <*> switch ( long "disable-reverse-proxy" <> short 'n'
                             <> help "Disable reverse proxy" )
@@ -189,7 +195,11 @@ extraCabalArgs = many (strOption ( long "extra-cabal-arg" <> short 'e' <> metava
 -- | Optional @String@ argument
 optStr :: Mod OptionFields (Maybe String) -> Parser (Maybe String)
 optStr m =
+#if MIN_VERSION_optparse_applicative(0,10,0)
+    nullOption (success . str) $ value Nothing <> m
+#else
     nullOption $ value Nothing <> reader (success . str)  <> m
+#endif
   where
 #if MIN_VERSION_optparse_applicative(0,6,0)
     success = ReadM . Right
diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal
index 7ddca9ba..07c41e11 100644
--- a/yesod-bin/yesod-bin.cabal
+++ b/yesod-bin/yesod-bin.cabal
@@ -1,5 +1,5 @@
 name:            yesod-bin
-version:         1.2.12.6
+version:         1.2.12.7
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -74,7 +74,7 @@ executable             yesod
                      , system-fileio      >= 0.3          && < 0.4
                      , unordered-containers
                      , yaml               >= 0.8          && < 0.9
-                     , optparse-applicative >= 0.5        && <= 0.9.1.1
+                     , optparse-applicative >= 0.5
                      , fsnotify           >= 0.0          && < 0.2
                      , split              >= 0.2          && < 0.3
                      , file-embed