From 0d0c00951c40394929623fdf3eddca220e7b2214 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 20 Jul 2020 12:57:14 +0300 Subject: [PATCH] Move cabal-install source to src/ --- Makefile | 6 +++--- cabal-install/cabal-install.cabal | 2 +- cabal-install/cabal-install.cabal.dev | 2 +- cabal-install/cabal-install.cabal.prod | 2 +- cabal-install/cabal-install.cabal.zinza | 4 ++-- .../{ => src}/Distribution/Client/BuildReports/Anonymous.hs | 0 .../{ => src}/Distribution/Client/BuildReports/Lens.hs | 0 .../{ => src}/Distribution/Client/BuildReports/Storage.hs | 0 .../{ => src}/Distribution/Client/BuildReports/Types.hs | 0 .../{ => src}/Distribution/Client/BuildReports/Upload.hs | 0 cabal-install/{ => src}/Distribution/Client/Check.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdBench.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdBuild.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdClean.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdConfigure.hs | 0 .../{ => src}/Distribution/Client/CmdErrorMessages.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdExec.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdFreeze.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdHaddock.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdInstall.hs | 0 .../Distribution/Client/CmdInstall/ClientInstallFlags.hs | 0 .../Client/CmdInstall/ClientInstallTargetSelector.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdLegacy.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdListBin.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdRepl.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdRun.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdSdist.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdTest.hs | 0 cabal-install/{ => src}/Distribution/Client/CmdUpdate.hs | 0 .../{ => src}/Distribution/Client/Compat/Directory.hs | 0 .../{ => src}/Distribution/Client/Compat/ExecutablePath.hs | 0 .../{ => src}/Distribution/Client/Compat/FilePerms.hs | 0 .../{ => src}/Distribution/Client/Compat/Orphans.hs | 0 .../{ => src}/Distribution/Client/Compat/Prelude.hs | 0 .../{ => src}/Distribution/Client/Compat/Process.hs | 0 .../{ => src}/Distribution/Client/Compat/Semaphore.hs | 0 cabal-install/{ => src}/Distribution/Client/Config.hs | 0 cabal-install/{ => src}/Distribution/Client/Configure.hs | 0 cabal-install/{ => src}/Distribution/Client/Dependency.hs | 0 .../{ => src}/Distribution/Client/Dependency/Types.hs | 0 .../{ => src}/Distribution/Client/DistDirLayout.hs | 0 cabal-install/{ => src}/Distribution/Client/Exec.hs | 0 cabal-install/{ => src}/Distribution/Client/Fetch.hs | 0 cabal-install/{ => src}/Distribution/Client/FetchUtils.hs | 0 cabal-install/{ => src}/Distribution/Client/FileMonitor.hs | 0 cabal-install/{ => src}/Distribution/Client/Freeze.hs | 0 cabal-install/{ => src}/Distribution/Client/GZipUtils.hs | 0 cabal-install/{ => src}/Distribution/Client/GenBounds.hs | 0 cabal-install/{ => src}/Distribution/Client/Get.hs | 0 cabal-install/{ => src}/Distribution/Client/Glob.hs | 0 cabal-install/{ => src}/Distribution/Client/GlobalFlags.hs | 0 cabal-install/{ => src}/Distribution/Client/Haddock.hs | 0 cabal-install/{ => src}/Distribution/Client/HashValue.hs | 0 cabal-install/{ => src}/Distribution/Client/HttpUtils.hs | 0 cabal-install/{ => src}/Distribution/Client/IndexUtils.hs | 0 .../{ => src}/Distribution/Client/IndexUtils/ActiveRepos.hs | 0 .../{ => src}/Distribution/Client/IndexUtils/IndexState.hs | 0 .../{ => src}/Distribution/Client/IndexUtils/Timestamp.hs | 0 cabal-install/{ => src}/Distribution/Client/Init.hs | 0 cabal-install/{ => src}/Distribution/Client/Init/Command.hs | 0 .../{ => src}/Distribution/Client/Init/Defaults.hs | 0 .../{ => src}/Distribution/Client/Init/FileCreators.hs | 0 .../{ => src}/Distribution/Client/Init/Heuristics.hs | 0 .../{ => src}/Distribution/Client/Init/Licenses.hs | 0 cabal-install/{ => src}/Distribution/Client/Init/Prompt.hs | 0 cabal-install/{ => src}/Distribution/Client/Init/Types.hs | 0 cabal-install/{ => src}/Distribution/Client/Init/Utils.hs | 0 cabal-install/{ => src}/Distribution/Client/Install.hs | 0 cabal-install/{ => src}/Distribution/Client/InstallPlan.hs | 0 .../{ => src}/Distribution/Client/InstallSymlink.hs | 0 cabal-install/{ => src}/Distribution/Client/JobControl.hs | 0 cabal-install/{ => src}/Distribution/Client/List.hs | 0 cabal-install/{ => src}/Distribution/Client/Manpage.hs | 0 cabal-install/{ => src}/Distribution/Client/ManpageFlags.hs | 0 cabal-install/{ => src}/Distribution/Client/Nix.hs | 0 .../{ => src}/Distribution/Client/NixStyleOptions.hs | 0 cabal-install/{ => src}/Distribution/Client/Outdated.hs | 0 cabal-install/{ => src}/Distribution/Client/PackageHash.hs | 0 cabal-install/{ => src}/Distribution/Client/ParseUtils.hs | 0 .../{ => src}/Distribution/Client/ProjectBuilding.hs | 0 .../{ => src}/Distribution/Client/ProjectBuilding/Types.hs | 0 .../{ => src}/Distribution/Client/ProjectConfig.hs | 0 .../{ => src}/Distribution/Client/ProjectConfig/Legacy.hs | 0 .../{ => src}/Distribution/Client/ProjectConfig/Types.hs | 0 cabal-install/{ => src}/Distribution/Client/ProjectFlags.hs | 0 .../{ => src}/Distribution/Client/ProjectOrchestration.hs | 0 .../{ => src}/Distribution/Client/ProjectPlanOutput.hs | 0 .../{ => src}/Distribution/Client/ProjectPlanning.hs | 0 .../{ => src}/Distribution/Client/ProjectPlanning/Types.hs | 0 cabal-install/{ => src}/Distribution/Client/RebuildMonad.hs | 0 cabal-install/{ => src}/Distribution/Client/Reconfigure.hs | 0 cabal-install/{ => src}/Distribution/Client/Run.hs | 0 cabal-install/{ => src}/Distribution/Client/Sandbox.hs | 0 .../Distribution/Client/Sandbox/PackageEnvironment.hs | 0 cabal-install/{ => src}/Distribution/Client/SavedFlags.hs | 0 cabal-install/{ => src}/Distribution/Client/Security/DNS.hs | 0 .../{ => src}/Distribution/Client/Security/HTTP.hs | 0 cabal-install/{ => src}/Distribution/Client/Setup.hs | 0 cabal-install/{ => src}/Distribution/Client/SetupWrapper.hs | 0 .../{ => src}/Distribution/Client/SolverInstallPlan.hs | 0 cabal-install/{ => src}/Distribution/Client/SourceFiles.hs | 0 cabal-install/{ => src}/Distribution/Client/SrcDist.hs | 0 cabal-install/{ => src}/Distribution/Client/Store.hs | 0 cabal-install/{ => src}/Distribution/Client/Tar.hs | 0 .../{ => src}/Distribution/Client/TargetProblem.hs | 0 .../{ => src}/Distribution/Client/TargetSelector.hs | 0 cabal-install/{ => src}/Distribution/Client/Targets.hs | 0 cabal-install/{ => src}/Distribution/Client/Types.hs | 0 .../{ => src}/Distribution/Client/Types/AllowNewer.hs | 0 .../{ => src}/Distribution/Client/Types/BuildResults.hs | 0 .../{ => src}/Distribution/Client/Types/ConfiguredId.hs | 0 .../Distribution/Client/Types/ConfiguredPackage.hs | 0 .../{ => src}/Distribution/Client/Types/Credentials.hs | 0 .../{ => src}/Distribution/Client/Types/InstallMethod.hs | 0 .../{ => src}/Distribution/Client/Types/OverwritePolicy.hs | 0 .../{ => src}/Distribution/Client/Types/PackageLocation.hs | 0 .../{ => src}/Distribution/Client/Types/PackageSpecifier.hs | 0 .../{ => src}/Distribution/Client/Types/ReadyPackage.hs | 0 cabal-install/{ => src}/Distribution/Client/Types/Repo.hs | 0 .../{ => src}/Distribution/Client/Types/RepoName.hs | 0 .../{ => src}/Distribution/Client/Types/SourcePackageDb.hs | 0 .../{ => src}/Distribution/Client/Types/SourceRepo.hs | 0 .../Client/Types/WriteGhcEnvironmentFilesPolicy.hs | 0 cabal-install/{ => src}/Distribution/Client/Update.hs | 0 cabal-install/{ => src}/Distribution/Client/Upload.hs | 0 cabal-install/{ => src}/Distribution/Client/Utils.hs | 0 .../{ => src}/Distribution/Client/Utils/Assertion.hs | 0 cabal-install/{ => src}/Distribution/Client/Utils/Json.hs | 0 cabal-install/{ => src}/Distribution/Client/Utils/Parsec.hs | 0 cabal-install/{ => src}/Distribution/Client/VCS.hs | 0 .../{ => src}/Distribution/Client/Win32SelfUpgrade.hs | 0 cabal-install/{ => src}/Distribution/Client/World.hs | 0 .../{ => src}/Distribution/Deprecated/ParseUtils.hs | 0 cabal-install/{ => src}/Distribution/Deprecated/ReadP.hs | 0 .../{ => src}/Distribution/Deprecated/ViewAsFieldDescr.hs | 0 .../{ => src}/Distribution/Solver/Compat/Prelude.hs | 0 cabal-install/{ => src}/Distribution/Solver/Modular.hs | 0 .../{ => src}/Distribution/Solver/Modular/Assignment.hs | 0 .../{ => src}/Distribution/Solver/Modular/Builder.hs | 0 .../{ => src}/Distribution/Solver/Modular/Configured.hs | 0 .../Distribution/Solver/Modular/ConfiguredConversion.hs | 0 .../{ => src}/Distribution/Solver/Modular/ConflictSet.hs | 0 .../{ => src}/Distribution/Solver/Modular/Cycles.hs | 0 .../{ => src}/Distribution/Solver/Modular/Dependency.hs | 0 .../{ => src}/Distribution/Solver/Modular/Explore.hs | 0 cabal-install/{ => src}/Distribution/Solver/Modular/Flag.hs | 0 .../{ => src}/Distribution/Solver/Modular/Index.hs | 0 .../Distribution/Solver/Modular/IndexConversion.hs | 0 .../{ => src}/Distribution/Solver/Modular/LabeledGraph.hs | 0 .../{ => src}/Distribution/Solver/Modular/Linking.hs | 0 cabal-install/{ => src}/Distribution/Solver/Modular/Log.hs | 0 .../{ => src}/Distribution/Solver/Modular/Message.hs | 0 cabal-install/{ => src}/Distribution/Solver/Modular/PSQ.hs | 0 .../{ => src}/Distribution/Solver/Modular/Package.hs | 0 .../{ => src}/Distribution/Solver/Modular/Preference.hs | 0 .../{ => src}/Distribution/Solver/Modular/RetryLog.hs | 0 .../{ => src}/Distribution/Solver/Modular/Solver.hs | 0 cabal-install/{ => src}/Distribution/Solver/Modular/Tree.hs | 0 .../{ => src}/Distribution/Solver/Modular/Validate.hs | 0 cabal-install/{ => src}/Distribution/Solver/Modular/Var.hs | 0 .../{ => src}/Distribution/Solver/Modular/Version.hs | 0 .../{ => src}/Distribution/Solver/Modular/WeightedPSQ.hs | 0 .../{ => src}/Distribution/Solver/Types/ComponentDeps.hs | 0 .../{ => src}/Distribution/Solver/Types/ConstraintSource.hs | 0 .../Distribution/Solver/Types/DependencyResolver.hs | 0 cabal-install/{ => src}/Distribution/Solver/Types/Flag.hs | 0 .../Distribution/Solver/Types/InstSolverPackage.hs | 0 .../Distribution/Solver/Types/InstalledPreference.hs | 0 .../Distribution/Solver/Types/LabeledPackageConstraint.hs | 0 .../{ => src}/Distribution/Solver/Types/OptionalStanza.hs | 0 .../Distribution/Solver/Types/PackageConstraint.hs | 0 .../{ => src}/Distribution/Solver/Types/PackageFixedDeps.hs | 0 .../{ => src}/Distribution/Solver/Types/PackageIndex.hs | 0 .../{ => src}/Distribution/Solver/Types/PackagePath.hs | 0 .../Distribution/Solver/Types/PackagePreferences.hs | 0 .../{ => src}/Distribution/Solver/Types/PkgConfigDb.hs | 0 .../{ => src}/Distribution/Solver/Types/Progress.hs | 0 .../{ => src}/Distribution/Solver/Types/ResolverPackage.hs | 0 .../{ => src}/Distribution/Solver/Types/Settings.hs | 0 .../{ => src}/Distribution/Solver/Types/SolverId.hs | 0 .../{ => src}/Distribution/Solver/Types/SolverPackage.hs | 0 .../{ => src}/Distribution/Solver/Types/SourcePackage.hs | 0 .../{ => src}/Distribution/Solver/Types/Variable.hs | 0 183 files changed, 8 insertions(+), 8 deletions(-) rename cabal-install/{ => src}/Distribution/Client/BuildReports/Anonymous.hs (100%) rename cabal-install/{ => src}/Distribution/Client/BuildReports/Lens.hs (100%) rename cabal-install/{ => src}/Distribution/Client/BuildReports/Storage.hs (100%) rename cabal-install/{ => src}/Distribution/Client/BuildReports/Types.hs (100%) rename cabal-install/{ => src}/Distribution/Client/BuildReports/Upload.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Check.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdBench.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdBuild.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdClean.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdConfigure.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdErrorMessages.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdExec.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdFreeze.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdHaddock.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdInstall.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdInstall/ClientInstallFlags.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdInstall/ClientInstallTargetSelector.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdLegacy.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdListBin.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdRepl.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdRun.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdSdist.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdTest.hs (100%) rename cabal-install/{ => src}/Distribution/Client/CmdUpdate.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Compat/Directory.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Compat/ExecutablePath.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Compat/FilePerms.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Compat/Orphans.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Compat/Prelude.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Compat/Process.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Compat/Semaphore.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Config.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Configure.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Dependency.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Dependency/Types.hs (100%) rename cabal-install/{ => src}/Distribution/Client/DistDirLayout.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Exec.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Fetch.hs (100%) rename cabal-install/{ => src}/Distribution/Client/FetchUtils.hs (100%) rename cabal-install/{ => src}/Distribution/Client/FileMonitor.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Freeze.hs (100%) rename cabal-install/{ => src}/Distribution/Client/GZipUtils.hs (100%) rename cabal-install/{ => src}/Distribution/Client/GenBounds.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Get.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Glob.hs (100%) rename cabal-install/{ => src}/Distribution/Client/GlobalFlags.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Haddock.hs (100%) rename cabal-install/{ => src}/Distribution/Client/HashValue.hs (100%) rename cabal-install/{ => src}/Distribution/Client/HttpUtils.hs (100%) rename cabal-install/{ => src}/Distribution/Client/IndexUtils.hs (100%) rename cabal-install/{ => src}/Distribution/Client/IndexUtils/ActiveRepos.hs (100%) rename cabal-install/{ => src}/Distribution/Client/IndexUtils/IndexState.hs (100%) rename cabal-install/{ => src}/Distribution/Client/IndexUtils/Timestamp.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Init.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Init/Command.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Init/Defaults.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Init/FileCreators.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Init/Heuristics.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Init/Licenses.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Init/Prompt.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Init/Types.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Init/Utils.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Install.hs (100%) rename cabal-install/{ => src}/Distribution/Client/InstallPlan.hs (100%) rename cabal-install/{ => src}/Distribution/Client/InstallSymlink.hs (100%) rename cabal-install/{ => src}/Distribution/Client/JobControl.hs (100%) rename cabal-install/{ => src}/Distribution/Client/List.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Manpage.hs (100%) rename cabal-install/{ => src}/Distribution/Client/ManpageFlags.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Nix.hs (100%) rename cabal-install/{ => src}/Distribution/Client/NixStyleOptions.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Outdated.hs (100%) rename cabal-install/{ => src}/Distribution/Client/PackageHash.hs (100%) rename cabal-install/{ => src}/Distribution/Client/ParseUtils.hs (100%) rename cabal-install/{ => src}/Distribution/Client/ProjectBuilding.hs (100%) rename cabal-install/{ => src}/Distribution/Client/ProjectBuilding/Types.hs (100%) rename cabal-install/{ => src}/Distribution/Client/ProjectConfig.hs (100%) rename cabal-install/{ => src}/Distribution/Client/ProjectConfig/Legacy.hs (100%) rename cabal-install/{ => src}/Distribution/Client/ProjectConfig/Types.hs (100%) rename cabal-install/{ => src}/Distribution/Client/ProjectFlags.hs (100%) rename cabal-install/{ => src}/Distribution/Client/ProjectOrchestration.hs (100%) rename cabal-install/{ => src}/Distribution/Client/ProjectPlanOutput.hs (100%) rename cabal-install/{ => src}/Distribution/Client/ProjectPlanning.hs (100%) rename cabal-install/{ => src}/Distribution/Client/ProjectPlanning/Types.hs (100%) rename cabal-install/{ => src}/Distribution/Client/RebuildMonad.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Reconfigure.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Run.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Sandbox.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Sandbox/PackageEnvironment.hs (100%) rename cabal-install/{ => src}/Distribution/Client/SavedFlags.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Security/DNS.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Security/HTTP.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Setup.hs (100%) rename cabal-install/{ => src}/Distribution/Client/SetupWrapper.hs (100%) rename cabal-install/{ => src}/Distribution/Client/SolverInstallPlan.hs (100%) rename cabal-install/{ => src}/Distribution/Client/SourceFiles.hs (100%) rename cabal-install/{ => src}/Distribution/Client/SrcDist.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Store.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Tar.hs (100%) rename cabal-install/{ => src}/Distribution/Client/TargetProblem.hs (100%) rename cabal-install/{ => src}/Distribution/Client/TargetSelector.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Targets.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/AllowNewer.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/BuildResults.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/ConfiguredId.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/ConfiguredPackage.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/Credentials.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/InstallMethod.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/OverwritePolicy.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/PackageLocation.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/PackageSpecifier.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/ReadyPackage.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/Repo.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/RepoName.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/SourcePackageDb.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/SourceRepo.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Types/WriteGhcEnvironmentFilesPolicy.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Update.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Upload.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Utils.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Utils/Assertion.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Utils/Json.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Utils/Parsec.hs (100%) rename cabal-install/{ => src}/Distribution/Client/VCS.hs (100%) rename cabal-install/{ => src}/Distribution/Client/Win32SelfUpgrade.hs (100%) rename cabal-install/{ => src}/Distribution/Client/World.hs (100%) rename cabal-install/{ => src}/Distribution/Deprecated/ParseUtils.hs (100%) rename cabal-install/{ => src}/Distribution/Deprecated/ReadP.hs (100%) rename cabal-install/{ => src}/Distribution/Deprecated/ViewAsFieldDescr.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Compat/Prelude.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Assignment.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Builder.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Configured.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/ConfiguredConversion.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/ConflictSet.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Cycles.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Dependency.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Explore.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Flag.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Index.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/IndexConversion.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/LabeledGraph.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Linking.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Log.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Message.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/PSQ.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Package.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Preference.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/RetryLog.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Solver.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Tree.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Validate.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Var.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/Version.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Modular/WeightedPSQ.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/ComponentDeps.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/ConstraintSource.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/DependencyResolver.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/Flag.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/InstSolverPackage.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/InstalledPreference.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/LabeledPackageConstraint.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/OptionalStanza.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/PackageConstraint.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/PackageFixedDeps.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/PackageIndex.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/PackagePath.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/PackagePreferences.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/PkgConfigDb.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/Progress.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/ResolverPackage.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/Settings.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/SolverId.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/SolverPackage.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/SourcePackage.hs (100%) rename cabal-install/{ => src}/Distribution/Solver/Types/Variable.hs (100%) diff --git a/Makefile b/Makefile index f915b8214a8..73241ea0867 100644 --- a/Makefile +++ b/Makefile @@ -89,7 +89,7 @@ gen-extra-source-files-lib : # analyse-imports analyse-imports : phony - find Cabal/src cabal-install/Distribution -type f -name '*.hs' | xargs cabal v2-run --builddir=dist-newstyle-meta --project-file=cabal.project.meta analyse-imports -- + find Cabal/src cabal-install/src -type f -name '*.hs' | xargs cabal v2-run --builddir=dist-newstyle-meta --project-file=cabal.project.meta analyse-imports -- # github actions github-actions : .github/workflows/artifacts.yml @@ -123,7 +123,7 @@ doctest : # This is not run as part of validate.sh (we need hackage-security, which is tricky to get). doctest-cli : - doctest -D__DOCTEST__ --fast cabal-install/Distribution + doctest -D__DOCTEST__ --fast cabal-install/src # tests @@ -225,7 +225,7 @@ weeder : # tags .PHONY : tags tags : - hasktags -b Cabal/src Cabal/Cabal-described/src cabal-install/Distribution cabal-testsuite/src + hasktags -b Cabal/src Cabal/Cabal-described/src cabal-install/src cabal-testsuite/src # documentation ############################################################################## diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index 55b920565aa..fc22996c2e0 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -149,7 +149,7 @@ executable cabal -- On AIX, some legacy BSD operations such as flock(2) are provided by libbsd.a if os(aix) extra-libraries: bsd - hs-source-dirs: . + hs-source-dirs: src other-modules: -- this modules are moved from Cabal -- they are needed for as long until cabal-install moves to parsec parser diff --git a/cabal-install/cabal-install.cabal.dev b/cabal-install/cabal-install.cabal.dev index e38497c7ae2..2982a90b6da 100644 --- a/cabal-install/cabal-install.cabal.dev +++ b/cabal-install/cabal-install.cabal.dev @@ -141,7 +141,7 @@ library cabal-lib-client if impl(ghc < 8.8) ghc-options: -Wnoncanonical-monadfail-instances - hs-source-dirs: . + hs-source-dirs: src exposed-modules: -- this modules are moved from Cabal -- they are needed for as long until cabal-install moves to parsec parser diff --git a/cabal-install/cabal-install.cabal.prod b/cabal-install/cabal-install.cabal.prod index 55b920565aa..fc22996c2e0 100644 --- a/cabal-install/cabal-install.cabal.prod +++ b/cabal-install/cabal-install.cabal.prod @@ -149,7 +149,7 @@ executable cabal -- On AIX, some legacy BSD operations such as flock(2) are provided by libbsd.a if os(aix) extra-libraries: bsd - hs-source-dirs: . + hs-source-dirs: src other-modules: -- this modules are moved from Cabal -- they are needed for as long until cabal-install moves to parsec parser diff --git a/cabal-install/cabal-install.cabal.zinza b/cabal-install/cabal-install.cabal.zinza index da852b00045..1ec0df6d620 100644 --- a/cabal-install/cabal-install.cabal.zinza +++ b/cabal-install/cabal-install.cabal.zinza @@ -419,7 +419,7 @@ Flag lukko {% if dev %} library cabal-lib-client {% useblock componentCommon %} - hs-source-dirs: . + hs-source-dirs: src {% useblock buildInfo %} library cabal-install-solver-dsl @@ -457,7 +457,7 @@ executable cabal other-modules: Paths_cabal_install {% else %} - hs-source-dirs: . + hs-source-dirs: src {% useblock buildInfo %} {% endif %} {############################################################################} diff --git a/cabal-install/Distribution/Client/BuildReports/Anonymous.hs b/cabal-install/src/Distribution/Client/BuildReports/Anonymous.hs similarity index 100% rename from cabal-install/Distribution/Client/BuildReports/Anonymous.hs rename to cabal-install/src/Distribution/Client/BuildReports/Anonymous.hs diff --git a/cabal-install/Distribution/Client/BuildReports/Lens.hs b/cabal-install/src/Distribution/Client/BuildReports/Lens.hs similarity index 100% rename from cabal-install/Distribution/Client/BuildReports/Lens.hs rename to cabal-install/src/Distribution/Client/BuildReports/Lens.hs diff --git a/cabal-install/Distribution/Client/BuildReports/Storage.hs b/cabal-install/src/Distribution/Client/BuildReports/Storage.hs similarity index 100% rename from cabal-install/Distribution/Client/BuildReports/Storage.hs rename to cabal-install/src/Distribution/Client/BuildReports/Storage.hs diff --git a/cabal-install/Distribution/Client/BuildReports/Types.hs b/cabal-install/src/Distribution/Client/BuildReports/Types.hs similarity index 100% rename from cabal-install/Distribution/Client/BuildReports/Types.hs rename to cabal-install/src/Distribution/Client/BuildReports/Types.hs diff --git a/cabal-install/Distribution/Client/BuildReports/Upload.hs b/cabal-install/src/Distribution/Client/BuildReports/Upload.hs similarity index 100% rename from cabal-install/Distribution/Client/BuildReports/Upload.hs rename to cabal-install/src/Distribution/Client/BuildReports/Upload.hs diff --git a/cabal-install/Distribution/Client/Check.hs b/cabal-install/src/Distribution/Client/Check.hs similarity index 100% rename from cabal-install/Distribution/Client/Check.hs rename to cabal-install/src/Distribution/Client/Check.hs diff --git a/cabal-install/Distribution/Client/CmdBench.hs b/cabal-install/src/Distribution/Client/CmdBench.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdBench.hs rename to cabal-install/src/Distribution/Client/CmdBench.hs diff --git a/cabal-install/Distribution/Client/CmdBuild.hs b/cabal-install/src/Distribution/Client/CmdBuild.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdBuild.hs rename to cabal-install/src/Distribution/Client/CmdBuild.hs diff --git a/cabal-install/Distribution/Client/CmdClean.hs b/cabal-install/src/Distribution/Client/CmdClean.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdClean.hs rename to cabal-install/src/Distribution/Client/CmdClean.hs diff --git a/cabal-install/Distribution/Client/CmdConfigure.hs b/cabal-install/src/Distribution/Client/CmdConfigure.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdConfigure.hs rename to cabal-install/src/Distribution/Client/CmdConfigure.hs diff --git a/cabal-install/Distribution/Client/CmdErrorMessages.hs b/cabal-install/src/Distribution/Client/CmdErrorMessages.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdErrorMessages.hs rename to cabal-install/src/Distribution/Client/CmdErrorMessages.hs diff --git a/cabal-install/Distribution/Client/CmdExec.hs b/cabal-install/src/Distribution/Client/CmdExec.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdExec.hs rename to cabal-install/src/Distribution/Client/CmdExec.hs diff --git a/cabal-install/Distribution/Client/CmdFreeze.hs b/cabal-install/src/Distribution/Client/CmdFreeze.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdFreeze.hs rename to cabal-install/src/Distribution/Client/CmdFreeze.hs diff --git a/cabal-install/Distribution/Client/CmdHaddock.hs b/cabal-install/src/Distribution/Client/CmdHaddock.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdHaddock.hs rename to cabal-install/src/Distribution/Client/CmdHaddock.hs diff --git a/cabal-install/Distribution/Client/CmdInstall.hs b/cabal-install/src/Distribution/Client/CmdInstall.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdInstall.hs rename to cabal-install/src/Distribution/Client/CmdInstall.hs diff --git a/cabal-install/Distribution/Client/CmdInstall/ClientInstallFlags.hs b/cabal-install/src/Distribution/Client/CmdInstall/ClientInstallFlags.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdInstall/ClientInstallFlags.hs rename to cabal-install/src/Distribution/Client/CmdInstall/ClientInstallFlags.hs diff --git a/cabal-install/Distribution/Client/CmdInstall/ClientInstallTargetSelector.hs b/cabal-install/src/Distribution/Client/CmdInstall/ClientInstallTargetSelector.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdInstall/ClientInstallTargetSelector.hs rename to cabal-install/src/Distribution/Client/CmdInstall/ClientInstallTargetSelector.hs diff --git a/cabal-install/Distribution/Client/CmdLegacy.hs b/cabal-install/src/Distribution/Client/CmdLegacy.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdLegacy.hs rename to cabal-install/src/Distribution/Client/CmdLegacy.hs diff --git a/cabal-install/Distribution/Client/CmdListBin.hs b/cabal-install/src/Distribution/Client/CmdListBin.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdListBin.hs rename to cabal-install/src/Distribution/Client/CmdListBin.hs diff --git a/cabal-install/Distribution/Client/CmdRepl.hs b/cabal-install/src/Distribution/Client/CmdRepl.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdRepl.hs rename to cabal-install/src/Distribution/Client/CmdRepl.hs diff --git a/cabal-install/Distribution/Client/CmdRun.hs b/cabal-install/src/Distribution/Client/CmdRun.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdRun.hs rename to cabal-install/src/Distribution/Client/CmdRun.hs diff --git a/cabal-install/Distribution/Client/CmdSdist.hs b/cabal-install/src/Distribution/Client/CmdSdist.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdSdist.hs rename to cabal-install/src/Distribution/Client/CmdSdist.hs diff --git a/cabal-install/Distribution/Client/CmdTest.hs b/cabal-install/src/Distribution/Client/CmdTest.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdTest.hs rename to cabal-install/src/Distribution/Client/CmdTest.hs diff --git a/cabal-install/Distribution/Client/CmdUpdate.hs b/cabal-install/src/Distribution/Client/CmdUpdate.hs similarity index 100% rename from cabal-install/Distribution/Client/CmdUpdate.hs rename to cabal-install/src/Distribution/Client/CmdUpdate.hs diff --git a/cabal-install/Distribution/Client/Compat/Directory.hs b/cabal-install/src/Distribution/Client/Compat/Directory.hs similarity index 100% rename from cabal-install/Distribution/Client/Compat/Directory.hs rename to cabal-install/src/Distribution/Client/Compat/Directory.hs diff --git a/cabal-install/Distribution/Client/Compat/ExecutablePath.hs b/cabal-install/src/Distribution/Client/Compat/ExecutablePath.hs similarity index 100% rename from cabal-install/Distribution/Client/Compat/ExecutablePath.hs rename to cabal-install/src/Distribution/Client/Compat/ExecutablePath.hs diff --git a/cabal-install/Distribution/Client/Compat/FilePerms.hs b/cabal-install/src/Distribution/Client/Compat/FilePerms.hs similarity index 100% rename from cabal-install/Distribution/Client/Compat/FilePerms.hs rename to cabal-install/src/Distribution/Client/Compat/FilePerms.hs diff --git a/cabal-install/Distribution/Client/Compat/Orphans.hs b/cabal-install/src/Distribution/Client/Compat/Orphans.hs similarity index 100% rename from cabal-install/Distribution/Client/Compat/Orphans.hs rename to cabal-install/src/Distribution/Client/Compat/Orphans.hs diff --git a/cabal-install/Distribution/Client/Compat/Prelude.hs b/cabal-install/src/Distribution/Client/Compat/Prelude.hs similarity index 100% rename from cabal-install/Distribution/Client/Compat/Prelude.hs rename to cabal-install/src/Distribution/Client/Compat/Prelude.hs diff --git a/cabal-install/Distribution/Client/Compat/Process.hs b/cabal-install/src/Distribution/Client/Compat/Process.hs similarity index 100% rename from cabal-install/Distribution/Client/Compat/Process.hs rename to cabal-install/src/Distribution/Client/Compat/Process.hs diff --git a/cabal-install/Distribution/Client/Compat/Semaphore.hs b/cabal-install/src/Distribution/Client/Compat/Semaphore.hs similarity index 100% rename from cabal-install/Distribution/Client/Compat/Semaphore.hs rename to cabal-install/src/Distribution/Client/Compat/Semaphore.hs diff --git a/cabal-install/Distribution/Client/Config.hs b/cabal-install/src/Distribution/Client/Config.hs similarity index 100% rename from cabal-install/Distribution/Client/Config.hs rename to cabal-install/src/Distribution/Client/Config.hs diff --git a/cabal-install/Distribution/Client/Configure.hs b/cabal-install/src/Distribution/Client/Configure.hs similarity index 100% rename from cabal-install/Distribution/Client/Configure.hs rename to cabal-install/src/Distribution/Client/Configure.hs diff --git a/cabal-install/Distribution/Client/Dependency.hs b/cabal-install/src/Distribution/Client/Dependency.hs similarity index 100% rename from cabal-install/Distribution/Client/Dependency.hs rename to cabal-install/src/Distribution/Client/Dependency.hs diff --git a/cabal-install/Distribution/Client/Dependency/Types.hs b/cabal-install/src/Distribution/Client/Dependency/Types.hs similarity index 100% rename from cabal-install/Distribution/Client/Dependency/Types.hs rename to cabal-install/src/Distribution/Client/Dependency/Types.hs diff --git a/cabal-install/Distribution/Client/DistDirLayout.hs b/cabal-install/src/Distribution/Client/DistDirLayout.hs similarity index 100% rename from cabal-install/Distribution/Client/DistDirLayout.hs rename to cabal-install/src/Distribution/Client/DistDirLayout.hs diff --git a/cabal-install/Distribution/Client/Exec.hs b/cabal-install/src/Distribution/Client/Exec.hs similarity index 100% rename from cabal-install/Distribution/Client/Exec.hs rename to cabal-install/src/Distribution/Client/Exec.hs diff --git a/cabal-install/Distribution/Client/Fetch.hs b/cabal-install/src/Distribution/Client/Fetch.hs similarity index 100% rename from cabal-install/Distribution/Client/Fetch.hs rename to cabal-install/src/Distribution/Client/Fetch.hs diff --git a/cabal-install/Distribution/Client/FetchUtils.hs b/cabal-install/src/Distribution/Client/FetchUtils.hs similarity index 100% rename from cabal-install/Distribution/Client/FetchUtils.hs rename to cabal-install/src/Distribution/Client/FetchUtils.hs diff --git a/cabal-install/Distribution/Client/FileMonitor.hs b/cabal-install/src/Distribution/Client/FileMonitor.hs similarity index 100% rename from cabal-install/Distribution/Client/FileMonitor.hs rename to cabal-install/src/Distribution/Client/FileMonitor.hs diff --git a/cabal-install/Distribution/Client/Freeze.hs b/cabal-install/src/Distribution/Client/Freeze.hs similarity index 100% rename from cabal-install/Distribution/Client/Freeze.hs rename to cabal-install/src/Distribution/Client/Freeze.hs diff --git a/cabal-install/Distribution/Client/GZipUtils.hs b/cabal-install/src/Distribution/Client/GZipUtils.hs similarity index 100% rename from cabal-install/Distribution/Client/GZipUtils.hs rename to cabal-install/src/Distribution/Client/GZipUtils.hs diff --git a/cabal-install/Distribution/Client/GenBounds.hs b/cabal-install/src/Distribution/Client/GenBounds.hs similarity index 100% rename from cabal-install/Distribution/Client/GenBounds.hs rename to cabal-install/src/Distribution/Client/GenBounds.hs diff --git a/cabal-install/Distribution/Client/Get.hs b/cabal-install/src/Distribution/Client/Get.hs similarity index 100% rename from cabal-install/Distribution/Client/Get.hs rename to cabal-install/src/Distribution/Client/Get.hs diff --git a/cabal-install/Distribution/Client/Glob.hs b/cabal-install/src/Distribution/Client/Glob.hs similarity index 100% rename from cabal-install/Distribution/Client/Glob.hs rename to cabal-install/src/Distribution/Client/Glob.hs diff --git a/cabal-install/Distribution/Client/GlobalFlags.hs b/cabal-install/src/Distribution/Client/GlobalFlags.hs similarity index 100% rename from cabal-install/Distribution/Client/GlobalFlags.hs rename to cabal-install/src/Distribution/Client/GlobalFlags.hs diff --git a/cabal-install/Distribution/Client/Haddock.hs b/cabal-install/src/Distribution/Client/Haddock.hs similarity index 100% rename from cabal-install/Distribution/Client/Haddock.hs rename to cabal-install/src/Distribution/Client/Haddock.hs diff --git a/cabal-install/Distribution/Client/HashValue.hs b/cabal-install/src/Distribution/Client/HashValue.hs similarity index 100% rename from cabal-install/Distribution/Client/HashValue.hs rename to cabal-install/src/Distribution/Client/HashValue.hs diff --git a/cabal-install/Distribution/Client/HttpUtils.hs b/cabal-install/src/Distribution/Client/HttpUtils.hs similarity index 100% rename from cabal-install/Distribution/Client/HttpUtils.hs rename to cabal-install/src/Distribution/Client/HttpUtils.hs diff --git a/cabal-install/Distribution/Client/IndexUtils.hs b/cabal-install/src/Distribution/Client/IndexUtils.hs similarity index 100% rename from cabal-install/Distribution/Client/IndexUtils.hs rename to cabal-install/src/Distribution/Client/IndexUtils.hs diff --git a/cabal-install/Distribution/Client/IndexUtils/ActiveRepos.hs b/cabal-install/src/Distribution/Client/IndexUtils/ActiveRepos.hs similarity index 100% rename from cabal-install/Distribution/Client/IndexUtils/ActiveRepos.hs rename to cabal-install/src/Distribution/Client/IndexUtils/ActiveRepos.hs diff --git a/cabal-install/Distribution/Client/IndexUtils/IndexState.hs b/cabal-install/src/Distribution/Client/IndexUtils/IndexState.hs similarity index 100% rename from cabal-install/Distribution/Client/IndexUtils/IndexState.hs rename to cabal-install/src/Distribution/Client/IndexUtils/IndexState.hs diff --git a/cabal-install/Distribution/Client/IndexUtils/Timestamp.hs b/cabal-install/src/Distribution/Client/IndexUtils/Timestamp.hs similarity index 100% rename from cabal-install/Distribution/Client/IndexUtils/Timestamp.hs rename to cabal-install/src/Distribution/Client/IndexUtils/Timestamp.hs diff --git a/cabal-install/Distribution/Client/Init.hs b/cabal-install/src/Distribution/Client/Init.hs similarity index 100% rename from cabal-install/Distribution/Client/Init.hs rename to cabal-install/src/Distribution/Client/Init.hs diff --git a/cabal-install/Distribution/Client/Init/Command.hs b/cabal-install/src/Distribution/Client/Init/Command.hs similarity index 100% rename from cabal-install/Distribution/Client/Init/Command.hs rename to cabal-install/src/Distribution/Client/Init/Command.hs diff --git a/cabal-install/Distribution/Client/Init/Defaults.hs b/cabal-install/src/Distribution/Client/Init/Defaults.hs similarity index 100% rename from cabal-install/Distribution/Client/Init/Defaults.hs rename to cabal-install/src/Distribution/Client/Init/Defaults.hs diff --git a/cabal-install/Distribution/Client/Init/FileCreators.hs b/cabal-install/src/Distribution/Client/Init/FileCreators.hs similarity index 100% rename from cabal-install/Distribution/Client/Init/FileCreators.hs rename to cabal-install/src/Distribution/Client/Init/FileCreators.hs diff --git a/cabal-install/Distribution/Client/Init/Heuristics.hs b/cabal-install/src/Distribution/Client/Init/Heuristics.hs similarity index 100% rename from cabal-install/Distribution/Client/Init/Heuristics.hs rename to cabal-install/src/Distribution/Client/Init/Heuristics.hs diff --git a/cabal-install/Distribution/Client/Init/Licenses.hs b/cabal-install/src/Distribution/Client/Init/Licenses.hs similarity index 100% rename from cabal-install/Distribution/Client/Init/Licenses.hs rename to cabal-install/src/Distribution/Client/Init/Licenses.hs diff --git a/cabal-install/Distribution/Client/Init/Prompt.hs b/cabal-install/src/Distribution/Client/Init/Prompt.hs similarity index 100% rename from cabal-install/Distribution/Client/Init/Prompt.hs rename to cabal-install/src/Distribution/Client/Init/Prompt.hs diff --git a/cabal-install/Distribution/Client/Init/Types.hs b/cabal-install/src/Distribution/Client/Init/Types.hs similarity index 100% rename from cabal-install/Distribution/Client/Init/Types.hs rename to cabal-install/src/Distribution/Client/Init/Types.hs diff --git a/cabal-install/Distribution/Client/Init/Utils.hs b/cabal-install/src/Distribution/Client/Init/Utils.hs similarity index 100% rename from cabal-install/Distribution/Client/Init/Utils.hs rename to cabal-install/src/Distribution/Client/Init/Utils.hs diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/src/Distribution/Client/Install.hs similarity index 100% rename from cabal-install/Distribution/Client/Install.hs rename to cabal-install/src/Distribution/Client/Install.hs diff --git a/cabal-install/Distribution/Client/InstallPlan.hs b/cabal-install/src/Distribution/Client/InstallPlan.hs similarity index 100% rename from cabal-install/Distribution/Client/InstallPlan.hs rename to cabal-install/src/Distribution/Client/InstallPlan.hs diff --git a/cabal-install/Distribution/Client/InstallSymlink.hs b/cabal-install/src/Distribution/Client/InstallSymlink.hs similarity index 100% rename from cabal-install/Distribution/Client/InstallSymlink.hs rename to cabal-install/src/Distribution/Client/InstallSymlink.hs diff --git a/cabal-install/Distribution/Client/JobControl.hs b/cabal-install/src/Distribution/Client/JobControl.hs similarity index 100% rename from cabal-install/Distribution/Client/JobControl.hs rename to cabal-install/src/Distribution/Client/JobControl.hs diff --git a/cabal-install/Distribution/Client/List.hs b/cabal-install/src/Distribution/Client/List.hs similarity index 100% rename from cabal-install/Distribution/Client/List.hs rename to cabal-install/src/Distribution/Client/List.hs diff --git a/cabal-install/Distribution/Client/Manpage.hs b/cabal-install/src/Distribution/Client/Manpage.hs similarity index 100% rename from cabal-install/Distribution/Client/Manpage.hs rename to cabal-install/src/Distribution/Client/Manpage.hs diff --git a/cabal-install/Distribution/Client/ManpageFlags.hs b/cabal-install/src/Distribution/Client/ManpageFlags.hs similarity index 100% rename from cabal-install/Distribution/Client/ManpageFlags.hs rename to cabal-install/src/Distribution/Client/ManpageFlags.hs diff --git a/cabal-install/Distribution/Client/Nix.hs b/cabal-install/src/Distribution/Client/Nix.hs similarity index 100% rename from cabal-install/Distribution/Client/Nix.hs rename to cabal-install/src/Distribution/Client/Nix.hs diff --git a/cabal-install/Distribution/Client/NixStyleOptions.hs b/cabal-install/src/Distribution/Client/NixStyleOptions.hs similarity index 100% rename from cabal-install/Distribution/Client/NixStyleOptions.hs rename to cabal-install/src/Distribution/Client/NixStyleOptions.hs diff --git a/cabal-install/Distribution/Client/Outdated.hs b/cabal-install/src/Distribution/Client/Outdated.hs similarity index 100% rename from cabal-install/Distribution/Client/Outdated.hs rename to cabal-install/src/Distribution/Client/Outdated.hs diff --git a/cabal-install/Distribution/Client/PackageHash.hs b/cabal-install/src/Distribution/Client/PackageHash.hs similarity index 100% rename from cabal-install/Distribution/Client/PackageHash.hs rename to cabal-install/src/Distribution/Client/PackageHash.hs diff --git a/cabal-install/Distribution/Client/ParseUtils.hs b/cabal-install/src/Distribution/Client/ParseUtils.hs similarity index 100% rename from cabal-install/Distribution/Client/ParseUtils.hs rename to cabal-install/src/Distribution/Client/ParseUtils.hs diff --git a/cabal-install/Distribution/Client/ProjectBuilding.hs b/cabal-install/src/Distribution/Client/ProjectBuilding.hs similarity index 100% rename from cabal-install/Distribution/Client/ProjectBuilding.hs rename to cabal-install/src/Distribution/Client/ProjectBuilding.hs diff --git a/cabal-install/Distribution/Client/ProjectBuilding/Types.hs b/cabal-install/src/Distribution/Client/ProjectBuilding/Types.hs similarity index 100% rename from cabal-install/Distribution/Client/ProjectBuilding/Types.hs rename to cabal-install/src/Distribution/Client/ProjectBuilding/Types.hs diff --git a/cabal-install/Distribution/Client/ProjectConfig.hs b/cabal-install/src/Distribution/Client/ProjectConfig.hs similarity index 100% rename from cabal-install/Distribution/Client/ProjectConfig.hs rename to cabal-install/src/Distribution/Client/ProjectConfig.hs diff --git a/cabal-install/Distribution/Client/ProjectConfig/Legacy.hs b/cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs similarity index 100% rename from cabal-install/Distribution/Client/ProjectConfig/Legacy.hs rename to cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs diff --git a/cabal-install/Distribution/Client/ProjectConfig/Types.hs b/cabal-install/src/Distribution/Client/ProjectConfig/Types.hs similarity index 100% rename from cabal-install/Distribution/Client/ProjectConfig/Types.hs rename to cabal-install/src/Distribution/Client/ProjectConfig/Types.hs diff --git a/cabal-install/Distribution/Client/ProjectFlags.hs b/cabal-install/src/Distribution/Client/ProjectFlags.hs similarity index 100% rename from cabal-install/Distribution/Client/ProjectFlags.hs rename to cabal-install/src/Distribution/Client/ProjectFlags.hs diff --git a/cabal-install/Distribution/Client/ProjectOrchestration.hs b/cabal-install/src/Distribution/Client/ProjectOrchestration.hs similarity index 100% rename from cabal-install/Distribution/Client/ProjectOrchestration.hs rename to cabal-install/src/Distribution/Client/ProjectOrchestration.hs diff --git a/cabal-install/Distribution/Client/ProjectPlanOutput.hs b/cabal-install/src/Distribution/Client/ProjectPlanOutput.hs similarity index 100% rename from cabal-install/Distribution/Client/ProjectPlanOutput.hs rename to cabal-install/src/Distribution/Client/ProjectPlanOutput.hs diff --git a/cabal-install/Distribution/Client/ProjectPlanning.hs b/cabal-install/src/Distribution/Client/ProjectPlanning.hs similarity index 100% rename from cabal-install/Distribution/Client/ProjectPlanning.hs rename to cabal-install/src/Distribution/Client/ProjectPlanning.hs diff --git a/cabal-install/Distribution/Client/ProjectPlanning/Types.hs b/cabal-install/src/Distribution/Client/ProjectPlanning/Types.hs similarity index 100% rename from cabal-install/Distribution/Client/ProjectPlanning/Types.hs rename to cabal-install/src/Distribution/Client/ProjectPlanning/Types.hs diff --git a/cabal-install/Distribution/Client/RebuildMonad.hs b/cabal-install/src/Distribution/Client/RebuildMonad.hs similarity index 100% rename from cabal-install/Distribution/Client/RebuildMonad.hs rename to cabal-install/src/Distribution/Client/RebuildMonad.hs diff --git a/cabal-install/Distribution/Client/Reconfigure.hs b/cabal-install/src/Distribution/Client/Reconfigure.hs similarity index 100% rename from cabal-install/Distribution/Client/Reconfigure.hs rename to cabal-install/src/Distribution/Client/Reconfigure.hs diff --git a/cabal-install/Distribution/Client/Run.hs b/cabal-install/src/Distribution/Client/Run.hs similarity index 100% rename from cabal-install/Distribution/Client/Run.hs rename to cabal-install/src/Distribution/Client/Run.hs diff --git a/cabal-install/Distribution/Client/Sandbox.hs b/cabal-install/src/Distribution/Client/Sandbox.hs similarity index 100% rename from cabal-install/Distribution/Client/Sandbox.hs rename to cabal-install/src/Distribution/Client/Sandbox.hs diff --git a/cabal-install/Distribution/Client/Sandbox/PackageEnvironment.hs b/cabal-install/src/Distribution/Client/Sandbox/PackageEnvironment.hs similarity index 100% rename from cabal-install/Distribution/Client/Sandbox/PackageEnvironment.hs rename to cabal-install/src/Distribution/Client/Sandbox/PackageEnvironment.hs diff --git a/cabal-install/Distribution/Client/SavedFlags.hs b/cabal-install/src/Distribution/Client/SavedFlags.hs similarity index 100% rename from cabal-install/Distribution/Client/SavedFlags.hs rename to cabal-install/src/Distribution/Client/SavedFlags.hs diff --git a/cabal-install/Distribution/Client/Security/DNS.hs b/cabal-install/src/Distribution/Client/Security/DNS.hs similarity index 100% rename from cabal-install/Distribution/Client/Security/DNS.hs rename to cabal-install/src/Distribution/Client/Security/DNS.hs diff --git a/cabal-install/Distribution/Client/Security/HTTP.hs b/cabal-install/src/Distribution/Client/Security/HTTP.hs similarity index 100% rename from cabal-install/Distribution/Client/Security/HTTP.hs rename to cabal-install/src/Distribution/Client/Security/HTTP.hs diff --git a/cabal-install/Distribution/Client/Setup.hs b/cabal-install/src/Distribution/Client/Setup.hs similarity index 100% rename from cabal-install/Distribution/Client/Setup.hs rename to cabal-install/src/Distribution/Client/Setup.hs diff --git a/cabal-install/Distribution/Client/SetupWrapper.hs b/cabal-install/src/Distribution/Client/SetupWrapper.hs similarity index 100% rename from cabal-install/Distribution/Client/SetupWrapper.hs rename to cabal-install/src/Distribution/Client/SetupWrapper.hs diff --git a/cabal-install/Distribution/Client/SolverInstallPlan.hs b/cabal-install/src/Distribution/Client/SolverInstallPlan.hs similarity index 100% rename from cabal-install/Distribution/Client/SolverInstallPlan.hs rename to cabal-install/src/Distribution/Client/SolverInstallPlan.hs diff --git a/cabal-install/Distribution/Client/SourceFiles.hs b/cabal-install/src/Distribution/Client/SourceFiles.hs similarity index 100% rename from cabal-install/Distribution/Client/SourceFiles.hs rename to cabal-install/src/Distribution/Client/SourceFiles.hs diff --git a/cabal-install/Distribution/Client/SrcDist.hs b/cabal-install/src/Distribution/Client/SrcDist.hs similarity index 100% rename from cabal-install/Distribution/Client/SrcDist.hs rename to cabal-install/src/Distribution/Client/SrcDist.hs diff --git a/cabal-install/Distribution/Client/Store.hs b/cabal-install/src/Distribution/Client/Store.hs similarity index 100% rename from cabal-install/Distribution/Client/Store.hs rename to cabal-install/src/Distribution/Client/Store.hs diff --git a/cabal-install/Distribution/Client/Tar.hs b/cabal-install/src/Distribution/Client/Tar.hs similarity index 100% rename from cabal-install/Distribution/Client/Tar.hs rename to cabal-install/src/Distribution/Client/Tar.hs diff --git a/cabal-install/Distribution/Client/TargetProblem.hs b/cabal-install/src/Distribution/Client/TargetProblem.hs similarity index 100% rename from cabal-install/Distribution/Client/TargetProblem.hs rename to cabal-install/src/Distribution/Client/TargetProblem.hs diff --git a/cabal-install/Distribution/Client/TargetSelector.hs b/cabal-install/src/Distribution/Client/TargetSelector.hs similarity index 100% rename from cabal-install/Distribution/Client/TargetSelector.hs rename to cabal-install/src/Distribution/Client/TargetSelector.hs diff --git a/cabal-install/Distribution/Client/Targets.hs b/cabal-install/src/Distribution/Client/Targets.hs similarity index 100% rename from cabal-install/Distribution/Client/Targets.hs rename to cabal-install/src/Distribution/Client/Targets.hs diff --git a/cabal-install/Distribution/Client/Types.hs b/cabal-install/src/Distribution/Client/Types.hs similarity index 100% rename from cabal-install/Distribution/Client/Types.hs rename to cabal-install/src/Distribution/Client/Types.hs diff --git a/cabal-install/Distribution/Client/Types/AllowNewer.hs b/cabal-install/src/Distribution/Client/Types/AllowNewer.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/AllowNewer.hs rename to cabal-install/src/Distribution/Client/Types/AllowNewer.hs diff --git a/cabal-install/Distribution/Client/Types/BuildResults.hs b/cabal-install/src/Distribution/Client/Types/BuildResults.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/BuildResults.hs rename to cabal-install/src/Distribution/Client/Types/BuildResults.hs diff --git a/cabal-install/Distribution/Client/Types/ConfiguredId.hs b/cabal-install/src/Distribution/Client/Types/ConfiguredId.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/ConfiguredId.hs rename to cabal-install/src/Distribution/Client/Types/ConfiguredId.hs diff --git a/cabal-install/Distribution/Client/Types/ConfiguredPackage.hs b/cabal-install/src/Distribution/Client/Types/ConfiguredPackage.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/ConfiguredPackage.hs rename to cabal-install/src/Distribution/Client/Types/ConfiguredPackage.hs diff --git a/cabal-install/Distribution/Client/Types/Credentials.hs b/cabal-install/src/Distribution/Client/Types/Credentials.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/Credentials.hs rename to cabal-install/src/Distribution/Client/Types/Credentials.hs diff --git a/cabal-install/Distribution/Client/Types/InstallMethod.hs b/cabal-install/src/Distribution/Client/Types/InstallMethod.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/InstallMethod.hs rename to cabal-install/src/Distribution/Client/Types/InstallMethod.hs diff --git a/cabal-install/Distribution/Client/Types/OverwritePolicy.hs b/cabal-install/src/Distribution/Client/Types/OverwritePolicy.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/OverwritePolicy.hs rename to cabal-install/src/Distribution/Client/Types/OverwritePolicy.hs diff --git a/cabal-install/Distribution/Client/Types/PackageLocation.hs b/cabal-install/src/Distribution/Client/Types/PackageLocation.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/PackageLocation.hs rename to cabal-install/src/Distribution/Client/Types/PackageLocation.hs diff --git a/cabal-install/Distribution/Client/Types/PackageSpecifier.hs b/cabal-install/src/Distribution/Client/Types/PackageSpecifier.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/PackageSpecifier.hs rename to cabal-install/src/Distribution/Client/Types/PackageSpecifier.hs diff --git a/cabal-install/Distribution/Client/Types/ReadyPackage.hs b/cabal-install/src/Distribution/Client/Types/ReadyPackage.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/ReadyPackage.hs rename to cabal-install/src/Distribution/Client/Types/ReadyPackage.hs diff --git a/cabal-install/Distribution/Client/Types/Repo.hs b/cabal-install/src/Distribution/Client/Types/Repo.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/Repo.hs rename to cabal-install/src/Distribution/Client/Types/Repo.hs diff --git a/cabal-install/Distribution/Client/Types/RepoName.hs b/cabal-install/src/Distribution/Client/Types/RepoName.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/RepoName.hs rename to cabal-install/src/Distribution/Client/Types/RepoName.hs diff --git a/cabal-install/Distribution/Client/Types/SourcePackageDb.hs b/cabal-install/src/Distribution/Client/Types/SourcePackageDb.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/SourcePackageDb.hs rename to cabal-install/src/Distribution/Client/Types/SourcePackageDb.hs diff --git a/cabal-install/Distribution/Client/Types/SourceRepo.hs b/cabal-install/src/Distribution/Client/Types/SourceRepo.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/SourceRepo.hs rename to cabal-install/src/Distribution/Client/Types/SourceRepo.hs diff --git a/cabal-install/Distribution/Client/Types/WriteGhcEnvironmentFilesPolicy.hs b/cabal-install/src/Distribution/Client/Types/WriteGhcEnvironmentFilesPolicy.hs similarity index 100% rename from cabal-install/Distribution/Client/Types/WriteGhcEnvironmentFilesPolicy.hs rename to cabal-install/src/Distribution/Client/Types/WriteGhcEnvironmentFilesPolicy.hs diff --git a/cabal-install/Distribution/Client/Update.hs b/cabal-install/src/Distribution/Client/Update.hs similarity index 100% rename from cabal-install/Distribution/Client/Update.hs rename to cabal-install/src/Distribution/Client/Update.hs diff --git a/cabal-install/Distribution/Client/Upload.hs b/cabal-install/src/Distribution/Client/Upload.hs similarity index 100% rename from cabal-install/Distribution/Client/Upload.hs rename to cabal-install/src/Distribution/Client/Upload.hs diff --git a/cabal-install/Distribution/Client/Utils.hs b/cabal-install/src/Distribution/Client/Utils.hs similarity index 100% rename from cabal-install/Distribution/Client/Utils.hs rename to cabal-install/src/Distribution/Client/Utils.hs diff --git a/cabal-install/Distribution/Client/Utils/Assertion.hs b/cabal-install/src/Distribution/Client/Utils/Assertion.hs similarity index 100% rename from cabal-install/Distribution/Client/Utils/Assertion.hs rename to cabal-install/src/Distribution/Client/Utils/Assertion.hs diff --git a/cabal-install/Distribution/Client/Utils/Json.hs b/cabal-install/src/Distribution/Client/Utils/Json.hs similarity index 100% rename from cabal-install/Distribution/Client/Utils/Json.hs rename to cabal-install/src/Distribution/Client/Utils/Json.hs diff --git a/cabal-install/Distribution/Client/Utils/Parsec.hs b/cabal-install/src/Distribution/Client/Utils/Parsec.hs similarity index 100% rename from cabal-install/Distribution/Client/Utils/Parsec.hs rename to cabal-install/src/Distribution/Client/Utils/Parsec.hs diff --git a/cabal-install/Distribution/Client/VCS.hs b/cabal-install/src/Distribution/Client/VCS.hs similarity index 100% rename from cabal-install/Distribution/Client/VCS.hs rename to cabal-install/src/Distribution/Client/VCS.hs diff --git a/cabal-install/Distribution/Client/Win32SelfUpgrade.hs b/cabal-install/src/Distribution/Client/Win32SelfUpgrade.hs similarity index 100% rename from cabal-install/Distribution/Client/Win32SelfUpgrade.hs rename to cabal-install/src/Distribution/Client/Win32SelfUpgrade.hs diff --git a/cabal-install/Distribution/Client/World.hs b/cabal-install/src/Distribution/Client/World.hs similarity index 100% rename from cabal-install/Distribution/Client/World.hs rename to cabal-install/src/Distribution/Client/World.hs diff --git a/cabal-install/Distribution/Deprecated/ParseUtils.hs b/cabal-install/src/Distribution/Deprecated/ParseUtils.hs similarity index 100% rename from cabal-install/Distribution/Deprecated/ParseUtils.hs rename to cabal-install/src/Distribution/Deprecated/ParseUtils.hs diff --git a/cabal-install/Distribution/Deprecated/ReadP.hs b/cabal-install/src/Distribution/Deprecated/ReadP.hs similarity index 100% rename from cabal-install/Distribution/Deprecated/ReadP.hs rename to cabal-install/src/Distribution/Deprecated/ReadP.hs diff --git a/cabal-install/Distribution/Deprecated/ViewAsFieldDescr.hs b/cabal-install/src/Distribution/Deprecated/ViewAsFieldDescr.hs similarity index 100% rename from cabal-install/Distribution/Deprecated/ViewAsFieldDescr.hs rename to cabal-install/src/Distribution/Deprecated/ViewAsFieldDescr.hs diff --git a/cabal-install/Distribution/Solver/Compat/Prelude.hs b/cabal-install/src/Distribution/Solver/Compat/Prelude.hs similarity index 100% rename from cabal-install/Distribution/Solver/Compat/Prelude.hs rename to cabal-install/src/Distribution/Solver/Compat/Prelude.hs diff --git a/cabal-install/Distribution/Solver/Modular.hs b/cabal-install/src/Distribution/Solver/Modular.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular.hs rename to cabal-install/src/Distribution/Solver/Modular.hs diff --git a/cabal-install/Distribution/Solver/Modular/Assignment.hs b/cabal-install/src/Distribution/Solver/Modular/Assignment.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Assignment.hs rename to cabal-install/src/Distribution/Solver/Modular/Assignment.hs diff --git a/cabal-install/Distribution/Solver/Modular/Builder.hs b/cabal-install/src/Distribution/Solver/Modular/Builder.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Builder.hs rename to cabal-install/src/Distribution/Solver/Modular/Builder.hs diff --git a/cabal-install/Distribution/Solver/Modular/Configured.hs b/cabal-install/src/Distribution/Solver/Modular/Configured.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Configured.hs rename to cabal-install/src/Distribution/Solver/Modular/Configured.hs diff --git a/cabal-install/Distribution/Solver/Modular/ConfiguredConversion.hs b/cabal-install/src/Distribution/Solver/Modular/ConfiguredConversion.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/ConfiguredConversion.hs rename to cabal-install/src/Distribution/Solver/Modular/ConfiguredConversion.hs diff --git a/cabal-install/Distribution/Solver/Modular/ConflictSet.hs b/cabal-install/src/Distribution/Solver/Modular/ConflictSet.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/ConflictSet.hs rename to cabal-install/src/Distribution/Solver/Modular/ConflictSet.hs diff --git a/cabal-install/Distribution/Solver/Modular/Cycles.hs b/cabal-install/src/Distribution/Solver/Modular/Cycles.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Cycles.hs rename to cabal-install/src/Distribution/Solver/Modular/Cycles.hs diff --git a/cabal-install/Distribution/Solver/Modular/Dependency.hs b/cabal-install/src/Distribution/Solver/Modular/Dependency.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Dependency.hs rename to cabal-install/src/Distribution/Solver/Modular/Dependency.hs diff --git a/cabal-install/Distribution/Solver/Modular/Explore.hs b/cabal-install/src/Distribution/Solver/Modular/Explore.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Explore.hs rename to cabal-install/src/Distribution/Solver/Modular/Explore.hs diff --git a/cabal-install/Distribution/Solver/Modular/Flag.hs b/cabal-install/src/Distribution/Solver/Modular/Flag.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Flag.hs rename to cabal-install/src/Distribution/Solver/Modular/Flag.hs diff --git a/cabal-install/Distribution/Solver/Modular/Index.hs b/cabal-install/src/Distribution/Solver/Modular/Index.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Index.hs rename to cabal-install/src/Distribution/Solver/Modular/Index.hs diff --git a/cabal-install/Distribution/Solver/Modular/IndexConversion.hs b/cabal-install/src/Distribution/Solver/Modular/IndexConversion.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/IndexConversion.hs rename to cabal-install/src/Distribution/Solver/Modular/IndexConversion.hs diff --git a/cabal-install/Distribution/Solver/Modular/LabeledGraph.hs b/cabal-install/src/Distribution/Solver/Modular/LabeledGraph.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/LabeledGraph.hs rename to cabal-install/src/Distribution/Solver/Modular/LabeledGraph.hs diff --git a/cabal-install/Distribution/Solver/Modular/Linking.hs b/cabal-install/src/Distribution/Solver/Modular/Linking.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Linking.hs rename to cabal-install/src/Distribution/Solver/Modular/Linking.hs diff --git a/cabal-install/Distribution/Solver/Modular/Log.hs b/cabal-install/src/Distribution/Solver/Modular/Log.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Log.hs rename to cabal-install/src/Distribution/Solver/Modular/Log.hs diff --git a/cabal-install/Distribution/Solver/Modular/Message.hs b/cabal-install/src/Distribution/Solver/Modular/Message.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Message.hs rename to cabal-install/src/Distribution/Solver/Modular/Message.hs diff --git a/cabal-install/Distribution/Solver/Modular/PSQ.hs b/cabal-install/src/Distribution/Solver/Modular/PSQ.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/PSQ.hs rename to cabal-install/src/Distribution/Solver/Modular/PSQ.hs diff --git a/cabal-install/Distribution/Solver/Modular/Package.hs b/cabal-install/src/Distribution/Solver/Modular/Package.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Package.hs rename to cabal-install/src/Distribution/Solver/Modular/Package.hs diff --git a/cabal-install/Distribution/Solver/Modular/Preference.hs b/cabal-install/src/Distribution/Solver/Modular/Preference.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Preference.hs rename to cabal-install/src/Distribution/Solver/Modular/Preference.hs diff --git a/cabal-install/Distribution/Solver/Modular/RetryLog.hs b/cabal-install/src/Distribution/Solver/Modular/RetryLog.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/RetryLog.hs rename to cabal-install/src/Distribution/Solver/Modular/RetryLog.hs diff --git a/cabal-install/Distribution/Solver/Modular/Solver.hs b/cabal-install/src/Distribution/Solver/Modular/Solver.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Solver.hs rename to cabal-install/src/Distribution/Solver/Modular/Solver.hs diff --git a/cabal-install/Distribution/Solver/Modular/Tree.hs b/cabal-install/src/Distribution/Solver/Modular/Tree.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Tree.hs rename to cabal-install/src/Distribution/Solver/Modular/Tree.hs diff --git a/cabal-install/Distribution/Solver/Modular/Validate.hs b/cabal-install/src/Distribution/Solver/Modular/Validate.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Validate.hs rename to cabal-install/src/Distribution/Solver/Modular/Validate.hs diff --git a/cabal-install/Distribution/Solver/Modular/Var.hs b/cabal-install/src/Distribution/Solver/Modular/Var.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Var.hs rename to cabal-install/src/Distribution/Solver/Modular/Var.hs diff --git a/cabal-install/Distribution/Solver/Modular/Version.hs b/cabal-install/src/Distribution/Solver/Modular/Version.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/Version.hs rename to cabal-install/src/Distribution/Solver/Modular/Version.hs diff --git a/cabal-install/Distribution/Solver/Modular/WeightedPSQ.hs b/cabal-install/src/Distribution/Solver/Modular/WeightedPSQ.hs similarity index 100% rename from cabal-install/Distribution/Solver/Modular/WeightedPSQ.hs rename to cabal-install/src/Distribution/Solver/Modular/WeightedPSQ.hs diff --git a/cabal-install/Distribution/Solver/Types/ComponentDeps.hs b/cabal-install/src/Distribution/Solver/Types/ComponentDeps.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/ComponentDeps.hs rename to cabal-install/src/Distribution/Solver/Types/ComponentDeps.hs diff --git a/cabal-install/Distribution/Solver/Types/ConstraintSource.hs b/cabal-install/src/Distribution/Solver/Types/ConstraintSource.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/ConstraintSource.hs rename to cabal-install/src/Distribution/Solver/Types/ConstraintSource.hs diff --git a/cabal-install/Distribution/Solver/Types/DependencyResolver.hs b/cabal-install/src/Distribution/Solver/Types/DependencyResolver.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/DependencyResolver.hs rename to cabal-install/src/Distribution/Solver/Types/DependencyResolver.hs diff --git a/cabal-install/Distribution/Solver/Types/Flag.hs b/cabal-install/src/Distribution/Solver/Types/Flag.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/Flag.hs rename to cabal-install/src/Distribution/Solver/Types/Flag.hs diff --git a/cabal-install/Distribution/Solver/Types/InstSolverPackage.hs b/cabal-install/src/Distribution/Solver/Types/InstSolverPackage.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/InstSolverPackage.hs rename to cabal-install/src/Distribution/Solver/Types/InstSolverPackage.hs diff --git a/cabal-install/Distribution/Solver/Types/InstalledPreference.hs b/cabal-install/src/Distribution/Solver/Types/InstalledPreference.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/InstalledPreference.hs rename to cabal-install/src/Distribution/Solver/Types/InstalledPreference.hs diff --git a/cabal-install/Distribution/Solver/Types/LabeledPackageConstraint.hs b/cabal-install/src/Distribution/Solver/Types/LabeledPackageConstraint.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/LabeledPackageConstraint.hs rename to cabal-install/src/Distribution/Solver/Types/LabeledPackageConstraint.hs diff --git a/cabal-install/Distribution/Solver/Types/OptionalStanza.hs b/cabal-install/src/Distribution/Solver/Types/OptionalStanza.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/OptionalStanza.hs rename to cabal-install/src/Distribution/Solver/Types/OptionalStanza.hs diff --git a/cabal-install/Distribution/Solver/Types/PackageConstraint.hs b/cabal-install/src/Distribution/Solver/Types/PackageConstraint.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/PackageConstraint.hs rename to cabal-install/src/Distribution/Solver/Types/PackageConstraint.hs diff --git a/cabal-install/Distribution/Solver/Types/PackageFixedDeps.hs b/cabal-install/src/Distribution/Solver/Types/PackageFixedDeps.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/PackageFixedDeps.hs rename to cabal-install/src/Distribution/Solver/Types/PackageFixedDeps.hs diff --git a/cabal-install/Distribution/Solver/Types/PackageIndex.hs b/cabal-install/src/Distribution/Solver/Types/PackageIndex.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/PackageIndex.hs rename to cabal-install/src/Distribution/Solver/Types/PackageIndex.hs diff --git a/cabal-install/Distribution/Solver/Types/PackagePath.hs b/cabal-install/src/Distribution/Solver/Types/PackagePath.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/PackagePath.hs rename to cabal-install/src/Distribution/Solver/Types/PackagePath.hs diff --git a/cabal-install/Distribution/Solver/Types/PackagePreferences.hs b/cabal-install/src/Distribution/Solver/Types/PackagePreferences.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/PackagePreferences.hs rename to cabal-install/src/Distribution/Solver/Types/PackagePreferences.hs diff --git a/cabal-install/Distribution/Solver/Types/PkgConfigDb.hs b/cabal-install/src/Distribution/Solver/Types/PkgConfigDb.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/PkgConfigDb.hs rename to cabal-install/src/Distribution/Solver/Types/PkgConfigDb.hs diff --git a/cabal-install/Distribution/Solver/Types/Progress.hs b/cabal-install/src/Distribution/Solver/Types/Progress.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/Progress.hs rename to cabal-install/src/Distribution/Solver/Types/Progress.hs diff --git a/cabal-install/Distribution/Solver/Types/ResolverPackage.hs b/cabal-install/src/Distribution/Solver/Types/ResolverPackage.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/ResolverPackage.hs rename to cabal-install/src/Distribution/Solver/Types/ResolverPackage.hs diff --git a/cabal-install/Distribution/Solver/Types/Settings.hs b/cabal-install/src/Distribution/Solver/Types/Settings.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/Settings.hs rename to cabal-install/src/Distribution/Solver/Types/Settings.hs diff --git a/cabal-install/Distribution/Solver/Types/SolverId.hs b/cabal-install/src/Distribution/Solver/Types/SolverId.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/SolverId.hs rename to cabal-install/src/Distribution/Solver/Types/SolverId.hs diff --git a/cabal-install/Distribution/Solver/Types/SolverPackage.hs b/cabal-install/src/Distribution/Solver/Types/SolverPackage.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/SolverPackage.hs rename to cabal-install/src/Distribution/Solver/Types/SolverPackage.hs diff --git a/cabal-install/Distribution/Solver/Types/SourcePackage.hs b/cabal-install/src/Distribution/Solver/Types/SourcePackage.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/SourcePackage.hs rename to cabal-install/src/Distribution/Solver/Types/SourcePackage.hs diff --git a/cabal-install/Distribution/Solver/Types/Variable.hs b/cabal-install/src/Distribution/Solver/Types/Variable.hs similarity index 100% rename from cabal-install/Distribution/Solver/Types/Variable.hs rename to cabal-install/src/Distribution/Solver/Types/Variable.hs