Merge pull request #5886 from hvr/pr/backjumps-4k

Increase `max-backjumps` default from 2000 to 4000
haskell · Feb 13, 2019 · 1283809 · 1283809
2 parents 57f38b9 + 085df06
commit 1283809
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Cabal/doc/nix-local-build.rst b/Cabal/doc/nix-local-build.rst
@@ -2050,13 +2050,13 @@ Most users generally won't need these.
                --max-backjumps=N
     :synopsis: Maximum number of solver backjumps.
 
-    :default: 2000
+    :default: 4000
 
     Maximum number of backjumps (backtracking multiple steps) allowed
     while solving. Set -1 to allow unlimited backtracking, and 0 to
     disable backtracking completely.
 
-    The command line variant of this field is ``--max-backjumps=2000``.
+    The command line variant of this field is ``--max-backjumps=4000``.
 
 .. cfg-field:: reorder-goals: boolean
                --reorder-goals

diff --git a/cabal-install/Distribution/Client/Setup.hs b/cabal-install/Distribution/Client/Setup.hs
@@ -1781,7 +1781,7 @@ defaultInstallFlags = InstallFlags {
                                    </> "$arch-$os-$compiler" </> "index.html")
 
 defaultMaxBackjumps :: Int
-defaultMaxBackjumps = 2000
+defaultMaxBackjumps = 4000
 
 defaultSolver :: PreSolver
 defaultSolver = AlwaysModular

diff --git a/cabal-install/changelog b/cabal-install/changelog
@@ -19,6 +19,7 @@
 	* Init improvements: add flag '--application-dir', and when creating
 	  a library also create a MyLib.hs module. (#5740)
 	* Add support for generating test-suite via cabal init. (#5761)
+	* Increase `max-backjumps` default from 2000 to 4000.
 
 2.4.1.0 Mikhail Glushenkov <[email protected]> November 2018
 	* Add message to alert user to potential package casing errors. (#5635)