Add missing mod-def-file field

Author: mpilgrem

README.md

@@ -336,6 +336,7 @@ This is done to allow compatibility with a wider range of `Cabal` versions.
 | `type` | . | | |
 | `lib-version-info` | . | | |
 | `options` | . | | |
+| `mod-def-file` | . | | |
 | `other-modules` | · | All modules in `source-dirs` less `main` less any modules mentioned in `when` | |
 | `generated-other-modules` | | | Added to `other-modules` and `autogen-modules`. Since `0.23.0`.
 

src/Hpack/Config.hs

@@ -245,19 +245,21 @@ data ForeignLibrarySection = ForeignLibrarySection {
   foreignLibrarySectionType :: Last String
 , foreignLibrarySectionLibVersionInfo :: Last String
 , foreignLibrarySectionOptions :: Maybe (List String)
+, foreignLibrarySectionModDefFile :: Last String
 , foreignLibrarySectionOtherModules :: Maybe (List Module)
 , foreignLibrarySectionGeneratedOtherModules :: Maybe (List Module)
 } deriving (Eq, Show, Generic, FromValue)
 
 instance Monoid ForeignLibrarySection where
-  mempty = ForeignLibrarySection mempty mempty Nothing Nothing Nothing
+  mempty = ForeignLibrarySection mempty mempty Nothing mempty Nothing Nothing
   mappend = (<>)
 
 instance Semigroup ForeignLibrarySection where
   a <> b = ForeignLibrarySection {
       foreignLibrarySectionType = foreignLibrarySectionType a <> foreignLibrarySectionType b
     , foreignLibrarySectionLibVersionInfo = foreignLibrarySectionLibVersionInfo a <> foreignLibrarySectionLibVersionInfo b
     , foreignLibrarySectionOptions = foreignLibrarySectionOptions a <> foreignLibrarySectionOptions b
+    , foreignLibrarySectionModDefFile = foreignLibrarySectionModDefFile a <> foreignLibrarySectionModDefFile b
     , foreignLibrarySectionOtherModules = foreignLibrarySectionOtherModules a <> foreignLibrarySectionOtherModules b
     , foreignLibrarySectionGeneratedOtherModules = foreignLibrarySectionGeneratedOtherModules a <> foreignLibrarySectionGeneratedOtherModules b
     }
@@ -1115,6 +1117,7 @@ data ForeignLibrary = ForeignLibrary {
   foreignLibraryType :: Maybe String
 , foreignLibraryLibVersionInfo :: Maybe String
 , foreignLibraryOptions :: Maybe [String]
+, foreignLibraryModDefFile :: Maybe String
 , foreignLibraryOtherModules :: [Module]
 , foreignLibraryGeneratedModules :: [Module]
 } deriving (Eq, Show)
@@ -1600,7 +1603,7 @@ fromLibrarySectionPlain LibrarySection{..} = Library {
   }
 
 getMentionedForeignLibraryModules :: ForeignLibrarySection -> [Module]
-getMentionedForeignLibraryModules (ForeignLibrarySection _ _ _ otherModules generatedModules)=
+getMentionedForeignLibraryModules (ForeignLibrarySection _ _ _ _ otherModules generatedModules)=
   fromMaybeList (otherModules <> generatedModules)
 
 toForeignLibrary :: (MonadIO m, State m) => FilePath -> String -> Section ForeignLibrarySection -> m (Section ForeignLibrary)
@@ -1613,6 +1616,7 @@ toForeignLibrary dir packageName_ =
         (getLast foreignLibrarySectionType)
         (getLast foreignLibrarySectionLibVersionInfo)
         (fromList <$> foreignLibrarySectionOptions)
+        (getLast foreignLibrarySectionModDefFile)
         (otherModules ++ generatedModules)
         generatedModules
       )

src/Hpack/Render.hs

@@ -228,11 +228,12 @@ renderForeignLibrarySection extraFields = renderSection renderForeignLibraryFiel
 
 renderForeignLibraryFields :: ForeignLibrary -> [Element]
 renderForeignLibraryFields ForeignLibrary{..} =
-  typeField ++ libVersionInfo ++ options ++ [otherModules, generatedModules]
+  typeField ++ libVersionInfo ++ options ++ modDefFile ++ [otherModules, generatedModules]
   where
     typeField = maybe [] (return . Field "type" . Literal) foreignLibraryType
     libVersionInfo = maybe [] (return . Field "lib-version-info" . Literal) foreignLibraryLibVersionInfo
     options = maybe [] (\opts -> [renderForeignLibOptions opts]) foreignLibraryOptions
+    modDefFile = maybe [] (return . Field "mod-def-file" . Literal) foreignLibraryModDefFile
     otherModules = renderOtherModules foreignLibraryOtherModules
     generatedModules = renderGeneratedModules foreignLibraryGeneratedModules
 
@@ -351,7 +352,6 @@ renderDirectories name = Field name . LineSeparatedList . replaceDots
       "." -> "./"
       _ -> xs
 
-
 renderForeignLibOptions :: [String] -> Element
 renderForeignLibOptions = Field "options" . LineSeparatedList