@@ -22,11 +22,9 @@ module Distribution.Client.Dependency (
22
22
resolveWithoutDependencies ,
23
23
24
24
-- * Constructing resolver policies
25
- DepResolverParams (.. ),
26
25
PackageConstraint (.. ),
27
26
PackagesPreferenceDefault (.. ),
28
27
PackagePreference (.. ),
29
- InstalledPreference (.. ),
30
28
31
29
-- ** Standard policy
32
30
basicInstallPolicy ,
@@ -37,8 +35,6 @@ module Distribution.Client.Dependency (
37
35
applySandboxInstallPolicy ,
38
36
39
37
-- ** Extra policy options
40
- dontUpgradeNonUpgradeablePackages ,
41
- hideBrokenInstalledPackages ,
42
38
upgradeDependencies ,
43
39
reinstallTargets ,
44
40
@@ -55,10 +51,6 @@ module Distribution.Client.Dependency (
55
51
setMaxBackjumps ,
56
52
setEnableBackjumping ,
57
53
setGoalOrder ,
58
- addSourcePackages ,
59
- hideInstalledPackagesSpecificByUnitId ,
60
- hideInstalledPackagesSpecificBySourcePackageId ,
61
- hideInstalledPackagesAllVersions ,
62
54
removeUpperBounds ,
63
55
addDefaultSetupDependencies ,
64
56
) where
@@ -75,11 +67,10 @@ import Distribution.Client.Types
75
67
import Distribution.Client.Sandbox.Types
76
68
( SandboxPackageInfo (.. ) )
77
69
import Distribution.Client.Targets
78
- import qualified Distribution.InstalledPackageInfo as Installed
79
70
import Distribution.Package
80
71
( PackageName (.. ), PackageIdentifier (PackageIdentifier ), PackageId
81
72
, Package (.. ), packageName , packageVersion
82
- , UnitId , Dependency (Dependency ))
73
+ , Dependency (Dependency ))
83
74
import qualified Distribution.PackageDescription as PD
84
75
import qualified Distribution.PackageDescription.Configuration as PD
85
76
import Distribution.PackageDescription.Configuration
@@ -354,17 +345,6 @@ addSourcePackages pkgs params =
354
345
(depResolverSourcePkgIndex params) pkgs
355
346
}
356
347
357
- hideInstalledPackagesSpecificByUnitId :: [UnitId ]
358
- -> DepResolverParams
359
- -> DepResolverParams
360
- hideInstalledPackagesSpecificByUnitId pkgids params =
361
- -- TODO: this should work using exclude constraints instead
362
- params {
363
- depResolverInstalledPkgIndex =
364
- foldl' (flip InstalledPackageIndex. deleteUnitId)
365
- (depResolverInstalledPkgIndex params) pkgids
366
- }
367
-
368
348
hideInstalledPackagesSpecificBySourcePackageId :: [PackageId ]
369
349
-> DepResolverParams
370
350
-> DepResolverParams
@@ -387,17 +367,6 @@ hideInstalledPackagesAllVersions pkgnames params =
387
367
}
388
368
389
369
390
- hideBrokenInstalledPackages :: DepResolverParams -> DepResolverParams
391
- hideBrokenInstalledPackages params =
392
- hideInstalledPackagesSpecificByUnitId pkgids params
393
- where
394
- pkgids = map Installed. installedUnitId
395
- . InstalledPackageIndex. reverseDependencyClosure
396
- (depResolverInstalledPkgIndex params)
397
- . map (Installed. installedUnitId . fst )
398
- . InstalledPackageIndex. brokenPackages
399
- $ depResolverInstalledPkgIndex params
400
-
401
370
-- | Remove upper bounds in dependencies using the policy specified by the
402
371
-- 'AllowNewer' argument (all/some/none).
403
372
--
0 commit comments