Try to fix Travis.

Author: 23Skidoo

cabal.project

@@ -4,13 +4,6 @@ constraints: unix >= 2.7.1.0
 -- Uncomment to allow picking up extra local unpacked deps:
 --optional-packages: */
 
--- Remove after hackage-repo-tool release
-allow-newer:
-  hackage-repo-tool:optparse-applicative
-
-allow-newer:
-  hackage-security:Cabal
-
 program-options
   -- So us hackers get all the assertion failures early:
   --

cabal.project.travis renamed to cabal.project.local.travis

@@ -7,8 +7,8 @@ jobs: 1
 -- build it reliably.  If we eventually get new-install
 -- in the bootstrap, this can go away.
 optional-packages: hackage-repo-tool-*/
--- hackage-repo-tool has upper bound on Cabal
-allow-newer: hackage-repo-tool:Cabal, hackage-repo-tool:time, hackage-repo-tool:directory
+-- hackage-repo-tool has upper bound on time
+allow-newer: hackage-repo-tool:time
 
 -- The -fno-warn-orphans is a hack to make Cabal-1.24
 -- build properly (unfortunately the flags here get applied

cabal.project.travis.libonly

@@ -1,13 +1,25 @@
--- Force error messages to be better
--- Parallel new-build error messages are non-existent.
--- Turn off parallelization to get good errors.
-jobs: 1
+-- A copy of cabal.project, but with a trimmed down 'packages'
+-- field. Needed for LIB_ONLY configurations that can't build cabal-install,
+-- only lib:Cabal.
 
--- Ignore cabal-install in the CABAL_LIB_ONLY configuration.
-packages: ./Cabal
+packages: Cabal/
+constraints: unix >= 2.7.1.0
 
--- The -fno-warn-orphans is a hack to make Cabal-1.24
--- build properly (unfortunately the flags here get applied
--- to the dependencies too!)
+-- Uncomment to allow picking up extra local unpacked deps:
+--optional-packages: */
+
+program-options
+  -- So us hackers get all the assertion failures early:
+  --
+  -- NOTE: currently commented out, see
+  -- https://github.com/haskell/cabal/issues/3911
+  --
+  -- ghc-options: -fno-ignore-asserts
+  --
+  -- as a workaround we specify it for each package individually:
 package Cabal
-  ghc-options: -Werror -fno-warn-orphans
+  ghc-options: -fno-ignore-asserts
+package cabal-testsuite
+  ghc-options: -fno-ignore-asserts
+package cabal-install
+  ghc-options: -fno-ignore-asserts

travis-script.sh

@@ -83,13 +83,12 @@ timed cabal update
 
 make cabal-install-monolithic
 if [ "x$CABAL_LIB_ONLY" = "xYES" ]; then
-    cp cabal.project.travis.libonly cabal.project.local
-else
-    cp cabal.project.travis cabal.project.local
+    cp cabal.project.travis.libonly cabal.project
 fi
+cp cabal.project.local.travis cabal.project.local
 
 # hackage-repo-tool is a bit touchy to install on GHC 8.0, so instead we
-# do it via new-build.  See also cabal.project.travis.  The downside of
+# do it via new-build.  See also cabal.project.local.travis.  The downside of
 # doing it this way is that the build product cannot be cached, but
 # hackage-repo-tool is a relatively small package so it's good.
 timed cabal unpack hackage-repo-tool-${HACKAGE_REPO_TOOL_VERSION}