diff --git a/src/Stack/Ghci.hs b/src/Stack/Ghci.hs index cbaacfd15a..d2c7e058ef 100644 --- a/src/Stack/Ghci.hs +++ b/src/Stack/Ghci.hs @@ -589,7 +589,7 @@ wantedPackageComponents _ (TargetComps cs) _ = cs wantedPackageComponents bopts (TargetAll ProjectPackage) pkg = S.fromList $ (case packageLibraries pkg of NoLibraries -> [] - HasLibraries _names -> CLib : []) ++ -- FIXME. This ignores sub libraries and foreign libraries. Is that OK? + HasLibraries _names -> [CLib]) ++ -- FIXME. This ignores sub libraries and foreign libraries. Is that OK? map CExe (S.toList (packageExes pkg)) <> (if boptsTests bopts then map CTest (M.keys (packageTests pkg)) else []) <> (if boptsBenchmarks bopts then map CBench (S.toList (packageBenchmarks pkg)) else []) diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs index d47192939e..a288d4d347 100644 --- a/src/Stack/Package.hs +++ b/src/Stack/Package.hs @@ -336,7 +336,7 @@ packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkg return (componentModules, componentFiles, buildFiles <> dataFiles', warnings) pkgId = package pkg name = fromCabalPackageName (pkgName pkgId) - deps = M.filterWithKey (const . (not . isMe)) (M.union + deps = M.filterWithKey (const . not . isMe) (M.union (packageDependencies pkg) -- We include all custom-setup deps - if present - in the -- package deps themselves. Stack always works with the