Add "flags:" to ipi

Author: angerman

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

@@ -22,6 +22,7 @@ import Distribution.ModuleName
 import Distribution.Package hiding (installedUnitId, pkgCompiler)
 import Distribution.Types.AbiDependency
 import Distribution.Types.ExposedModule
+import Distribution.Types.Flag (FlagAssignment)
 import Distribution.Types.LibraryName
 import Distribution.Types.LibraryVisibility
 import Distribution.Types.MungedPackageId
@@ -62,7 +63,8 @@ data InstalledPackageInfo = InstalledPackageInfo
   , description :: !ShortText
   , category :: !ShortText
   , -- these parts are required by an installed package only:
-    abiHash :: AbiHash
+    unitFlags :: FlagAssignment
+  , abiHash :: AbiHash
   , indefinite :: Bool
   , exposed :: Bool
   , -- INVARIANT: if the package is definite, OpenModule's
@@ -148,6 +150,7 @@ emptyInstalledPackageInfo =
     , synopsis = ""
     , description = ""
     , category = ""
+    , unitFlags = mempty
     , abiHash = mkAbiHash ""
     , indefinite = False
     , exposed = False

Cabal-syntax/src/Distribution/Types/InstalledPackageInfo/FieldGrammar.hs

@@ -23,6 +23,7 @@ import Distribution.ModuleName
 import Distribution.Package hiding (pkgCompiler)
 import Distribution.Parsec
 import Distribution.Pretty
+import Distribution.Types.Flag (FlagAssignment)
 import Distribution.Types.LibraryName
 import Distribution.Types.LibraryVisibility
 import Distribution.Types.MungedPackageName
@@ -61,6 +62,7 @@ ipiFieldGrammar
      , Applicative (g InstalledPackageInfo)
      , Applicative (g Basic)
      , c (Identity AbiHash)
+     , c (Identity FlagAssignment)
      , c (Identity LibraryVisibility)
      , c (Identity PackageName)
      , c (Identity UnitId)
@@ -105,6 +107,7 @@ ipiFieldGrammar =
     <@> freeTextFieldDefST "description" L.description
     <@> freeTextFieldDefST "category" L.category
     -- Installed fields
+    <@> optionalFieldDef "flags" L.unitFlags mempty
     <@> optionalFieldDef "abi" L.abiHash (mkAbiHash "")
     <@> booleanFieldDef "indefinite" L.indefinite False
     <@> booleanFieldDef "exposed" L.exposed False

Cabal-syntax/src/Distribution/Types/InstalledPackageInfo/Lens.hs

@@ -12,6 +12,7 @@ import Distribution.Backpack (OpenModule)
 import Distribution.License (License)
 import Distribution.ModuleName (ModuleName)
 import Distribution.Package (AbiHash, ComponentId, PackageIdentifier, UnitId)
+import Distribution.Types.Flag (FlagAssignment)
 import Distribution.Types.InstalledPackageInfo (AbiDependency, ExposedModule, InstalledPackageInfo)
 import Distribution.Types.LibraryName (LibraryName)
 import Distribution.Types.LibraryVisibility (LibraryVisibility)
@@ -28,6 +29,10 @@ installedUnitId :: Lens' InstalledPackageInfo UnitId
 installedUnitId f s = fmap (\x -> s{T.installedUnitId = x}) (f (T.installedUnitId s))
 {-# INLINE installedUnitId #-}
 
+unitFlags :: Lens' InstalledPackageInfo FlagAssignment
+unitFlags f s = fmap (\x -> s{T.unitFlags = x}) (f (T.unitFlags s))
+{-# INLINE unitFlags #-}
+
 installedComponentId_ :: Lens' InstalledPackageInfo (Maybe ComponentId)
 installedComponentId_ f s = fmap (\x -> s{T.installedComponentId_ = x}) (f (T.installedComponentId_ s))
 {-# INLINE installedComponentId_ #-}

Cabal/src/Distribution/Simple/Register.hs

@@ -500,6 +500,7 @@ generalInstalledPackageInfo adjustRelIncDirs pkg abi_hash lib lbi clbi installDi
     , IPI.installedComponentId_ = Just (componentComponentId clbi)
     , IPI.instantiatedWith = expectLibraryComponent (maybeComponentInstantiatedWith clbi)
     , IPI.sourceLibName = libName lib
+    , IPI.unitFlags = flagAssignment lbi
     , IPI.compatPackageKey = expectLibraryComponent (maybeComponentCompatPackageKey clbi)
     , -- If GHC >= 8.4 we register with SDPX, otherwise with legacy license
       IPI.license =