@@ -19,7 +19,7 @@ import qualified Distribution.PackageDescription as Cabal
1919import Distribution.PackageDescription.Parse as Cabal
2020import Distribution.Text ( simpleParse, display )
2121import Distribution.Version
22−import qualified Hpack.Run as Hpack
22+import qualified Hpack.Render as Hpack
2323import qualified Hpack.Config as Hpack
2424import OpenSSL.Digest ( digestString, digestByName )
2525import System.Directory ( doesDirectoryExist, doesFileExist, createDirectoryIfMissing, getHomeDirectory, getDirectoryContents )
@@ -191,11 +191,11 @@ handleIO = Exception.handle
191191
192192hpackDirectory :: FilePath -> MaybeT IO (Bool, Cabal.GenericPackageDescription)
193193hpackDirectory dir = do
194− mPackage <- liftIO $ Hpack.readPackageConfig "" $ dir </> "package.yaml"
194+ mPackage <- liftIO $ Hpack.readPackageConfig Hpack.defaultDecodeOptions {Hpack.decodeOptionsTarget = dir </> Hpack.packageConfig}
195195 case mPackage of
196196 Left err -> liftIO $ hPutStrLn stderr ("*** hpack error: " ++ show err ++ ". Exiting.") >> exitFailure
197− Right (pkg', _) -> do
198− let hpackOutput = Hpack.renderPackage Hpack.defaultRenderSettings 2 [] [] pkg'
197+ Right (Hpack.DecodeResult pkg' _ _) -> do
198+ let hpackOutput = Hpack.renderPackage [] pkg'
199199 hash = printSHA256 $ digestString (digestByName "sha256") hpackOutput
200200 case parseGenericPackageDescription hpackOutput of
201201 ParseFailed perr -> liftIO $ do