Commit 8fbacca0 authored by Ben Gamari's avatar Ben Gamari 🐢
Browse files

Bump upper bound on containers to <0.7

parent 2e8a45f4
......@@ -173,7 +173,7 @@ library
array >= 0.4 && < 0.6,
base >= 4.5 && < 5,
bytestring >= 0.9.2.1 && < 0.11,
containers >= 0.4.2.1 && < 0.6,
containers >= 0.4.2.1 && < 0.7,
deepseq >= 1.3 && < 1.5,
filepath >= 1.3 && < 1.5,
pretty >= 1.1.1 && < 1.2,
......
......@@ -8,7 +8,12 @@
#endif
module Distribution.Compat.Map.Lazy
( module X ) where
( module X
#ifdef HAVE_containers_050
#else
, fromSet
#endif
) where
#ifdef HAVE_containers_050
import Data.Map.Lazy as X
......
......@@ -63,7 +63,8 @@ import Distribution.Types.CondTree
import Distribution.Types.Condition
import Distribution.Types.DependencyMap
import qualified Data.Map as Map
import qualified Distribution.Compat.Map.Strict as Map.Strict
import qualified Distribution.Compat.Map.Lazy as Map
import Data.Tree ( Tree(Node) )
------------------------------------------------------------------------------
......@@ -226,7 +227,7 @@ resolveWithFlags dom enabled os arch impl constrs trees checkDeps =
mp m@(Right _) _ = m
mp _ m@(Right _) = m
mp (Left xs) (Left ys) =
let union = Map.foldrWithKey (Map.insertWith' combine)
let union = Map.foldrWithKey (Map.Strict.insertWith combine)
(unDepMapUnion xs) (unDepMapUnion ys)
combine x y = simplifyVersionRange $ unionVersionRanges x y
in union `seq` Left (DepMapUnion union)
......
......@@ -298,7 +298,7 @@ library
binary >= 0.7 && < 0.9,
bytestring >= 0.10.2 && < 1,
Cabal >= 2.3 && < 2.4,
containers >= 0.4 && < 0.6,
containers >= 0.4 && < 0.7,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.3 && < 1.5,
directory >= 1.2.2.0 && < 1.4,
......@@ -376,7 +376,7 @@ executable cabal
binary >= 0.7 && < 0.9,
bytestring >= 0.10.2 && < 1,
Cabal >= 2.3 && < 2.4,
containers >= 0.4 && < 0.6,
containers >= 0.4 && < 0.7,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.3 && < 1.5,
directory >= 1.2.2.0 && < 1.4,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment