Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ fix #7251 ] sort and nub module list inferred by cabal init --lib #7253

Closed
wants to merge 1 commit into from
Closed

[ fix #7251 ] sort and nub module list inferred by cabal init --lib #7253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion cabal-install/src/Distribution/Client/Init/Command.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ import System.FilePath

import qualified Data.List.NonEmpty as NE
import qualified Data.Map as M
import qualified Data.Set as Set

import Control.Monad
( (>=>) )
import Control.Arrow
Expand Down Expand Up @@ -595,7 +597,7 @@ getModulesBuildToolsAndDeps pkgIx flags = do
let sourceFiles = filter (isSourceFile (sourceDirs flags)) sourceFiles0

Just mods <- return (exposedModules flags)
?>> (return . Just . map moduleName $ sourceFiles)
?>> (return . Just . sortNub . map moduleName $ sourceFiles)

tools <- return (buildTools flags)
?>> (return . Just . neededBuildPrograms $ sourceFiles)
Expand Down Expand Up @@ -645,6 +647,10 @@ getModulesBuildToolsAndDeps pkgIx flags = do
, otherExts = exts
}

where
sortNub :: Ord a => [a] -> [a]
sortNub = Set.toList . Set.fromList

-- | Given a list of imported modules, retrieve the list of dependencies that
-- provide those modules.
importsToDeps :: InitFlags -> [ModuleName] -> InstalledPackageIndex -> IO [P.Dependency]
Expand Down