git.iko.soy/typeable/cabal2nix
on master help sign in
Fix build with hpack 0.29.

Closes https://github.com/NixOS/cabal2nix/issues/359.

commit2d81cda16e0b1cff78a4439d8eab80f6eb55ad7e authorPeter Simons <simons@cryp.to> dateThu 12 Jul 2018, 11:29 (8 years ago) parent9cbf9e8
1 file changed+2−2
src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+2−2
src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+2−2
@@ -202,8 +202,8 @@ hpackDirectory dir = do
202202 mPackage <- liftIO $ Hpack.readPackageConfig Hpack.defaultDecodeOptions {Hpack.decodeOptionsTarget = dir </> Hpack.packageConfig}
203203 case mPackage of
204204 Left err -> liftIO $ hPutStrLn stderr ("*** hpack error: " ++ show err ++ ". Exiting.") >> exitFailure
205− Right (Hpack.DecodeResult pkg' _ _) -> do
206− let hpackOutput = encodeUtf8 $ Hpack.renderPackage [] pkg'
205+ Right r -> do
206+ let hpackOutput = encodeUtf8 $ Hpack.renderPackage [] (Hpack.decodeResultPackage r)
207207 hash = printSHA256 $ digest (digestByName "sha256") hpackOutput
208208 case runParseGenericPackageDescription "<hpack output>" hpackOutput of
209209 Left msg -> liftIO $ do