From 1851bf475680af8951eef8fc7c34a985bf01f3fc Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 1 Apr 2022 13:01:45 +0800 Subject: [PATCH] force-version has to win over patches --- app/Foliage/CmdBuild.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Foliage/CmdBuild.hs b/app/Foliage/CmdBuild.hs index 7a26619..8a3d4c5 100644 --- a/app/Foliage/CmdBuild.hs +++ b/app/Foliage/CmdBuild.hs @@ -110,11 +110,11 @@ cmdBuild putWarn $ "⚠️ Deleting cabal project files from " ++ srcDir liftIO $ for_ projectFiles $ IO.removeFile . (srcDir ) + applyPatches inputDir srcDir pkgId + when packageForceVersion $ forcePackageVersion srcDir pkgId - applyPatches inputDir srcDir pkgId - return srcDir getPackages <- addOracle $ \GetPackages -> do