From 7d530c2db08821906206f669e223f557d6adc245 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Tue, 16 Aug 2016 07:41:43 -0700 Subject: [PATCH] Build with operparse-applicative-0.13.0.0 fpco/stackage#1784 --- src/Options/Applicative/Complicated.hs | 6 +++--- stack.cabal | 4 ++-- stack.yaml | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Options/Applicative/Complicated.hs b/src/Options/Applicative/Complicated.hs index 3095547f54..03c9b281cf 100644 --- a/src/Options/Applicative/Complicated.hs +++ b/src/Options/Applicative/Complicated.hs @@ -141,9 +141,9 @@ complicatedParser commonParser commandParser = hsubparser' :: Mod CommandFields a -> Parser a hsubparser' m = mkParser d g rdr where - Mod _ d g = m `mappend` metavar "COMMAND|FILE" - (cmds, subs) = mkCommand m - rdr = CmdReader cmds (fmap add_helper . subs) + Mod _ d g = metavar "COMMAND|FILE" `mappend` m + (groupName, cmds, subs) = mkCommand m + rdr = CmdReader groupName cmds (fmap add_helper . subs) add_helper pinfo = pinfo { infoParser = infoParser pinfo <**> helpOption } diff --git a/stack.cabal b/stack.cabal index afafcb178c..c44755718d 100644 --- a/stack.cabal +++ b/stack.cabal @@ -199,7 +199,7 @@ library , monad-unlift < 0.3 , mtl >= 2.1.3.1 , open-browser >= 0.2.1 - , optparse-applicative >= 0.11 && < 0.13 + , optparse-applicative >= 0.13 && < 0.14 , path >= 0.5.8 , path-io >= 1.1.0 && < 2.0.0 , persistent >= 2.1.2 && < 2.7 @@ -271,7 +271,7 @@ executable stack , monad-control , monad-logger >= 0.3.13.1 , mtl >= 2.1.3.1 - , optparse-applicative >= 0.11.0.2 && < 0.13 + , optparse-applicative >= 0.13 && < 0.14 , path , path-io >= 1.1.0 && < 2.0.0 , stack diff --git a/stack.yaml b/stack.yaml index f4f35aecbe..259cb5fba4 100644 --- a/stack.yaml +++ b/stack.yaml @@ -22,6 +22,7 @@ extra-deps: - http-conduit-2.2.0 - path-0.5.8 - unicode-transforms-0.1.0.1 +- optparse-applicative-0.13.0.0 flags: stack: hide-dependency-versions: true