git.iko.soy/typeable/cabal2nix
on master help sign in
Require hpack >= 0.29.6
f895510Simon Hengel
cabal2nix.cabal+1−1
compare with master
unifiedsplit
@@ -119,7 +119,7 @@ library
119 , filepath
119 , filepath
120 , hackage-db >= 2.0.1
120 , hackage-db >= 2.0.1
121 , hopenssl >= 2
121 , hopenssl >= 2
122− , hpack >= 0.26
122+ , hpack >= 0.29.6
123 , language-nix
123 , language-nix
124 , lens
124 , lens
125 , optparse-applicative
125 , optparse-applicative
src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+4−1
@@ -203,7 +203,10 @@ encodeUtf8 = T.encodeUtf8 . T.pack
203
203
204hpackDirectory :: FilePath -> MaybeT IO (Bool, Cabal.GenericPackageDescription)
204hpackDirectory :: FilePath -> MaybeT IO (Bool, Cabal.GenericPackageDescription)
205hpackDirectory dir = do
205hpackDirectory dir = do
206− mPackage <- liftIO $ Hpack.readPackageConfig Hpack.defaultDecodeOptions {Hpack.decodeOptionsTarget = dir </> Hpack.packageConfig}
206+ mPackage <- liftIO $ Hpack.readPackageConfig Hpack.defaultDecodeOptions {
207+ Hpack.decodeOptionsProgramName = Hpack.ProgramName "cabal2nix"
208+ , Hpack.decodeOptionsTarget = dir </> Hpack.packageConfig
209+ }
207 case mPackage of
210 case mPackage of
208 Left err -> liftIO $ hPutStrLn stderr ("*** hpack error: " ++ show err ++ ". Exiting.") >> exitFailure
211 Left err -> liftIO $ hPutStrLn stderr ("*** hpack error: " ++ show err ++ ". Exiting.") >> exitFailure
209 Right r -> do
212 Right r -> do