git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #394 from ttuegel/hpack-cabal-version

Include cabal-version field inferred by hpack

commit7b07d27645651cc8980a9194f5bbf7b8e86a042c authorPeter Simons <simons@cryp.to> dateMon 10 Dec 2018, 22:46 (8 years ago) parent4c3496454802dd
1 file changed+4−1
src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+4−1
src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+4−1
@@ -216,7 +216,10 @@ hpackDirectory dir = do
216216 case mPackage of
217217 Left err -> liftIO $ hPutStrLn stderr ("*** hpack error: " ++ show err ++ ". Exiting.") >> exitFailure
218218 Right r -> do
219− let hpackOutput = encodeUtf8 $ Hpack.renderPackage [] (Hpack.decodeResultPackage r)
219+ let hpackOutput =
220+ let body = Hpack.renderPackage [] (Hpack.decodeResultPackage r)
221+ cabalVersion = Hpack.decodeResultCabalVersion r
222+ in encodeUtf8 $ cabalVersion ++ body
220223 hash = printSHA256 $ digest (digestByName "sha256") hpackOutput
221224 case runParseGenericPackageDescription "<hpack output>" hpackOutput of
222225 Left msg -> liftIO $ do