From 88cccc742d3b48b2f553407e2fff4961c492324e Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 20 May 2013 12:58:27 +0300
Subject: [PATCH] Add max-backjumps and reorder-goals

---
 Stackage/Build.hs     | 2 ++
 Stackage/CheckPlan.hs | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Stackage/Build.hs b/Stackage/Build.hs
index 40caa75e..1f29696a 100644
--- a/Stackage/Build.hs
+++ b/Stackage/Build.hs
@@ -73,6 +73,8 @@ build settings' bp = do
                  $ "install"
                  : ("--cabal-lib-version=" ++ libVersion)
                  : "--build-log=logs/$pkg.log"
+                 : "--max-backjumps=-1"
+                 : "--reorder-goals"
                  : "-j"
                  : concat
                     [ bpPackageList bp
diff --git a/Stackage/CheckPlan.hs b/Stackage/CheckPlan.hs
index 4edb520c..c1767625 100644
--- a/Stackage/CheckPlan.hs
+++ b/Stackage/CheckPlan.hs
@@ -22,7 +22,14 @@ checkPlan bp = do
     _ <- checkCabalVersion
 
     putStrLn "Checking build plan"
-    (ec, dryRun', stderr) <- readProcessWithExitCode "cabal" (addCabalArgsOnlyGlobal $ "install":"--dry-run":bpPackageList bp) ""
+    (ec, dryRun', stderr) <- readProcessWithExitCode "cabal"
+        ( addCabalArgsOnlyGlobal
+        $ "install"
+        : "--dry-run"
+        : "--max-backjumps=-1"
+        : "--reorder-goals"
+        : bpPackageList bp
+        ) ""
     when (ec /= ExitSuccess || "Warning:" `isPrefixOf` stderr) $ do
         putStr stderr
         putStr dryRun'