@@ -604,7 +604,7 @@ rebuildInstallPlan verbosity
604
604
-> (Compiler , Platform , ProgramDb )
605
605
-> PkgConfigDb
606
606
-> SolverInstallPlan
607
- -> [PackageSpecifier (SourcePackage loc )]
607
+ -> [PackageSpecifier (SourcePackage ( PackageLocation loc ) )]
608
608
-> Rebuild ( ElaboratedInstallPlan
609
609
, ElaboratedSharedConfig )
610
610
phaseElaboratePlan ProjectConfig {
@@ -1212,7 +1212,7 @@ elaborateInstallPlan
1212
1212
-> DistDirLayout
1213
1213
-> StoreDirLayout
1214
1214
-> SolverInstallPlan
1215
- -> [PackageSpecifier (SourcePackage loc )]
1215
+ -> [PackageSpecifier (SourcePackage ( PackageLocation loc ) )]
1216
1216
-> Map PackageId PackageSourceHash
1217
1217
-> InstallDirs. InstallDirTemplates
1218
1218
-> ProjectConfigShared
@@ -1898,12 +1898,14 @@ elaborateInstallPlan verbosity platform compiler compilerprogdb pkgConfigDB
1898
1898
-- TODO: localPackages is a misnomer, it's all project packages
1899
1899
-- here is where we decide which ones will be local!
1900
1900
where
1901
- shouldBeLocal :: PackageSpecifier (SourcePackage loc ) -> Maybe PackageId
1901
+ shouldBeLocal :: PackageSpecifier (SourcePackage ( PackageLocation loc ) ) -> Maybe PackageId
1902
1902
shouldBeLocal NamedPackage {} = Nothing
1903
- shouldBeLocal (SpecificSourcePackage pkg) = Just (packageId pkg)
1904
- -- TODO: It's not actually obvious for all of the
1905
- -- 'ProjectPackageLocation's that they should all be local. We might
1906
- -- need to provide the user with a choice.
1903
+ shouldBeLocal (SpecificSourcePackage pkg)
1904
+ | LocalTarballPackage _ <- packageSource pkg = Nothing
1905
+ | otherwise = Just (packageId pkg)
1906
+ -- TODO: Is it only LocalTarballPackages we can know about without
1907
+ -- them being "local" in the sense meant here?
1908
+ --
1907
1909
-- Also, review use of SourcePackage's loc vs ProjectPackageLocation
1908
1910
1909
1911
pkgsUseSharedLibrary :: Set PackageId
0 commit comments