@@ -672,7 +672,6 @@ rebuildInstallPlan verbosity
672
672
projectConfigAllPackages,
673
673
projectConfigLocalPackages,
674
674
projectConfigSpecificPackage,
675
- projectPackagesNamed,
676
675
projectConfigBuildOnly
677
676
}
678
677
(compiler, platform, progdb) pkgConfigDB
@@ -698,7 +697,6 @@ rebuildInstallPlan verbosity
698
697
localPackages
699
698
sourcePackageHashes
700
699
installDirs
701
- projectPackagesNamed
702
700
projectConfigShared
703
701
projectConfigAllPackages
704
702
projectConfigLocalPackages
@@ -1363,7 +1361,6 @@ elaborateInstallPlan
1363
1361
-> [PackageSpecifier (SourcePackage (PackageLocation loc ))]
1364
1362
-> Map PackageId PackageSourceHash
1365
1363
-> InstallDirs. InstallDirTemplates
1366
- -> [PackageVersionConstraint ]
1367
1364
-> ProjectConfigShared
1368
1365
-> PackageConfig
1369
1366
-> PackageConfig
@@ -1375,7 +1372,6 @@ elaborateInstallPlan verbosity platform compiler compilerprogdb pkgConfigDB
1375
1372
solverPlan localPackages
1376
1373
sourcePackageHashes
1377
1374
defaultInstallDirs
1378
- extraPackages
1379
1375
sharedPackageConfig
1380
1376
allPackagesConfig
1381
1377
localPackagesConfig
@@ -2046,21 +2042,15 @@ elaborateInstallPlan verbosity platform compiler compilerprogdb pkgConfigDB
2046
2042
$ map packageId
2047
2043
$ SolverInstallPlan. reverseDependencyClosure
2048
2044
solverPlan
2049
- (map PlannedId (Set. toList pkgsInplaceToProject ))
2045
+ (map PlannedId (Set. toList pkgsLocalToProject ))
2050
2046
2051
2047
isLocalToProject :: Package pkg => pkg -> Bool
2052
2048
isLocalToProject pkg = Set. member (packageId pkg)
2053
2049
pkgsLocalToProject
2054
2050
2055
- pkgsInplaceToProject :: Set PackageId
2056
- pkgsInplaceToProject =
2057
- Set. fromList (catMaybes (map shouldBeLocal localPackages))
2058
- -- TODO: localPackages is a misnomer, it's all project packages
2059
- -- here is where we decide which ones will be local!
2060
-
2061
2051
pkgsLocalToProject :: Set PackageId
2062
2052
pkgsLocalToProject =
2063
- Set. fromList (catMaybes (map (isInLocal extraPackages) localPackages))
2053
+ Set. fromList (catMaybes (map shouldBeLocal localPackages))
2064
2054
-- TODO: localPackages is a misnomer, it's all project packages
2065
2055
-- here is where we decide which ones will be local!
2066
2056
@@ -2129,28 +2119,6 @@ shouldBeLocal (SpecificSourcePackage pkg) = case srcpkgSource pkg of
2129
2119
LocalUnpackedPackage _ -> Just (packageId pkg)
2130
2120
_ -> Nothing
2131
2121
2132
- -- Used to determine which packages are affected by local package configuration
2133
- -- flags like ‘--enable-shared --enable-executable-dynamic --disable-library-vanilla’.
2134
- isInLocal :: [PackageVersionConstraint ] -> PackageSpecifier (SourcePackage (PackageLocation loc )) -> Maybe PackageId
2135
- isInLocal _ NamedPackage {} = Nothing
2136
- isInLocal _extraPackages (SpecificSourcePackage pkg) = case srcpkgSource pkg of
2137
- LocalUnpackedPackage _ -> Just (packageId pkg)
2138
- -- LocalTarballPackage is matched here too, because otherwise ‘sdistize’
2139
- -- produces for ‘localPackages’ in the ‘ProjectBaseContext’ a
2140
- -- LocalTarballPackage, and ‘shouldBeLocal’ will make flags like
2141
- -- ‘--disable-library-vanilla’ have no effect for a typical
2142
- -- ‘cabal install --lib --enable-shared enable-executable-dynamic --disable-library-vanilla’,
2143
- -- as these flags would apply to local packages, but the sdist would
2144
- -- erroneously not get categorized as a local package, so the flags would be
2145
- -- ignored and produce a package with an unchanged hash.
2146
- LocalTarballPackage _ -> Just (packageId pkg)
2147
- -- TODO: the docs say ‘extra-packages’ is implemented in cabal project
2148
- -- files. We can fix that here by checking that the version range matches.
2149
- -- RemoteTarballPackage _ -> _
2150
- -- RepoTarballPackage _ -> _
2151
- -- RemoteSourceRepoPackage _ -> _
2152
- _ -> Nothing
2153
-
2154
2122
-- | Given a 'ElaboratedPlanPackage', report if it matches a 'ComponentName'.
2155
2123
matchPlanPkg :: (ComponentName -> Bool ) -> ElaboratedPlanPackage -> Bool
2156
2124
matchPlanPkg p = InstallPlan. foldPlanPackage (p . ipiComponentName) (matchElabPkg p)
@@ -3430,8 +3398,7 @@ setupHsScriptOptions (ReadyPackage elab@ElaboratedConfiguredPackage{..})
3430
3398
useWin32CleanHack = False , -- TODO: [required eventually]
3431
3399
forceExternalSetupMethod = isParallelBuild,
3432
3400
setupCacheLock = Just cacheLock,
3433
- isInteractive = False ,
3434
- setupConfigDynamic = elabDynExe
3401
+ isInteractive = False
3435
3402
}
3436
3403
3437
3404
0 commit comments