Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
erikd committed Nov 21, 2023
1 parent ab40b34 commit 8302c75
Showing 1 changed file with 8 additions and 16 deletions.
24 changes: 8 additions & 16 deletions cabal-install/src/Distribution/Client/CmdOutdated.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ module Distribution.Client.CmdOutdated
import qualified Data.Set as Set

import Distribution.Client.Compat.Prelude
import Distribution.Client.Config
( SavedConfig
( savedGlobalFlags
)
)
import Distribution.Client.Errors (CabalInstallException (OutdatedAction))
import qualified Distribution.Client.IndexUtils as IndexUtils
import Distribution.Client.NixStyleOptions
( NixStyleFlags (..)
Expand All @@ -41,14 +35,10 @@ import Distribution.Client.ProjectOrchestration
, ProjectBaseContext (..)
, establishProjectBaseContext
)
import Distribution.Client.Sandbox
( loadConfigOrSandboxConfig
)
import Distribution.Client.Setup
( ConfigFlags (..)
, GlobalFlags (..)
, configCompilerAux'
, withRepoContext
)
import Distribution.Client.Types.PackageLocation
( UnresolvedPkgLoc
Expand Down Expand Up @@ -79,7 +69,6 @@ import Distribution.Simple.Setup
)
import Distribution.Simple.Utils
( debug
, dieWithException
, wrapText
)
import Distribution.Solver.Types.SourcePackage
Expand All @@ -103,7 +92,6 @@ import Distribution.Types.UnqualComponentName (UnqualComponentName)
import Distribution.Verbosity
( lessVerbose
, normal
, silent
)
import Distribution.Version
( simplifyVersionRange
Expand Down Expand Up @@ -139,13 +127,17 @@ outdatedAction flags@NixStyleFlags{configFlags} _extraArgs globalFlags = do
(projectConfigShared projectConfig)
(projectConfigBuildOnly projectConfig)
$ \repoContext -> do
-- Why?
-- when (not v2FreezeFile && (isJust mprojectDir || isJust mprojectFile)) $
-- dieWithException verbosity OutdatedAction
let mprojectDir = flagToMaybe . flagProjectDir $ projectFlags flags
mprojectFile = flagToMaybe . flagProjectFile $ projectFlags flags

(comp, platform, _progdb) <- configCompilerAux' configFlags
sourcePkgDb <- IndexUtils.getSourcePackages verbosity repoContext

let pkgVerConstraints = extractPackageVersionConstraints localPackages
pkgVerConstraints <-
if | v1FreezeFile -> V1Outdated.depsFromFreezeFile verbosity
| v2FreezeFile ->
V1Outdated.depsFromNewFreezeFile verbosity globalFlags comp platform mprojectDir mprojectFile
| otherwise -> pure $ extractPackageVersionConstraints localPackages

debug verbosity $
"Dependencies loaded: " ++ intercalate ", " (map prettyShow pkgVerConstraints)
Expand Down

0 comments on commit 8302c75

Please sign in to comment.