67d531b · stackage · git.iko.soy

Stackage/BuildPlan.hs+1

compare with master

unifiedsplit

@@ -1,5 +1,6 @@

1{-# LANGUAGE FlexibleInstances #-}

2{-# LANGUAGE RecordWildCards #-}

3+{-# LANGUAGE TypeSynonymInstances #-}

3module Stackage.BuildPlan

4module Stackage.BuildPlan

4 ( readBuildPlan

5 ( readBuildPlan

5 , writeBuildPlan

6 , writeBuildPlan

Stackage/InstallInfo.hs+2−1

@@ -5,6 +5,7 @@ module Stackage.InstallInfo

5 ) where

6

7import Control.Monad (forM_, unless)

8+import Data.List (foldl')

8import qualified Data.Map as Map

9import qualified Data.Map as Map

9import qualified Data.Set as Set

10import qualified Data.Set as Set

10import Data.Version (showVersion)

11import Data.Version (showVersion)

@@ -23,7 +24,7 @@ dropExcluded :: SelectSettings

23 -> Map PackageName (VersionRange, Maintainer)

24 -> Map PackageName (VersionRange, Maintainer)

25 -> Map PackageName (VersionRange, Maintainer)

25dropExcluded bs m0 =

26dropExcluded bs m0 =

26− Set.foldl' (flip Map.delete) m0 (excludedPackages bs)

27+ foldl' (flip Map.delete) m0 (Set.toList $ excludedPackages bs)

27

28

28getInstallInfo :: SelectSettings -> IO InstallInfo

29getInstallInfo :: SelectSettings -> IO InstallInfo

29getInstallInfo settings = do

30getInstallInfo settings = do

Stackage/NarrowDatabase.hs+2−1

@@ -1,6 +1,7 @@

1module Stackage.NarrowDatabase where

2

3import Control.Monad.Trans.Writer

4+import Data.List (foldl')

4import qualified Data.Map as Map

5import qualified Data.Map as Map

5import qualified Data.Set as Set

6import qualified Data.Set as Set

6import Prelude hiding (pi)

7import Prelude hiding (pi)

@@ -46,7 +47,7 @@ narrowPackageDB settings core (PackageDB pdb) packageSet =

46 , msg

47 , msg

47 ]

48 ]

48 Right () -> return ()

49 Right () -> return ()

49− loop result' $ Set.foldl' (addDep users' result' maintainer) toProcess' $ Map.keysSet $ piDeps pi

50+ loop result' $ foldl' (addDep users' result' maintainer) toProcess' $ Map.keys $ piDeps pi

50 addDep users result maintainer toProcess p =

51 addDep users result maintainer toProcess p =

51 case Map.lookup p result of

52 case Map.lookup p result of

52 Nothing -> Set.insert (users, p, maintainer) toProcess

53 Nothing -> Set.insert (users, p, maintainer) toProcess

stackage.cabal+1−1

@@ -30,7 +30,7 @@ library

30 Stackage.GhcPkg

31 build-depends: base >= 4 && < 5

32 , containers

33− , Cabal

33+ , Cabal >= 1.14

34 , tar >= 0.3

35 , zlib

36 , bytestring