Skip to content
Snippets Groups Projects
Commit b27aa253 authored by Oleg Grenrus's avatar Oleg Grenrus
Browse files

Update outdated

parent c97bd1a9
No related branches found
No related tags found
No related merge requests found
{-# LANGUAGE CPP #-}
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- | -- |
-- Module : Distribution.Client.Outdated -- Module : Distribution.Client.Outdated
...@@ -28,8 +29,6 @@ import Distribution.Client.Sandbox.PackageEnvironment ...@@ -28,8 +29,6 @@ import Distribution.Client.Sandbox.PackageEnvironment
import Distribution.Package (PackageName, packageVersion) import Distribution.Package (PackageName, packageVersion)
import Distribution.PackageDescription (buildDepends) import Distribution.PackageDescription (buildDepends)
import Distribution.PackageDescription.Configuration (finalizePD) import Distribution.PackageDescription.Configuration (finalizePD)
import Distribution.PackageDescription.Parse
(readPackageDescription)
import Distribution.Simple.Compiler (Compiler, compilerInfo) import Distribution.Simple.Compiler (Compiler, compilerInfo)
import Distribution.Simple.Setup (fromFlagOrDefault) import Distribution.Simple.Setup (fromFlagOrDefault)
import Distribution.Simple.Utils import Distribution.Simple.Utils
...@@ -43,6 +42,13 @@ import Distribution.Verbosity (Verbosity, silent) ...@@ -43,6 +42,13 @@ import Distribution.Verbosity (Verbosity, silent)
import Distribution.Version import Distribution.Version
(Version, LowerBound(..), UpperBound(..) (Version, LowerBound(..), UpperBound(..)
,asVersionIntervals, majorBoundVersion) ,asVersionIntervals, majorBoundVersion)
#ifdef CABAL_PARSEC
import Distribution.PackageDescription.Parsec
(readGenericPackageDescription)
#else
import Distribution.PackageDescription.Parse
(readGenericPackageDescription)
#endif
import qualified Data.Set as S import qualified Data.Set as S
import System.Directory (getCurrentDirectory) import System.Directory (getCurrentDirectory)
...@@ -134,7 +140,7 @@ depsFromPkgDesc :: Verbosity -> Compiler -> Platform -> IO [Dependency] ...@@ -134,7 +140,7 @@ depsFromPkgDesc :: Verbosity -> Compiler -> Platform -> IO [Dependency]
depsFromPkgDesc verbosity comp platform = do depsFromPkgDesc verbosity comp platform = do
cwd <- getCurrentDirectory cwd <- getCurrentDirectory
path <- tryFindPackageDesc cwd path <- tryFindPackageDesc cwd
gpd <- readPackageDescription verbosity path gpd <- readGenericPackageDescription verbosity path
let cinfo = compilerInfo comp let cinfo = compilerInfo comp
epd = finalizePD [] (ComponentRequestedSpec True True) epd = finalizePD [] (ComponentRequestedSpec True True)
(const True) platform cinfo [] gpd (const True) platform cinfo [] gpd
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment