Skip to content

Commit

Permalink
Build with operparse-applicative-0.13.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
borsboom committed Aug 16, 2016
1 parent 66fb845 commit 7d530c2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/Options/Applicative/Complicated.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
4 changes: 2 additions & 2 deletions stack.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

1 comment on commit 7d530c2

@Blaisorblade
Copy link
Collaborator

@Blaisorblade Blaisorblade commented on 7d530c2 Aug 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updates for the other stack.yaml are missing:

https://travis-ci.org/commercialhaskell/stack/builds/152702093

Should be fixed in 03eca73—EDIT: stack does find feasible build plans.

Please sign in to comment.