Skip to content

Commit 7169b73

Browse files
authored
Merge pull request #3867 from sol/master
Compatibility with hpack-0.26.0
2 parents 2924632 + 12477f6 commit 7169b73

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/Stack/Package.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1373,7 +1373,9 @@ hpack pkgDir = do
13731373
config <- view configL
13741374
case configOverrideHpack config of
13751375
HpackBundled -> do
1376-
#if MIN_VERSION_hpack(0,23,0)
1376+
#if MIN_VERSION_hpack(0,26,0)
1377+
r <- liftIO $ Hpack.hpackResult $ Hpack.setTarget (toFilePath hpackFile) Hpack.defaultOptions
1378+
#elif MIN_VERSION_hpack(0,23,0)
13771379
r <- liftIO $ Hpack.hpackResult Hpack.defaultRunOptions {Hpack.runOptionsConfigDir = Just (toFilePath pkgDir)} Hpack.NoForce
13781380
#else
13791381
r <- liftIO $ Hpack.hpackResult (Just $ toFilePath pkgDir) Hpack.NoForce

0 commit comments

Comments
 (0)