Merge pull request #6402 from phadej/regex-tdfa-1.3.1.0

regex-tdfa-1.3.1.0

Cabal/Distribution/Simple/Program/Db.hs

@@ -426,7 +426,7 @@ requireProgram verbosity prog progdb = do
 -- It returns 'Nothing' if the program couldn't be configured,
 -- or is not found.
 --
--- @since 3.2.0.0
+-- @since 3.0.1.0
 needProgram :: Verbosity -> Program -> ProgramDb
             -> IO (Maybe (ConfiguredProgram, ProgramDb))
 needProgram verbosity prog progdb = do

cabal-testsuite/cabal-testsuite.cabal

@@ -65,7 +65,7 @@ library
     , optparse-applicative  ^>= 0.14.3.0 || ^>=0.15.1.0
     , process               ^>= 1.1.0.2 || ^>= 1.2.0.0 || ^>= 1.4.2.0 || ^>= 1.6.1.0
     , regex-compat-tdfa     ^>= 0.95.1.4
-    , regex-tdfa            ^>= 1.2.3.1 || ^>=1.3.0
+    , regex-tdfa            ^>= 1.2.3.1 || ^>=1.3.1.0
     , temporary             ^>= 1.3
     , text                  ^>= 1.2.3.1
     , transformers          ^>= 0.3.0.0 || ^>= 0.4.2.0 || ^>= 0.5.2.0

travis/binaries/.travis.yml

 language: c
-dist: trusty
+dist: xenial
 # This doesn't actually help because we always push a single
 # commit to the branch in question
 #git: