diff --git a/cabal-install/Distribution/Client/Fetch.hs b/cabal-install/Distribution/Client/Fetch.hs index cb863525c589cf1ed45464b7501fb03c12b68c05..ecfe204667e51530958e51f5a8a3d9abb3277c4a 100644 --- a/cabal-install/Distribution/Client/Fetch.hs +++ b/cabal-install/Distribution/Client/Fetch.hs @@ -87,7 +87,7 @@ fetch verbosity packageDBs repos comp platform conf transport <- configureTransport verbosity (flagToMaybe (globalHttpTransport globalFlags)) - pkgSpecifiers <- resolveUserTargets transport verbosity + pkgSpecifiers <- resolveUserTargets verbosity transport (fromFlag $ globalWorldFile globalFlags) (packageIndex sourcePkgDb) userTargets diff --git a/cabal-install/Distribution/Client/Freeze.hs b/cabal-install/Distribution/Client/Freeze.hs index 98ec58cc73aa06cc8e46454b0f89ea9babfeca6a..4d7d028d1bc35236a537b20440e55dd276a2b5c2 100644 --- a/cabal-install/Distribution/Client/Freeze.hs +++ b/cabal-install/Distribution/Client/Freeze.hs @@ -91,7 +91,7 @@ freeze verbosity packageDBs repos comp platform conf mSandboxPkgInfo transport <- configureTransport verbosity (flagToMaybe (globalHttpTransport globalFlags)) - pkgSpecifiers <- resolveUserTargets transport verbosity + pkgSpecifiers <- resolveUserTargets verbosity transport (fromFlag $ globalWorldFile globalFlags) (packageIndex sourcePkgDb) [UserTargetLocalDir "."] diff --git a/cabal-install/Distribution/Client/Get.hs b/cabal-install/Distribution/Client/Get.hs index 8fc36ea3cb1af11a97553afc27f2fb8394c7aed0..a2b882f28843f4b8d70e6495e519b1be789d2789 100644 --- a/cabal-install/Distribution/Client/Get.hs +++ b/cabal-install/Distribution/Client/Get.hs @@ -94,7 +94,7 @@ get verbosity repos globalFlags getFlags userTargets = do transport <- configureTransport verbosity (flagToMaybe (globalHttpTransport globalFlags)) - pkgSpecifiers <- resolveUserTargets transport verbosity + pkgSpecifiers <- resolveUserTargets verbosity transport (fromFlag $ globalWorldFile globalFlags) (packageIndex sourcePkgDb) userTargets diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs index 90f057b30ad5ea4b152a3f5b947a1c39fbb77a59..93c2af9f1153e36f15d07af7e9778f226154d698 100644 --- a/cabal-install/Distribution/Client/Install.hs +++ b/cabal-install/Distribution/Client/Install.hs @@ -271,7 +271,7 @@ makeInstallContext verbosity let userTargets | null userTargets0 = [UserTargetLocalDir "."] | otherwise = userTargets0 - pkgSpecifiers <- resolveUserTargets transport verbosity + pkgSpecifiers <- resolveUserTargets verbosity transport (fromFlag $ globalWorldFile globalFlags) (packageIndex sourcePkgDb) userTargets diff --git a/cabal-install/Distribution/Client/List.hs b/cabal-install/Distribution/Client/List.hs index 3ce3dd253335c1d7fd89bce666fb68b60a0eba6b..4042b3c5f9b1f7592d6b6b4ed21e8ec28d42636e 100644 --- a/cabal-install/Distribution/Client/List.hs +++ b/cabal-install/Distribution/Client/List.hs @@ -190,7 +190,7 @@ info verbosity packageDBs repos comp conf ++ map packageId (PackageIndex.allPackages sourcePkgIndex) transport <- configureTransport verbosity (flagToMaybe (globalHttpTransport globalFlags)) - pkgSpecifiers <- resolveUserTargets transport verbosity + pkgSpecifiers <- resolveUserTargets verbosity transport (fromFlag $ globalWorldFile globalFlags) sourcePkgs' userTargets diff --git a/cabal-install/Distribution/Client/Targets.hs b/cabal-install/Distribution/Client/Targets.hs index dbc5731198d98bb3bd454915ea603a56fdb437e7..25b3ec2f61d42fcb41645194b2745fcfbb727679 100644 --- a/cabal-install/Distribution/Client/Targets.hs +++ b/cabal-install/Distribution/Client/Targets.hs @@ -351,13 +351,13 @@ reportUserTargetProblems problems = do -- or they can be named packages (with or without version info). -- resolveUserTargets :: Package pkg - => HttpTransport - -> Verbosity + => Verbosity + -> HttpTransport -> FilePath -> PackageIndex pkg -> [UserTarget] -> IO [PackageSpecifier SourcePackage] -resolveUserTargets transport verbosity worldFile available userTargets = do +resolveUserTargets verbosity transport worldFile available userTargets = do -- given the user targets, get a list of fully or partially resolved -- package references