input-output-hk/foliage
1
1
Fork 0
mirror of https://github.com/input-output-hk/foliage.git synced 2024-11-30 01:16:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removing cabal.project is now unnecessary

Browse Source
This commit is contained in:
Andrea Bedini 2022-09-22 13:32:05 +02:00
parent 5c24681da8
commit 32d1345276
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Foliage/CmdBuild.hs
View File

@ -8,7 +8,7 @@ import Codec.Compression.GZip qualified as GZip
import Control.Monad (unless, when) import Control.Monad (unless, when)
import Data.ByteString.Lazy qualified as BSL import Data.ByteString.Lazy qualified as BSL
import Data.Foldable (for_) import Data.Foldable (for_)
import Data.List (isPrefixOf, sortOn) import Data.List (sortOn)
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import Data.Traversable (for) import Data.Traversable (for)
import Development.Shake import Development.Shake
@ -141,12 +141,6 @@ cmdBuild
cmd_ ["cp", "--recursive", "--no-target-directory", "--dereference", tdir, srcDir] cmd_ ["cp", "--recursive", "--no-target-directory", "--dereference", tdir, srcDir]
-- Delete cabal.project files if present
projectFiles <- liftIO $ filter ("cabal.project" `isPrefixOf`) <$> IO.getDirectoryContents srcDir
unless (null projectFiles) $ do
putWarn $ "Deleting cabal project files from " ++ srcDir
liftIO $ for_ projectFiles $ IO.removeFile . (srcDir </>)
applyPatches inputDir srcDir pkgId applyPatches inputDir srcDir pkgId
when packageVersionForce $ when packageVersionForce $