git.iko.soy/Idris-dev
on master help sign in
Merge pull request #3504 from enolan/optparse-fix-build
ba82f90Niklas Larsson
idris.cabal+1−1
compare with master
unifiedsplit
@@ -362,7 +362,7 @@ Test-suite regression-and-feature-tests
362 , filepath
362 , filepath
363 , directory
363 , directory
364 , haskeline >= 0.7
364 , haskeline >= 0.7
365− , optparse-applicative >= 0.11 && < 0.13
365+ , optparse-applicative >= 0.11 && < 0.14
366 , tagged
366 , tagged
367 , tasty >= 0.8
367 , tasty >= 0.8
368 , tasty-golden >= 2.0
368 , tasty-golden >= 2.0
src/Idris/CmdOptions.hs+4
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
1{-|
2{-|
2Module : Idris.CmdOptions
3Module : Idris.CmdOptions
3Description : A parser for the CmdOptions for the Idris executable.
4Description : A parser for the CmdOptions for the Idris executable.
@@ -26,6 +27,9 @@ import Control.Monad.Trans.Except (throwE)
26import Control.Monad.Trans.Reader (ask)
27import Control.Monad.Trans.Reader (ask)
27import Data.Char
28import Data.Char
28import Data.Maybe
29import Data.Maybe
30+#if MIN_VERSION_optparse_applicative(0,13,0)
31+import Data.Monoid ((<>))
32+#endif
29import Options.Applicative
33import Options.Applicative
30import Options.Applicative.Arrows
34import Options.Applicative.Arrows
31import Options.Applicative.Types (ReadM(..))
35import Options.Applicative.Types (ReadM(..))
test/TestRun.hs+4
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
1module Main where
2module Main where
2
3
3import TestData
4import TestData
@@ -6,6 +7,9 @@ import Control.Monad
6import Data.Char (isLetter)
7import Data.Char (isLetter)
7import qualified Data.IntMap as IMap
8import qualified Data.IntMap as IMap
8import Data.List
9import Data.List
10+#if MIN_VERSION_optparse_applicative(0,13,0)
11+import Data.Monoid ((<>))
12+#endif
9import Data.Proxy
13import Data.Proxy
10import Data.Typeable
14import Data.Typeable
11import Options.Applicative
15import Options.Applicative