support latest cmdargs, haskeline, split

hledger-lib/hledger-lib.cabal

@@ -57,7 +57,7 @@ library
   Build-Depends:
                   base >= 4.3 && < 5
                  ,bytestring
-                 ,cmdargs >= 0.9.1   && < 0.10
+                 ,cmdargs >= 0.10 && < 0.11
                  ,containers
                  ,csv
                  ,directory
@@ -69,7 +69,7 @@ library
                  ,regexpr >= 0.5.1
                  ,safe >= 0.2
                  ,shakespeare-text >= 1.0 && < 1.1
-                 ,split == 0.1.*
+                 ,split >= 0.1 && < 0.3
                  ,time
                  ,transformers >= 0.2 && < 0.4
                  ,utf8-string >= 0.3.5 && < 0.4

hledger-web/hledger-web.cabal

@@ -127,7 +127,7 @@ executable         hledger-web
                    , hledger-lib == 0.18.2
                    , base                          >= 4.3        && < 5
                    , cabal-file-th
-                   , cmdargs >= 0.9.1   && < 0.10
+                   , cmdargs >= 0.10 && < 0.11
                    , directory
                    , filepath
                    , HUnit

hledger/Hledger/Cli/Options.hs

@@ -40,6 +40,7 @@ defmode =   Mode {
  ,modeValue = []
  ,modeCheck = Right
  ,modeReform = const Nothing
+ ,modeExpandAt = True
  ,modeGroupFlags = toGroup []
  ,modeArgs = ([], Nothing)
  ,modeGroupModes = toGroup []
@@ -481,7 +482,11 @@ aliasesFromOpts = map parseAlias . alias_
             alias' = case alias of ('=':rest) -> rest
                                    _ -> orig
 
-showModeHelp = showText defaultWrap . helpText [] HelpFormatDefault
+showModeHelp :: Mode a -> String
+showModeHelp =
+  (showText defaultWrap :: [Text] -> String)
+  .
+  (helpText [] HelpFormatDefault :: Mode a -> [Text])
 
 tests_Hledger_Cli_Options = TestList
  [

hledger/hledger.cabal

@@ -66,10 +66,10 @@ library
                  ,base >= 4.3 && < 5
                  ,cabal-file-th
                  ,containers
-                 ,cmdargs >= 0.9.1   && < 0.10
+                 ,cmdargs >= 0.10 && < 0.11
                  ,directory
                  ,filepath
-                 ,haskeline == 0.6.*
+                 ,haskeline >= 0.6 && <= 0.8
                  ,HUnit
                  ,mtl
                  ,old-locale
@@ -79,7 +79,7 @@ library
                  ,regexpr >= 0.5.1
                  ,safe >= 0.2
                  ,shakespeare-text == 1.0.*
-                 ,split == 0.1.*
+                 ,split >= 0.1 && < 0.3
                  ,text == 0.11.*
                  ,time
                  ,utf8-string >= 0.3.5 && < 0.4
@@ -121,10 +121,10 @@ executable hledger
                  ,base >= 4.3 && < 5
                  ,cabal-file-th
                  ,containers
-                 ,cmdargs >= 0.9.1   && < 0.10
+                 ,cmdargs >= 0.10 && < 0.11
                  ,directory
                  ,filepath
-                 ,haskeline == 0.6.*
+                 ,haskeline >= 0.6 && <= 0.8
                  ,HUnit
                  ,mtl
                  ,old-locale
@@ -134,7 +134,7 @@ executable hledger
                  ,regexpr >= 0.5.1
                  ,safe >= 0.2
                  ,shakespeare-text == 1.0.*
-                 ,split == 0.1.*
+                 ,split >= 0.1 && < 0.3
                  ,text == 0.11.*
                  ,time
                  ,utf8-string >= 0.3.5 && < 0.4