git.iko.soy/stackage
on master help sign in
tar 0.3
commit5697fdd417fb7d89785a60ff068b18205dc8e7e0 authorMichael Snoyman <michael@snoyman.com> dateSun 25 Nov 2012, 08:49 (14 years ago) parent9d74f66
3 files changed+11−2
compare with master
unifiedsplit
Stackage/LoadDatabase.hs+5−1 Stackage/Tarballs.hs+5 stackage.cabal+1−1
Stackage/LoadDatabase.hs+5−1
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12module Stackage.LoadDatabase where
23
34import qualified Codec.Archive.Tar as Tar
@@ -43,8 +44,11 @@ loadPackageDB core deps = do
4344 lbs <- L.readFile tarName
4445 addEntries mempty $ Tar.read lbs
4546 where
46− addEntries :: PackageDB -> Tar.Entries Tar.FormatError -> IO PackageDB
47+#if MIN_VERSION_tar(0, 4, 0)
4748 addEntries _ (Tar.Fail e) = throwIO e
49+#else
50+ addEntries _ (Tar.Fail e) = error e
51+#endif
4852 addEntries db Tar.Done = return db
4953 addEntries db (Tar.Next e es) = addEntry db e >>= flip addEntries es
5054
Stackage/Tarballs.hs+5
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12module Stackage.Tarballs
23 ( makeTarballs
34 ) where
@@ -26,7 +27,11 @@ makeTarballs ii = do
2627 createDirectoryIfMissing True $ takeDirectory extraTar
2728 L.writeFile extraTar $ Tar.write extraEntries
2829 where
30+#if MIN_VERSION_tar(0, 4, 0)
2931 loop _ _ (Tar.Fail err) = throwIO err
32+#else
33+ loop _ _ (Tar.Fail err) = error err
34+#endif
3035 loop stable extra Tar.Done = return (stable [], extra [])
3136 loop stable extra (Tar.Next e es) =
3237 loop stable' extra' es
stackage.cabal+1−1
@@ -30,7 +30,7 @@ library
3030 build-depends: base >= 4 && < 5
3131 , containers
3232 , Cabal
33− , tar >= 0.4
33+ , tar >= 0.3
3434 , bytestring
3535 , directory
3636 , filepath