Commit 0ada7ce4 authored by kristenk's avatar kristenk
Browse files

Fix build with GHC 7.8.4.

parent 6dc05349
...@@ -30,11 +30,12 @@ module UnitTests.Distribution.Solver.Modular.DSL ( ...@@ -30,11 +30,12 @@ module UnitTests.Distribution.Solver.Modular.DSL (
, runProgress , runProgress
) where ) where
import Prelude ()
import Distribution.Client.Compat.Prelude
-- base -- base
import Data.Either (partitionEithers) import Data.Either (partitionEithers)
import Data.Maybe (catMaybes, isNothing) import Data.List (elemIndex)
import Data.List (elemIndex, isPrefixOf, nub)
import Data.Monoid
import Data.Ord (comparing) import Data.Ord (comparing)
import qualified Data.Map as Map import qualified Data.Map as Map
...@@ -392,7 +393,7 @@ exAvSrcPkg ex = ...@@ -392,7 +393,7 @@ exAvSrcPkg ex =
-- Convert a tree of BuildInfos into a tree of a specific component type. -- Convert a tree of BuildInfos into a tree of a specific component type.
-- 'defaultTopLevel' contains the default values for the component, and -- 'defaultTopLevel' contains the default values for the component, and
-- 'mkComponent' creates a component from a 'BuildInfo'. -- 'mkComponent' creates a component from a 'BuildInfo'.
mkCondTree :: forall a. Monoid a => mkCondTree :: forall a. Semigroup a =>
a -> (C.BuildInfo -> a) a -> (C.BuildInfo -> a)
-> DependencyTree C.BuildInfo -> DependencyTree C.BuildInfo
-> DependencyTree a -> DependencyTree a
......
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