diff --git a/patches/critbit-0.2.0.0.patch b/patches/critbit-0.2.0.0.patch index c454e9055dbe97aca61416ac22d48a1b15a314fc..a0bb60abd7a0df7f6b9c4edd3c98f4c55ab21f82 100644 --- a/patches/critbit-0.2.0.0.patch +++ b/patches/critbit-0.2.0.0.patch @@ -1,16 +1,17 @@ diff --git a/Data/CritBit/Set.hs b/Data/CritBit/Set.hs -index 0039925..4a4ffc4 100644 +index 0039925..0bfc74d 100644 --- a/Data/CritBit/Set.hs +++ b/Data/CritBit/Set.hs -@@ -90,6 +90,7 @@ import Data.CritBit.Types.Internal (CritBit(..), Set(..), CritBitKey, Node(..)) +@@ -90,16 +90,20 @@ import Data.CritBit.Types.Internal (CritBit(..), Set(..), CritBitKey, Node(..)) import Data.Foldable (Foldable, foldMap) import Data.Maybe (isJust) import Data.Monoid (Monoid(..)) +-import Prelude hiding (null, filter, map, foldl, foldr) +import Data.Semigroup (Semigroup(..)) - import Prelude hiding (null, filter, map, foldl, foldr) ++import Prelude hiding (null, filter, map, foldl, foldr, foldl') import qualified Data.CritBit.Tree as T import qualified Data.List as List -@@ -97,9 +98,12 @@ import qualified Data.List as List + instance (Show a) => Show (Set a) where show s = "fromList " ++ show (toList s) @@ -25,7 +26,7 @@ index 0039925..4a4ffc4 100644 instance Foldable Set where diff --git a/Data/CritBit/Tree.hs b/Data/CritBit/Tree.hs -index e50738b..5eb95fa 100644 +index e50738b..7c1b205 100644 --- a/Data/CritBit/Tree.hs +++ b/Data/CritBit/Tree.hs @@ -153,15 +153,19 @@ import Data.CritBit.Core @@ -34,7 +35,8 @@ index e50738b..5eb95fa 100644 import Data.Monoid (Monoid(..)) +import Data.Semigroup (Semigroup(..)) import Data.Traversable (Traversable(traverse)) - import Prelude hiding (foldl, foldr, lookup, null, map, filter) +-import Prelude hiding (foldl, foldr, lookup, null, map, filter) ++import Prelude hiding (foldl, foldr, lookup, null, map, filter, foldl') import qualified Data.Array as A import qualified Data.Foldable as Foldable import qualified Data.List as List