git.iko.soy/Idris-dev
on master help sign in
Merge pull request #3504 from enolan/optparse-fix-build

Fix building with optparse-applicative-0.13.0

commitba82f9033ab5b34d67d70ed1ace111d61dd82a0e authorNiklas Larsson <metaniklas@gmail.com> dateSun 30 Oct 2016, 10:27 (10 years ago) parentf0d0ff54b21a57
3 files changed+9−1
compare with master
unifiedsplit
idris.cabal+1−1 src/Idris/CmdOptions.hs+4 test/TestRun.hs+4
idris.cabal+1−1
@@ -362,7 +362,7 @@ Test-suite regression-and-feature-tests
362362 , filepath
363363 , directory
364364 , haskeline >= 0.7
365− , optparse-applicative >= 0.11 && < 0.13
365+ , optparse-applicative >= 0.11 && < 0.14
366366 , tagged
367367 , tasty >= 0.8
368368 , tasty-golden >= 2.0
src/Idris/CmdOptions.hs+4
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-|
23Module : Idris.CmdOptions
34Description : A parser for the CmdOptions for the Idris executable.
@@ -26,6 +27,9 @@ import Control.Monad.Trans.Except (throwE)
2627import Control.Monad.Trans.Reader (ask)
2728import Data.Char
2829import Data.Maybe
30+#if MIN_VERSION_optparse_applicative(0,13,0)
31+import Data.Monoid ((<>))
32+#endif
2933import Options.Applicative
3034import Options.Applicative.Arrows
3135import Options.Applicative.Types (ReadM(..))
test/TestRun.hs+4
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12module Main where
23
34import TestData
@@ -6,6 +7,9 @@ import Control.Monad
67import Data.Char (isLetter)
78import qualified Data.IntMap as IMap
89import Data.List
10+#if MIN_VERSION_optparse_applicative(0,13,0)
11+import Data.Monoid ((<>))
12+#endif
913import Data.Proxy
1014import Data.Typeable
1115import Options.Applicative