restore old behaviour in code working with PackageDescription

we fixed GenericPackageDescription's constructor

Author: leana8959

Cabal-syntax/src/Distribution/PackageDescription/Parsec.hs

@@ -667,7 +667,6 @@ processImports v commonStanzas = go []
     go acc (Field (Name pos name) fls : fields) | name == "import" = do
       names <- getList' <$> runFieldParser pos parsec v fls
       validNames <- for names $ \commonName ->
-        -- Common Stanza sections are already parsed as 'BuildInfo's with import names inserted
         if Map.member commonName commonStanzas
           then pure (Just commonName)
           else do
@@ -679,7 +678,7 @@ processImports v commonStanzas = go []
     -- parse actual CondTree
     go names fields = do
       fields' <- catMaybes <$> traverse (warnImport v) fields
-      pure (fields', reverse names)
+      pure (fields', names)
 
 -- | Warn on "import" fields, also map to Maybe, so erroneous fields can be filtered
 warnImport :: CabalSpecVersion -> Field Position -> ParseResult src (Maybe (Field Position))

Cabal-syntax/src/Distribution/Types/GenericPackageDescription.hs

@@ -354,7 +354,7 @@ mergeImports commonStanzas fromBuildInfo (CondNode root c zs) =
         cs' = map (fromBuildInfo' <$>) bis ++ cs
 
 instance Package GenericPackageDescription where
-  packageId = packageId . packageDescriptionInternal
+  packageId = packageId . packageDescription
 
 instance Binary GenericPackageDescription
 instance Structured GenericPackageDescription

Cabal/src/Distribution/PackageDescription/Check.hs

@@ -365,12 +365,12 @@ checkGenericPackageDescription
       usedFlags :: Set.Set FlagName
       usedFlags =
         mconcat
-          [ toSetOf (traverse . traverseCondTreeV . L._PackageFlag) (condLibrary gpd)
-          , toSetOf (L.condSubLibrariesUnmerged . traverse . _2 . traverseCondTreeV . L._PackageFlag) gpd
-          , toSetOf (L.condForeignLibsUnmerged . traverse . _2 . traverseCondTreeV . L._PackageFlag) gpd
-          , toSetOf (L.condExecutablesUnmerged . traverse . _2 . traverseCondTreeV . L._PackageFlag) gpd
-          , toSetOf (L.condTestSuitesUnmerged . traverse . _2 . traverseCondTreeV . L._PackageFlag) gpd
-          , toSetOf (L.condBenchmarksUnmerged . traverse . _2 . traverseCondTreeV . L._PackageFlag) gpd
+          [ toSetOf (L.condLibrary traverse . traverseCondTreeV . L._PackageFlag) gpd
+          , toSetOf (L.condSubLibraries . traverse . _2 . traverseCondTreeV . L._PackageFlag) gpd
+          , toSetOf (L.condForeignLibs . traverse . _2 . traverseCondTreeV . L._PackageFlag) gpd
+          , toSetOf (L.condExecutables . traverse . _2 . traverseCondTreeV . L._PackageFlag) gpd
+          , toSetOf (L.condTestSuites . traverse . _2 . traverseCondTreeV . L._PackageFlag) gpd
+          , toSetOf (L.condBenchmarks . traverse . _2 . traverseCondTreeV . L._PackageFlag) gpd
           ]
 
 checkPackageDescription :: Monad m => PackageDescription -> CheckM m ()