Commit 02349ba2 authored by Duncan Coutts's avatar Duncan Coutts
Browse files

Require latest tar version

Also lets us build with older bytestring that shipped with older ghc.
parent fd3dd32d
......@@ -526,7 +526,7 @@ readPackageTarget verbosity target = case target of
extractTarballPackageCabalFile tarballFile tarballOriginalLoc =
either (die . formatErr) return
. check
. accumEntryMap Map.empty
. accumEntryMap
. Tar.filterEntries isCabalFile
. Tar.read
. GZipUtils.maybeDecompress
......@@ -534,11 +534,9 @@ readPackageTarget verbosity target = case target of
where
formatErr msg = "Error reading " ++ tarballOriginalLoc ++ ": " ++ msg
accumEntryMap !m Tar.Done = Right m
accumEntryMap !_ (Tar.Fail err) = Left err
accumEntryMap !m (Tar.Next e es) = accumEntryMap m' es
where
m' = Map.insert (Tar.entryTarPath e) e m
accumEntryMap = Tar.foldlEntries
(\m e -> Map.insert (Tar.entryTarPath e) e m)
Map.empty
check (Left e) = Left (show e)
check (Right m) = case Map.elems m of
......
......@@ -171,7 +171,7 @@ executable cabal
pretty >= 1.1 && < 1.2,
random >= 1 && < 1.2,
stm >= 2.0 && < 3,
tar >= 0.4.2 && < 0.5,
tar >= 0.5.0.1 && < 0.6,
time >= 1.4 && < 1.6,
zlib >= 0.5.3 && < 0.7
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment