scopeTopLevel is only host

Author: andreabedini

cabal-install-solver/src/Distribution/Solver/Types/PackageConstraint.hs

@@ -30,7 +30,7 @@ import Distribution.Solver.Types.OptionalStanza
 import Distribution.Solver.Types.PackagePath
 
 import qualified Text.PrettyPrint as Disp
-import Distribution.Solver.Types.Toolchain (Stage)
+import Distribution.Solver.Types.Toolchain (Stage (Host))
 
 
 -- | Determines to what packages and in what contexts a
@@ -67,9 +67,9 @@ data ConstraintQualifier
 
 -- | Constructor for a common use case: the constraint applies to
 -- the package with the specified name when that package is a
--- top-level dependency in the default namespace.
+-- top-level dependency in the host stage.
 scopeToplevel :: PackageName -> ConstraintScope
-scopeToplevel = ConstraintScope Nothing . ScopeQualified QualToplevel
+scopeToplevel = ConstraintScope (Just Host) . ScopeQualified QualToplevel
 
 -- | Returns the package name associated with a constraint scope.
 scopeToPackageName :: ConstraintScope -> PackageName

cabal-install/src/Distribution/Client/ProjectPlanning.hs

@@ -1410,7 +1410,9 @@ planPackages
             , not (null stanzas)
             ]
           . addConstraints
-            -- enable stanza constraints where the user asked to enable
+            -- Enable stanza constraints where the user asked to enable
+            -- Only applies to the host stage.
+            -- TODO: Disable test and bench for build stage packages.
             [ LabeledPackageConstraint
               ( PackageConstraint
                   (scopeToplevel pkgname)

cabal-install/src/Distribution/Client/Types/PackageSpecifier.hs

@@ -52,7 +52,7 @@ pkgSpecifierConstraints (SpecificSourcePackage pkg) =
   where
     pc =
       PackageConstraint
-        (ConstraintScope Nothing (ScopeTarget $ packageName pkg))
+        (scopeToplevel (packageName pkg))
         (PackagePropertyVersion $ thisVersion (packageVersion pkg))
 
 mkNamedPackage :: PackageIdentifier -> PackageSpecifier pkg