hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update 5.6.0.0 to work with latest optparse-applicative

Browse Source 
And ghc-8.0.2
This commit is contained in:
Alan Zimmerman 2017-01-12 20:31:07 +02:00
parent cbe07e8c85
commit 93138a50bb
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ghc-mod.cabal
View File

@ -1,5 +1,5 @@
Name: ghc-mod Name: ghc-mod
Version: 5.6.0.0 Version: 5.7.0.0
Author: Kazu Yamamoto <kazu@iij.ad.jp>, Author: Kazu Yamamoto <kazu@iij.ad.jp>,
Daniel Gröber <dxld@darkboxed.org>, Daniel Gröber <dxld@darkboxed.org>,
Alejandro Serrano <trupill@gmail.com>, Alejandro Serrano <trupill@gmail.com>,
@ -177,7 +177,7 @@ Library
, containers < 0.6 , containers < 0.6
, cabal-helper < 0.8 && >= 0.7.1.0 , cabal-helper < 0.8 && >= 0.7.1.0
, deepseq < 1.5 , deepseq < 1.5
, directory < 1.3 , directory < 1.4
, filepath < 1.5 , filepath < 1.5
, ghc < 8.2 && >= 7.6 , ghc < 8.2 && >= 7.6
, ghc-paths < 0.2 , ghc-paths < 0.2
@ -202,7 +202,7 @@ Library
, extra == 1.4.* , extra == 1.4.*
, pipes == 4.1.* , pipes == 4.1.*
, safe < 0.4 && >= 0.3.9 , safe < 0.4 && >= 0.3.9
, optparse-applicative >=0.11.0 && <0.13.0 , optparse-applicative >=0.13.0 && <0.14.0
, template-haskell , template-haskell
, syb , syb
if impl(ghc < 7.8) if impl(ghc < 7.8)
@ -222,7 +222,7 @@ Executable ghc-mod
Default-Extensions: ConstraintKinds, FlexibleContexts Default-Extensions: ConstraintKinds, FlexibleContexts
HS-Source-Dirs: src HS-Source-Dirs: src
Build-Depends: base < 5 && >= 4.0 Build-Depends: base < 5 && >= 4.0
, directory < 1.3 , directory < 1.4
, filepath < 1.5 , filepath < 1.5
, pretty < 1.2 , pretty < 1.2
, process < 1.5 , process < 1.5
@ -231,7 +231,8 @@ Executable ghc-mod
, ghc < 8.1 , ghc < 8.1
, monad-control ==1.0.* , monad-control ==1.0.*
, fclabels ==2.0.* , fclabels ==2.0.*
, optparse-applicative >=0.11.0 && <0.13.0 , optparse-applicative >=0.13.0 && <0.14.0
, semigroups < 0.19 && >= 0.10.0
, ghc-mod , ghc-mod
Executable ghc-modi Executable ghc-modi
@ -247,7 +248,7 @@ Executable ghc-modi
Build-Depends: base < 5 && >= 4.0 Build-Depends: base < 5 && >= 4.0
, binary < 0.9 && >= 0.5.1.0 , binary < 0.9 && >= 0.5.1.0
, deepseq < 1.5 , deepseq < 1.5
, directory < 1.3 , directory < 1.4
, filepath < 1.5 , filepath < 1.5
, process < 1.5 , process < 1.5
, old-time < 1.2 , old-time < 1.2

5
src/GHCMod/Options/Commands.hs
View File

@ -18,6 +18,7 @@
module GHCMod.Options.Commands where module GHCMod.Options.Commands where
import Data.Semigroup
import Options.Applicative import Options.Applicative
import Options.Applicative.Types import Options.Applicative.Types
import Options.Applicative.Builder.Internal import Options.Applicative.Builder.Internal
@ -289,8 +290,8 @@ hsubparser' :: Mod CommandFields a -> Parser a
hsubparser' m = mkParser d g rdr hsubparser' m = mkParser d g rdr
where where
Mod _ d g = m `mappend` metavar "" Mod _ d g = m `mappend` metavar ""
(cmds, subs) = mkCommand m (ms,cmds, subs) = mkCommand m
rdr = CmdReader cmds (fmap add_helper . subs) rdr = CmdReader ms cmds (fmap add_helper . subs)
add_helper pinfo = pinfo add_helper pinfo = pinfo
{ infoParser = infoParser pinfo <**> helper } { infoParser = infoParser pinfo <**> helper }