This is a compatibility fix for base-4.8. We have defined our own isSubsequenceOf method, and hence have to hide the library version.
Signed-off-by: Bhimanavajjula Aditya <[email protected]> --- src/Ganeti/Utils.hs | 6 +++++- test/hs/Test/Ganeti/Utils.hs | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Ganeti/Utils.hs b/src/Ganeti/Utils.hs index 8b78f73..4cb6f57 100644 --- a/src/Ganeti/Utils.hs +++ b/src/Ganeti/Utils.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE FlexibleContexts, ScopedTypeVariables #-} +{-# LANGUAGE FlexibleContexts, ScopedTypeVariables, CPP #-} {-| Utility functions. -} @@ -112,7 +112,11 @@ import Data.Char (toUpper, isAlphaNum, isDigit, isSpace) import qualified Data.Either as E import Data.Function (on) import Data.IORef +#if MIN_VERSION_base(4,8,0) +import Data.List hiding (isSubsequenceOf) +#else import Data.List +#endif import qualified Data.Map as M import Data.Maybe (fromMaybe) import qualified Data.Set as S diff --git a/test/hs/Test/Ganeti/Utils.hs b/test/hs/Test/Ganeti/Utils.hs index af1c5b6..bee30e2 100644 --- a/test/hs/Test/Ganeti/Utils.hs +++ b/test/hs/Test/Ganeti/Utils.hs @@ -43,7 +43,11 @@ import Test.HUnit import Control.Applicative ((<$>), (<*>)) import Data.Char (isSpace) import qualified Data.Either as Either +#if MIN_VERSION_base(4,8,0) +import Data.List hiding (isSubsequenceOf) +#else import Data.List +#endif import Data.Maybe (listToMaybe) import qualified Data.Set as S import System.Time -- 1.7.10.4
