Add support for pkg-configs section (#169)

src/Hpack/Config.hs

@@ -129,7 +129,7 @@ packageDependencies Package{..} = nub . sortBy (comparing (lexicographically . f
     deps xs = [(name, version) | (name, version) <- (Map.toList . unDependencies . sectionDependencies) xs]
 
 section :: a -> Section a
-section a = Section a [] mempty [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] Nothing [] mempty
+section a = Section a [] mempty [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] Nothing [] mempty []
 
 packageConfig :: FilePath
 packageConfig = "package.yaml"
@@ -255,6 +255,7 @@ data CommonOptions a = CommonOptions {
 , commonOptionsBuildable :: Maybe Bool
 , commonOptionsWhen :: Maybe (List (ConditionalSection a))
 , commonOptionsBuildTools :: Maybe Dependencies
+, commonOptionsPkgConfigs :: Maybe (List String)
 } deriving (Eq, Show, Generic)
 
 instance HasFieldNames (CommonOptions a)
@@ -472,6 +473,7 @@ data Section a = Section {
 , sectionBuildable :: Maybe Bool
 , sectionConditionals :: [Conditional (Section a)]
 , sectionBuildTools :: Dependencies
+, sectionPkgConfigs :: [String]
 } deriving (Eq, Show, Functor, Foldable, Traversable)
 
 data Conditional a = Conditional {
@@ -852,6 +854,7 @@ mergeSections a globalOptions options
   , sectionDependencies = sectionDependencies options <> sectionDependencies globalOptions
   , sectionConditionals = map (fmap (a <$)) (sectionConditionals globalOptions) ++ sectionConditionals options
   , sectionBuildTools = sectionBuildTools options <> sectionBuildTools globalOptions
+  , sectionPkgConfigs = sectionPkgConfigs globalOptions ++ sectionPkgConfigs options
   }
 
 toSection_ :: a -> CommonOptions a -> ([FieldName], Section a)
@@ -880,6 +883,7 @@ toSection_ a CommonOptions{..}
       , sectionDependencies = fromMaybe mempty commonOptionsDependencies
       , sectionConditionals = conditionals
       , sectionBuildTools = fromMaybe mempty commonOptionsBuildTools
+      , sectionPkgConfigs = fromMaybeList commonOptionsPkgConfigs
       }
     )
   where

src/Hpack/Run.hs

@@ -265,6 +265,7 @@ renderSection renderSectionData Section{..} =
   , renderLdOptions sectionLdOptions
   , renderDependencies "build-depends" sectionDependencies
   , renderDependencies "build-tools" sectionBuildTools
+  , Field "pkgconfig-depends" (CommaSeparatedList sectionPkgConfigs)
   ]
   ++ maybe [] (return . renderBuildable) sectionBuildable
   ++ map (renderConditional renderSectionData) sectionConditionals

test/Hpack/ConfigSpec.hs

@@ -148,6 +148,15 @@ spec = do
         captureUnknownFieldsValue . toSection <$> decodeEither input
           `shouldBe` Right (section Empty){sectionExtraLibraries = ["foo", "bar"]}
 
+      it "accepts pkg-configs" $ do
+        let input = [i|
+              pkg-configs:
+                - QtWebKit
+                - weston
+              |]
+        captureUnknownFieldsValue . toSection <$> decodeEither input
+          `shouldBe` Right (section Empty){sectionPkgConfigs = [ "QtWebKit", "weston" ]}
+
       it "accepts extra-frameworks-dirs" $ do
         let input = [i|
               extra-frameworks-dirs:
@@ -157,6 +166,7 @@ spec = do
         captureUnknownFieldsValue . toSection <$> decodeEither input
           `shouldBe` Right (section Empty){sectionExtraFrameworksDirs = ["foo", "bar"]}
 
+
       it "accepts frameworks" $ do
         let input = [i|
               frameworks: