From 32d1345276ee9d36d6cd3aeeacc7ddc74c6fc2b1 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Thu, 22 Sep 2022 13:32:05 +0200 Subject: [PATCH] Removing cabal.project is now unnecessary --- app/Foliage/CmdBuild.hs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/Foliage/CmdBuild.hs b/app/Foliage/CmdBuild.hs index 6350dc2..506a11b 100644 --- a/app/Foliage/CmdBuild.hs +++ b/app/Foliage/CmdBuild.hs @@ -8,7 +8,7 @@ import Codec.Compression.GZip qualified as GZip import Control.Monad (unless, when) import Data.ByteString.Lazy qualified as BSL import Data.Foldable (for_) -import Data.List (isPrefixOf, sortOn) +import Data.List (sortOn) import Data.Maybe (fromMaybe) import Data.Traversable (for) import Development.Shake @@ -141,12 +141,6 @@ cmdBuild 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 when packageVersionForce $