Require Cabal 1.24

snoyberg · snoyberg · commit 201be99ea6f8 · 2017-01-02T15:42:33.000+02:00
diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
@@ -758,11 +758,7 @@ buildOtherSources build =
 
 -- | Get the target's JS sources.
 targetJsSources :: BuildInfo -> [FilePath]
-#if MIN_VERSION_Cabal(1, 22, 0)
 targetJsSources = jsSources
-#else
-targetJsSources = const []
-#endif
 
 -- | Get all dependencies of a package, including library,
 -- executables, tests, benchmarks.
@@ -868,11 +864,7 @@ resolveConditions rc addDeps (CondNode lib deps cs) = basic <> children
                       case (flavor, rcCompilerVersion rc) of
                         (GHC, GhcVersion vghc) -> vghc `withinRange` range
                         (GHC, GhcjsVersion _ vghc) -> vghc `withinRange` range
-#if MIN_VERSION_Cabal(1, 22, 0)
                         (GHCJS, GhcjsVersion vghcjs _) ->
-#else
-                        (OtherCompiler "ghcjs", GhcjsVersion vghcjs _) ->
-#endif
                           vghcjs `withinRange` range
                         _ -> False
 
diff --git a/stack-7.8.yaml b/stack-7.8.yaml
@@ -29,7 +29,7 @@ extra-deps:
 # For deepseq-1.4
 - deepseq-1.4.1.2
 - bytestring-0.10.6.0
-- Cabal-1.18.1.6
+- Cabal-1.24.2.0
 - containers-0.5.6.3
 - hpc-0.6.0.2
 - process-1.2.1.0
diff --git a/stack.cabal b/stack.cabal
@@ -176,7 +176,7 @@ library
                      System.Process.PagerEditor
                      System.Process.Read
                      System.Process.Run
-  build-depends:     Cabal >= 1.18.1.5 && < 1.25
+  build-depends:     Cabal >= 1.24 && < 1.25
                    , aeson (>= 1.0 && < 1.1)
                    , ansi-terminal >= 0.6.2.3
                    , async >= 2.0.2 && < 2.2
diff --git a/stack.yaml b/stack.yaml
@@ -12,6 +12,7 @@ nix:
   packages:
     - zlib
 extra-deps:
+- Cabal-1.24.2.0
 - th-utilities-0.2.0.1
 - store-0.3
 - store-core-0.3
