Commit 00b88a16 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Upgrade to extra-1.4.7

parent f24d8805
......@@ -122,7 +122,7 @@ executable hadrian
, Cabal == 1.22.* || == 1.24.*
, containers == 0.5.*
, directory == 1.2.*
, extra == 1.4.*
, extra >= 1.4.7
, mtl == 2.2.*
, QuickCheck >= 2.6 && < 2.9
, shake >= 0.15.6
......
......@@ -50,7 +50,7 @@ contextDependencies context@Context {..} = do
-- | Coarse-grain 'need': make sure given contexts are fully built.
needContext :: [Context] -> Action ()
needContext cs = do
libs <- fmap concat . forM cs $ \context -> do
libs <- concatForM cs $ \context -> do
libFile <- pkgLibraryFile context
lib0File <- pkgLibraryFile0 context
lib0 <- buildDll0 context
......
......@@ -115,7 +115,7 @@ moduleFilesOracle = void $ do
modules <- fmap sort . pkgDataList $ Modules path
let dirs = (path -/- "autogen") : map (pkgPath package -/-) srcDirs
modDirFiles = groupSort $ map decodeModule modules
result <- fmap concat . forM dirs $ \dir -> do
result <- concatForM dirs $ \dir -> do
todo <- filterM (doesDirectoryExist . (dir -/-) . fst) modDirFiles
forM todo $ \(mDir, mFiles) -> do
let fullDir = unifyPath $ dir -/- mDir
......
......@@ -36,7 +36,7 @@ buildPackageLibrary context@Context {..} = do
split <- interpretInContext context splitObjects
splitObjs <- if not split then return hObjs else -- TODO: make clearer!
fmap concat $ forM hSrcs $ \src -> do
concatForM hSrcs $ \src -> do
let splitPath = path -/- src ++ "_" ++ osuf way ++ "_split"
contents <- liftIO $ IO.getDirectoryContents splitPath
return . map (splitPath -/-)
......
Supports Markdown
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