git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #328 from tomsmalley/master

Fix build for hpack-0.22.0.

commit1a683ad0e2fb6c32674cee373ef18577c8d2970c authorPeter Simons <simons@cryp.to> dateThu 25 Jan 2018, 21:47 (9 years ago) parent68a143cb31db77
2 files changed+3−3
cabal2nix.cabal+1−1 src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+2−2
cabal2nix.cabal+1−1
@@ -104,7 +104,7 @@ library
104104 , filepath
105105 , hackage-db >2
106106 , hopenssl >=2
107− , hpack == 0.21.*
107+ , hpack == 0.22.*
108108 , language-nix
109109 , lens
110110 , optparse-applicative
src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+2−2
@@ -191,10 +191,10 @@ 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 "" $ dir </> "package.yaml"
195195 case mPackage of
196196 Left err -> liftIO $ hPutStrLn stderr ("*** hpack error: " ++ show err ++ ". Exiting.") >> exitFailure
197− Right (_, pkg') -> do
197+ Right (pkg', _) -> do
198198 let hpackOutput = Hpack.renderPackage Hpack.defaultRenderSettings 2 [] [] pkg'
199199 hash = printSHA256 $ digestString (digestByName "sha256") hpackOutput
200200 case parseGenericPackageDescription hpackOutput of