Move cabal-install source to src/

haskell · Jul 20, 2020 · b57eee1 · b57eee1
1 parent 95c5e40
commit b57eee1
Show file tree

Hide file tree

Showing 183 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -136,6 +136,7 @@ executable cabal
     main-is:        Main.hs
     hs-source-dirs: main
     default-language: Haskell2010
+    hs-source-dirs:   src
     ghc-options:    -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
     if impl(ghc >= 8.0)
         ghc-options: -Wcompat

diff --git a/cabal-install/cabal-install.cabal.dev b/cabal-install/cabal-install.cabal.dev
@@ -134,6 +134,7 @@ Flag lukko
 
 library cabal-lib-client
     default-language: Haskell2010
+    hs-source-dirs:   src
     ghc-options:    -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
     if impl(ghc >= 8.0)
         ghc-options: -Wcompat
@@ -396,6 +397,7 @@ library cabal-lib-client
 
 library cabal-install-solver-dsl
     default-language: Haskell2010
+    hs-source-dirs:   src
     ghc-options:    -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
     if impl(ghc >= 8.0)
         ghc-options: -Wcompat
@@ -416,6 +418,7 @@ executable cabal
     main-is:        Main.hs
     hs-source-dirs: main
     default-language: Haskell2010
+    hs-source-dirs:   src
     ghc-options:    -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
     if impl(ghc >= 8.0)
         ghc-options: -Wcompat

diff --git a/cabal-install/cabal-install.cabal.prod b/cabal-install/cabal-install.cabal.prod
@@ -136,6 +136,7 @@ executable cabal
     main-is:        Main.hs
     hs-source-dirs: main
     default-language: Haskell2010
+    hs-source-dirs:   src
     ghc-options:    -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
     if impl(ghc >= 8.0)
         ghc-options: -Wcompat

diff --git a/cabal-install/cabal-install.cabal.zinza b/cabal-install/cabal-install.cabal.zinza
@@ -69,6 +69,7 @@ Version:            3.5.0.0
 {% endblock %}
 {% defblock componentCommon %}
     default-language: Haskell2010
+    hs-source-dirs:   src
     ghc-options:    -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
     if impl(ghc >= 8.0)
         ghc-options: -Wcompat

diff --git a/...ribution/Client/BuildReports/Anonymous.hs → ...ribution/Client/BuildReports/Anonymous.hs b/...ribution/Client/BuildReports/Anonymous.hs → ...ribution/Client/BuildReports/Anonymous.hs
diff --git a/.../Distribution/Client/BuildReports/Lens.hs → .../Distribution/Client/BuildReports/Lens.hs b/.../Distribution/Client/BuildReports/Lens.hs → .../Distribution/Client/BuildReports/Lens.hs
diff --git a/...stribution/Client/BuildReports/Storage.hs → ...stribution/Client/BuildReports/Storage.hs b/...stribution/Client/BuildReports/Storage.hs → ...stribution/Client/BuildReports/Storage.hs
diff --git a/...Distribution/Client/BuildReports/Types.hs → ...Distribution/Client/BuildReports/Types.hs b/...Distribution/Client/BuildReports/Types.hs → ...Distribution/Client/BuildReports/Types.hs
diff --git a/...istribution/Client/BuildReports/Upload.hs → ...istribution/Client/BuildReports/Upload.hs b/...istribution/Client/BuildReports/Upload.hs → ...istribution/Client/BuildReports/Upload.hs
diff --git a/cabal-install/Distribution/Client/Check.hs → ...-install/src/Distribution/Client/Check.hs b/cabal-install/Distribution/Client/Check.hs → ...-install/src/Distribution/Client/Check.hs
diff --git a/...l-install/Distribution/Client/CmdBench.hs → ...stall/src/Distribution/Client/CmdBench.hs b/...l-install/Distribution/Client/CmdBench.hs → ...stall/src/Distribution/Client/CmdBench.hs
diff --git a/...l-install/Distribution/Client/CmdBuild.hs → ...stall/src/Distribution/Client/CmdBuild.hs b/...l-install/Distribution/Client/CmdBuild.hs → ...stall/src/Distribution/Client/CmdBuild.hs
diff --git a/...l-install/Distribution/Client/CmdClean.hs → ...stall/src/Distribution/Client/CmdClean.hs b/...l-install/Distribution/Client/CmdClean.hs → ...stall/src/Distribution/Client/CmdClean.hs
diff --git a/...stall/Distribution/Client/CmdConfigure.hs → ...l/src/Distribution/Client/CmdConfigure.hs b/...stall/Distribution/Client/CmdConfigure.hs → ...l/src/Distribution/Client/CmdConfigure.hs
diff --git a/...l/Distribution/Client/CmdErrorMessages.hs → ...c/Distribution/Client/CmdErrorMessages.hs b/...l/Distribution/Client/CmdErrorMessages.hs → ...c/Distribution/Client/CmdErrorMessages.hs
diff --git a/cabal-install/Distribution/Client/CmdExec.hs → ...nstall/src/Distribution/Client/CmdExec.hs b/cabal-install/Distribution/Client/CmdExec.hs → ...nstall/src/Distribution/Client/CmdExec.hs
diff --git a/...-install/Distribution/Client/CmdFreeze.hs → ...tall/src/Distribution/Client/CmdFreeze.hs b/...-install/Distribution/Client/CmdFreeze.hs → ...tall/src/Distribution/Client/CmdFreeze.hs
diff --git a/...install/Distribution/Client/CmdHaddock.hs → ...all/src/Distribution/Client/CmdHaddock.hs b/...install/Distribution/Client/CmdHaddock.hs → ...all/src/Distribution/Client/CmdHaddock.hs
diff --git a/...install/Distribution/Client/CmdInstall.hs → ...all/src/Distribution/Client/CmdInstall.hs b/...install/Distribution/Client/CmdInstall.hs → ...all/src/Distribution/Client/CmdInstall.hs
diff --git a/...n/Client/CmdInstall/ClientInstallFlags.hs → ...n/Client/CmdInstall/ClientInstallFlags.hs b/...n/Client/CmdInstall/ClientInstallFlags.hs → ...n/Client/CmdInstall/ClientInstallFlags.hs
diff --git a/...CmdInstall/ClientInstallTargetSelector.hs → ...CmdInstall/ClientInstallTargetSelector.hs b/...CmdInstall/ClientInstallTargetSelector.hs → ...CmdInstall/ClientInstallTargetSelector.hs
diff --git a/...-install/Distribution/Client/CmdLegacy.hs → ...tall/src/Distribution/Client/CmdLegacy.hs b/...-install/Distribution/Client/CmdLegacy.hs → ...tall/src/Distribution/Client/CmdLegacy.hs
diff --git a/...install/Distribution/Client/CmdListBin.hs → ...all/src/Distribution/Client/CmdListBin.hs b/...install/Distribution/Client/CmdListBin.hs → ...all/src/Distribution/Client/CmdListBin.hs
diff --git a/cabal-install/Distribution/Client/CmdRepl.hs → ...nstall/src/Distribution/Client/CmdRepl.hs b/cabal-install/Distribution/Client/CmdRepl.hs → ...nstall/src/Distribution/Client/CmdRepl.hs
diff --git a/cabal-install/Distribution/Client/CmdRun.hs → ...install/src/Distribution/Client/CmdRun.hs b/cabal-install/Distribution/Client/CmdRun.hs → ...install/src/Distribution/Client/CmdRun.hs
diff --git a/...l-install/Distribution/Client/CmdSdist.hs → ...stall/src/Distribution/Client/CmdSdist.hs b/...l-install/Distribution/Client/CmdSdist.hs → ...stall/src/Distribution/Client/CmdSdist.hs
diff --git a/cabal-install/Distribution/Client/CmdTest.hs → ...nstall/src/Distribution/Client/CmdTest.hs b/cabal-install/Distribution/Client/CmdTest.hs → ...nstall/src/Distribution/Client/CmdTest.hs
diff --git a/...-install/Distribution/Client/CmdUpdate.hs → ...tall/src/Distribution/Client/CmdUpdate.hs b/...-install/Distribution/Client/CmdUpdate.hs → ...tall/src/Distribution/Client/CmdUpdate.hs
diff --git a/...l/Distribution/Client/Compat/Directory.hs → ...c/Distribution/Client/Compat/Directory.hs b/...l/Distribution/Client/Compat/Directory.hs → ...c/Distribution/Client/Compat/Directory.hs
diff --git a/...tribution/Client/Compat/ExecutablePath.hs → ...tribution/Client/Compat/ExecutablePath.hs b/...tribution/Client/Compat/ExecutablePath.hs → ...tribution/Client/Compat/ExecutablePath.hs
diff --git a/...l/Distribution/Client/Compat/FilePerms.hs → ...c/Distribution/Client/Compat/FilePerms.hs b/...l/Distribution/Client/Compat/FilePerms.hs → ...c/Distribution/Client/Compat/FilePerms.hs
diff --git a/...all/Distribution/Client/Compat/Orphans.hs → ...src/Distribution/Client/Compat/Orphans.hs b/...all/Distribution/Client/Compat/Orphans.hs → ...src/Distribution/Client/Compat/Orphans.hs
diff --git a/...all/Distribution/Client/Compat/Prelude.hs → ...src/Distribution/Client/Compat/Prelude.hs b/...all/Distribution/Client/Compat/Prelude.hs → ...src/Distribution/Client/Compat/Prelude.hs
diff --git a/...all/Distribution/Client/Compat/Process.hs → ...src/Distribution/Client/Compat/Process.hs b/...all/Distribution/Client/Compat/Process.hs → ...src/Distribution/Client/Compat/Process.hs
diff --git a/...l/Distribution/Client/Compat/Semaphore.hs → ...c/Distribution/Client/Compat/Semaphore.hs b/...l/Distribution/Client/Compat/Semaphore.hs → ...c/Distribution/Client/Compat/Semaphore.hs
diff --git a/cabal-install/Distribution/Client/Config.hs → ...install/src/Distribution/Client/Config.hs b/cabal-install/Distribution/Client/Config.hs → ...install/src/Distribution/Client/Config.hs
diff --git a/...-install/Distribution/Client/Configure.hs → ...tall/src/Distribution/Client/Configure.hs b/...-install/Distribution/Client/Configure.hs → ...tall/src/Distribution/Client/Configure.hs
diff --git a/...install/Distribution/Client/Dependency.hs → ...all/src/Distribution/Client/Dependency.hs b/...install/Distribution/Client/Dependency.hs → ...all/src/Distribution/Client/Dependency.hs
diff --git a/...l/Distribution/Client/Dependency/Types.hs → ...c/Distribution/Client/Dependency/Types.hs b/...l/Distribution/Client/Dependency/Types.hs → ...c/Distribution/Client/Dependency/Types.hs
diff --git a/...tall/Distribution/Client/DistDirLayout.hs → .../src/Distribution/Client/DistDirLayout.hs b/...tall/Distribution/Client/DistDirLayout.hs → .../src/Distribution/Client/DistDirLayout.hs
diff --git a/cabal-install/Distribution/Client/Exec.hs → ...l-install/src/Distribution/Client/Exec.hs b/cabal-install/Distribution/Client/Exec.hs → ...l-install/src/Distribution/Client/Exec.hs
diff --git a/cabal-install/Distribution/Client/Fetch.hs → ...-install/src/Distribution/Client/Fetch.hs b/cabal-install/Distribution/Client/Fetch.hs → ...-install/src/Distribution/Client/Fetch.hs
diff --git a/...install/Distribution/Client/FetchUtils.hs → ...all/src/Distribution/Client/FetchUtils.hs b/...install/Distribution/Client/FetchUtils.hs → ...all/src/Distribution/Client/FetchUtils.hs
diff --git a/...nstall/Distribution/Client/FileMonitor.hs → ...ll/src/Distribution/Client/FileMonitor.hs b/...nstall/Distribution/Client/FileMonitor.hs → ...ll/src/Distribution/Client/FileMonitor.hs
diff --git a/cabal-install/Distribution/Client/Freeze.hs → ...install/src/Distribution/Client/Freeze.hs b/cabal-install/Distribution/Client/Freeze.hs → ...install/src/Distribution/Client/Freeze.hs
diff --git a/...-install/Distribution/Client/GZipUtils.hs → ...tall/src/Distribution/Client/GZipUtils.hs b/...-install/Distribution/Client/GZipUtils.hs → ...tall/src/Distribution/Client/GZipUtils.hs
diff --git a/...-install/Distribution/Client/GenBounds.hs → ...tall/src/Distribution/Client/GenBounds.hs b/...-install/Distribution/Client/GenBounds.hs → ...tall/src/Distribution/Client/GenBounds.hs
diff --git a/cabal-install/Distribution/Client/Get.hs → cabal-install/src/Distribution/Client/Get.hs b/cabal-install/Distribution/Client/Get.hs → cabal-install/src/Distribution/Client/Get.hs
diff --git a/cabal-install/Distribution/Client/Glob.hs → ...l-install/src/Distribution/Client/Glob.hs b/cabal-install/Distribution/Client/Glob.hs → ...l-install/src/Distribution/Client/Glob.hs
diff --git a/...nstall/Distribution/Client/GlobalFlags.hs → ...ll/src/Distribution/Client/GlobalFlags.hs b/...nstall/Distribution/Client/GlobalFlags.hs → ...ll/src/Distribution/Client/GlobalFlags.hs
diff --git a/cabal-install/Distribution/Client/Haddock.hs → ...nstall/src/Distribution/Client/Haddock.hs b/cabal-install/Distribution/Client/Haddock.hs → ...nstall/src/Distribution/Client/Haddock.hs
diff --git a/...-install/Distribution/Client/HashValue.hs → ...tall/src/Distribution/Client/HashValue.hs b/...-install/Distribution/Client/HashValue.hs → ...tall/src/Distribution/Client/HashValue.hs
diff --git a/...-install/Distribution/Client/HttpUtils.hs → ...tall/src/Distribution/Client/HttpUtils.hs b/...-install/Distribution/Client/HttpUtils.hs → ...tall/src/Distribution/Client/HttpUtils.hs
diff --git a/...install/Distribution/Client/IndexUtils.hs → ...all/src/Distribution/Client/IndexUtils.hs b/...install/Distribution/Client/IndexUtils.hs → ...all/src/Distribution/Client/IndexUtils.hs
diff --git a/...ribution/Client/IndexUtils/ActiveRepos.hs → ...ribution/Client/IndexUtils/ActiveRepos.hs b/...ribution/Client/IndexUtils/ActiveRepos.hs → ...ribution/Client/IndexUtils/ActiveRepos.hs
diff --git a/...tribution/Client/IndexUtils/IndexState.hs → ...tribution/Client/IndexUtils/IndexState.hs b/...tribution/Client/IndexUtils/IndexState.hs → ...tribution/Client/IndexUtils/IndexState.hs
diff --git a/...stribution/Client/IndexUtils/Timestamp.hs → ...stribution/Client/IndexUtils/Timestamp.hs b/...stribution/Client/IndexUtils/Timestamp.hs → ...stribution/Client/IndexUtils/Timestamp.hs
diff --git a/cabal-install/Distribution/Client/Init.hs → ...l-install/src/Distribution/Client/Init.hs b/cabal-install/Distribution/Client/Init.hs → ...l-install/src/Distribution/Client/Init.hs
diff --git a/...stall/Distribution/Client/Init/Command.hs → ...l/src/Distribution/Client/Init/Command.hs b/...stall/Distribution/Client/Init/Command.hs → ...l/src/Distribution/Client/Init/Command.hs
diff --git a/...tall/Distribution/Client/Init/Defaults.hs → .../src/Distribution/Client/Init/Defaults.hs b/...tall/Distribution/Client/Init/Defaults.hs → .../src/Distribution/Client/Init/Defaults.hs
diff --git a/.../Distribution/Client/Init/FileCreators.hs → .../Distribution/Client/Init/FileCreators.hs b/.../Distribution/Client/Init/FileCreators.hs → .../Distribution/Client/Init/FileCreators.hs
diff --git a/...ll/Distribution/Client/Init/Heuristics.hs → ...rc/Distribution/Client/Init/Heuristics.hs b/...ll/Distribution/Client/Init/Heuristics.hs → ...rc/Distribution/Client/Init/Heuristics.hs
diff --git a/...tall/Distribution/Client/Init/Licenses.hs → .../src/Distribution/Client/Init/Licenses.hs b/...tall/Distribution/Client/Init/Licenses.hs → .../src/Distribution/Client/Init/Licenses.hs
diff --git a/...nstall/Distribution/Client/Init/Prompt.hs → ...ll/src/Distribution/Client/Init/Prompt.hs b/...nstall/Distribution/Client/Init/Prompt.hs → ...ll/src/Distribution/Client/Init/Prompt.hs
diff --git a/...install/Distribution/Client/Init/Types.hs → ...all/src/Distribution/Client/Init/Types.hs b/...install/Distribution/Client/Init/Types.hs → ...all/src/Distribution/Client/Init/Types.hs
diff --git a/...install/Distribution/Client/Init/Utils.hs → ...all/src/Distribution/Client/Init/Utils.hs b/...install/Distribution/Client/Init/Utils.hs → ...all/src/Distribution/Client/Init/Utils.hs
diff --git a/cabal-install/Distribution/Client/Install.hs → ...nstall/src/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs → ...nstall/src/Distribution/Client/Install.hs
diff --git a/...nstall/Distribution/Client/InstallPlan.hs → ...ll/src/Distribution/Client/InstallPlan.hs b/...nstall/Distribution/Client/InstallPlan.hs → ...ll/src/Distribution/Client/InstallPlan.hs
diff --git a/...all/Distribution/Client/InstallSymlink.hs → ...src/Distribution/Client/InstallSymlink.hs b/...all/Distribution/Client/InstallSymlink.hs → ...src/Distribution/Client/InstallSymlink.hs
diff --git a/...install/Distribution/Client/JobControl.hs → ...all/src/Distribution/Client/JobControl.hs b/...install/Distribution/Client/JobControl.hs → ...all/src/Distribution/Client/JobControl.hs
diff --git a/cabal-install/Distribution/Client/List.hs → ...l-install/src/Distribution/Client/List.hs b/cabal-install/Distribution/Client/List.hs → ...l-install/src/Distribution/Client/List.hs
diff --git a/cabal-install/Distribution/Client/Manpage.hs → ...nstall/src/Distribution/Client/Manpage.hs b/cabal-install/Distribution/Client/Manpage.hs → ...nstall/src/Distribution/Client/Manpage.hs
diff --git a/...stall/Distribution/Client/ManpageFlags.hs → ...l/src/Distribution/Client/ManpageFlags.hs b/...stall/Distribution/Client/ManpageFlags.hs → ...l/src/Distribution/Client/ManpageFlags.hs
diff --git a/cabal-install/Distribution/Client/Nix.hs → cabal-install/src/Distribution/Client/Nix.hs b/cabal-install/Distribution/Client/Nix.hs → cabal-install/src/Distribution/Client/Nix.hs
diff --git a/...ll/Distribution/Client/NixStyleOptions.hs → ...rc/Distribution/Client/NixStyleOptions.hs b/...ll/Distribution/Client/NixStyleOptions.hs → ...rc/Distribution/Client/NixStyleOptions.hs
diff --git a/...l-install/Distribution/Client/Outdated.hs → ...stall/src/Distribution/Client/Outdated.hs b/...l-install/Distribution/Client/Outdated.hs → ...stall/src/Distribution/Client/Outdated.hs
diff --git a/...nstall/Distribution/Client/PackageHash.hs → ...ll/src/Distribution/Client/PackageHash.hs b/...nstall/Distribution/Client/PackageHash.hs → ...ll/src/Distribution/Client/PackageHash.hs
diff --git a/...install/Distribution/Client/ParseUtils.hs → ...all/src/Distribution/Client/ParseUtils.hs b/...install/Distribution/Client/ParseUtils.hs → ...all/src/Distribution/Client/ParseUtils.hs
diff --git a/...ll/Distribution/Client/ProjectBuilding.hs → ...rc/Distribution/Client/ProjectBuilding.hs b/...ll/Distribution/Client/ProjectBuilding.hs → ...rc/Distribution/Client/ProjectBuilding.hs
diff --git a/...tribution/Client/ProjectBuilding/Types.hs → ...tribution/Client/ProjectBuilding/Types.hs b/...tribution/Client/ProjectBuilding/Types.hs → ...tribution/Client/ProjectBuilding/Types.hs
diff --git a/...tall/Distribution/Client/ProjectConfig.hs → .../src/Distribution/Client/ProjectConfig.hs b/...tall/Distribution/Client/ProjectConfig.hs → .../src/Distribution/Client/ProjectConfig.hs
diff --git a/...stribution/Client/ProjectConfig/Legacy.hs → ...stribution/Client/ProjectConfig/Legacy.hs b/...stribution/Client/ProjectConfig/Legacy.hs → ...stribution/Client/ProjectConfig/Legacy.hs
diff --git a/...istribution/Client/ProjectConfig/Types.hs → ...istribution/Client/ProjectConfig/Types.hs b/...istribution/Client/ProjectConfig/Types.hs → ...istribution/Client/ProjectConfig/Types.hs
diff --git a/...stall/Distribution/Client/ProjectFlags.hs → ...l/src/Distribution/Client/ProjectFlags.hs b/...stall/Distribution/Client/ProjectFlags.hs → ...l/src/Distribution/Client/ProjectFlags.hs
diff --git a/...stribution/Client/ProjectOrchestration.hs → ...stribution/Client/ProjectOrchestration.hs b/...stribution/Client/ProjectOrchestration.hs → ...stribution/Client/ProjectOrchestration.hs
diff --git a/.../Distribution/Client/ProjectPlanOutput.hs → .../Distribution/Client/ProjectPlanOutput.hs b/.../Distribution/Client/ProjectPlanOutput.hs → .../Distribution/Client/ProjectPlanOutput.hs
diff --git a/...ll/Distribution/Client/ProjectPlanning.hs → ...rc/Distribution/Client/ProjectPlanning.hs b/...ll/Distribution/Client/ProjectPlanning.hs → ...rc/Distribution/Client/ProjectPlanning.hs
diff --git a/...tribution/Client/ProjectPlanning/Types.hs → ...tribution/Client/ProjectPlanning/Types.hs b/...tribution/Client/ProjectPlanning/Types.hs → ...tribution/Client/ProjectPlanning/Types.hs
diff --git a/...stall/Distribution/Client/RebuildMonad.hs → ...l/src/Distribution/Client/RebuildMonad.hs b/...stall/Distribution/Client/RebuildMonad.hs → ...l/src/Distribution/Client/RebuildMonad.hs
diff --git a/...nstall/Distribution/Client/Reconfigure.hs → ...ll/src/Distribution/Client/Reconfigure.hs b/...nstall/Distribution/Client/Reconfigure.hs → ...ll/src/Distribution/Client/Reconfigure.hs
diff --git a/cabal-install/Distribution/Client/Run.hs → cabal-install/src/Distribution/Client/Run.hs b/cabal-install/Distribution/Client/Run.hs → cabal-install/src/Distribution/Client/Run.hs
diff --git a/cabal-install/Distribution/Client/Sandbox.hs → ...nstall/src/Distribution/Client/Sandbox.hs b/cabal-install/Distribution/Client/Sandbox.hs → ...nstall/src/Distribution/Client/Sandbox.hs
diff --git a/...tion/Client/Sandbox/PackageEnvironment.hs → ...tion/Client/Sandbox/PackageEnvironment.hs b/...tion/Client/Sandbox/PackageEnvironment.hs → ...tion/Client/Sandbox/PackageEnvironment.hs
diff --git a/...install/Distribution/Client/SavedFlags.hs → ...all/src/Distribution/Client/SavedFlags.hs b/...install/Distribution/Client/SavedFlags.hs → ...all/src/Distribution/Client/SavedFlags.hs
diff --git a/...stall/Distribution/Client/Security/DNS.hs → ...l/src/Distribution/Client/Security/DNS.hs b/...stall/Distribution/Client/Security/DNS.hs → ...l/src/Distribution/Client/Security/DNS.hs
diff --git a/...tall/Distribution/Client/Security/HTTP.hs → .../src/Distribution/Client/Security/HTTP.hs b/...tall/Distribution/Client/Security/HTTP.hs → .../src/Distribution/Client/Security/HTTP.hs
diff --git a/cabal-install/Distribution/Client/Setup.hs → ...-install/src/Distribution/Client/Setup.hs b/cabal-install/Distribution/Client/Setup.hs → ...-install/src/Distribution/Client/Setup.hs
diff --git a/...stall/Distribution/Client/SetupWrapper.hs → ...l/src/Distribution/Client/SetupWrapper.hs b/...stall/Distribution/Client/SetupWrapper.hs → ...l/src/Distribution/Client/SetupWrapper.hs
diff --git a/.../Distribution/Client/SolverInstallPlan.hs → .../Distribution/Client/SolverInstallPlan.hs b/.../Distribution/Client/SolverInstallPlan.hs → .../Distribution/Client/SolverInstallPlan.hs
diff --git a/...nstall/Distribution/Client/SourceFiles.hs → ...ll/src/Distribution/Client/SourceFiles.hs b/...nstall/Distribution/Client/SourceFiles.hs → ...ll/src/Distribution/Client/SourceFiles.hs
diff --git a/cabal-install/Distribution/Client/SrcDist.hs → ...nstall/src/Distribution/Client/SrcDist.hs b/cabal-install/Distribution/Client/SrcDist.hs → ...nstall/src/Distribution/Client/SrcDist.hs
diff --git a/cabal-install/Distribution/Client/Store.hs → ...-install/src/Distribution/Client/Store.hs b/cabal-install/Distribution/Client/Store.hs → ...-install/src/Distribution/Client/Store.hs
diff --git a/cabal-install/Distribution/Client/Tar.hs → cabal-install/src/Distribution/Client/Tar.hs b/cabal-install/Distribution/Client/Tar.hs → cabal-install/src/Distribution/Client/Tar.hs
diff --git a/...tall/Distribution/Client/TargetProblem.hs → .../src/Distribution/Client/TargetProblem.hs b/...tall/Distribution/Client/TargetProblem.hs → .../src/Distribution/Client/TargetProblem.hs
diff --git a/...all/Distribution/Client/TargetSelector.hs → ...src/Distribution/Client/TargetSelector.hs b/...all/Distribution/Client/TargetSelector.hs → ...src/Distribution/Client/TargetSelector.hs
diff --git a/cabal-install/Distribution/Client/Targets.hs → ...nstall/src/Distribution/Client/Targets.hs b/cabal-install/Distribution/Client/Targets.hs → ...nstall/src/Distribution/Client/Targets.hs
diff --git a/cabal-install/Distribution/Client/Types.hs → ...-install/src/Distribution/Client/Types.hs b/cabal-install/Distribution/Client/Types.hs → ...-install/src/Distribution/Client/Types.hs
diff --git a/...l/Distribution/Client/Types/AllowNewer.hs → ...c/Distribution/Client/Types/AllowNewer.hs b/...l/Distribution/Client/Types/AllowNewer.hs → ...c/Distribution/Client/Types/AllowNewer.hs
diff --git a/...Distribution/Client/Types/BuildResults.hs → ...Distribution/Client/Types/BuildResults.hs b/...Distribution/Client/Types/BuildResults.hs → ...Distribution/Client/Types/BuildResults.hs
diff --git a/...Distribution/Client/Types/ConfiguredId.hs → ...Distribution/Client/Types/ConfiguredId.hs b/...Distribution/Client/Types/ConfiguredId.hs → ...Distribution/Client/Types/ConfiguredId.hs
diff --git a/...ibution/Client/Types/ConfiguredPackage.hs → ...ibution/Client/Types/ConfiguredPackage.hs b/...ibution/Client/Types/ConfiguredPackage.hs → ...ibution/Client/Types/ConfiguredPackage.hs
diff --git a/.../Distribution/Client/Types/Credentials.hs → .../Distribution/Client/Types/Credentials.hs b/.../Distribution/Client/Types/Credentials.hs → .../Distribution/Client/Types/Credentials.hs
diff --git a/...istribution/Client/Types/InstallMethod.hs → ...istribution/Client/Types/InstallMethod.hs b/...istribution/Client/Types/InstallMethod.hs → ...istribution/Client/Types/InstallMethod.hs
diff --git a/...tribution/Client/Types/OverwritePolicy.hs → ...tribution/Client/Types/OverwritePolicy.hs b/...tribution/Client/Types/OverwritePolicy.hs → ...tribution/Client/Types/OverwritePolicy.hs
diff --git a/...tribution/Client/Types/PackageLocation.hs → ...tribution/Client/Types/PackageLocation.hs b/...tribution/Client/Types/PackageLocation.hs → ...tribution/Client/Types/PackageLocation.hs
diff --git a/...ribution/Client/Types/PackageSpecifier.hs → ...ribution/Client/Types/PackageSpecifier.hs b/...ribution/Client/Types/PackageSpecifier.hs → ...ribution/Client/Types/PackageSpecifier.hs
diff --git a/...Distribution/Client/Types/ReadyPackage.hs → ...Distribution/Client/Types/ReadyPackage.hs b/...Distribution/Client/Types/ReadyPackage.hs → ...Distribution/Client/Types/ReadyPackage.hs
diff --git a/...install/Distribution/Client/Types/Repo.hs → ...all/src/Distribution/Client/Types/Repo.hs b/...install/Distribution/Client/Types/Repo.hs → ...all/src/Distribution/Client/Types/Repo.hs
diff --git a/...all/Distribution/Client/Types/RepoName.hs → ...src/Distribution/Client/Types/RepoName.hs b/...all/Distribution/Client/Types/RepoName.hs → ...src/Distribution/Client/Types/RepoName.hs
diff --git a/...tribution/Client/Types/SourcePackageDb.hs → ...tribution/Client/Types/SourcePackageDb.hs b/...tribution/Client/Types/SourcePackageDb.hs → ...tribution/Client/Types/SourcePackageDb.hs
diff --git a/...l/Distribution/Client/Types/SourceRepo.hs → ...c/Distribution/Client/Types/SourceRepo.hs b/...l/Distribution/Client/Types/SourceRepo.hs → ...c/Distribution/Client/Types/SourceRepo.hs
diff --git a/...t/Types/WriteGhcEnvironmentFilesPolicy.hs → ...t/Types/WriteGhcEnvironmentFilesPolicy.hs b/...t/Types/WriteGhcEnvironmentFilesPolicy.hs → ...t/Types/WriteGhcEnvironmentFilesPolicy.hs
diff --git a/cabal-install/Distribution/Client/Update.hs → ...install/src/Distribution/Client/Update.hs b/cabal-install/Distribution/Client/Update.hs → ...install/src/Distribution/Client/Update.hs
diff --git a/cabal-install/Distribution/Client/Upload.hs → ...install/src/Distribution/Client/Upload.hs b/cabal-install/Distribution/Client/Upload.hs → ...install/src/Distribution/Client/Upload.hs
diff --git a/cabal-install/Distribution/Client/Utils.hs → ...-install/src/Distribution/Client/Utils.hs b/cabal-install/Distribution/Client/Utils.hs → ...-install/src/Distribution/Client/Utils.hs
diff --git a/...ll/Distribution/Client/Utils/Assertion.hs → ...rc/Distribution/Client/Utils/Assertion.hs b/...ll/Distribution/Client/Utils/Assertion.hs → ...rc/Distribution/Client/Utils/Assertion.hs
diff --git a/...install/Distribution/Client/Utils/Json.hs → ...all/src/Distribution/Client/Utils/Json.hs b/...install/Distribution/Client/Utils/Json.hs → ...all/src/Distribution/Client/Utils/Json.hs
diff --git a/...stall/Distribution/Client/Utils/Parsec.hs → ...l/src/Distribution/Client/Utils/Parsec.hs b/...stall/Distribution/Client/Utils/Parsec.hs → ...l/src/Distribution/Client/Utils/Parsec.hs
diff --git a/cabal-install/Distribution/Client/VCS.hs → cabal-install/src/Distribution/Client/VCS.hs b/cabal-install/Distribution/Client/VCS.hs → cabal-install/src/Distribution/Client/VCS.hs
diff --git a/...l/Distribution/Client/Win32SelfUpgrade.hs → ...c/Distribution/Client/Win32SelfUpgrade.hs b/...l/Distribution/Client/Win32SelfUpgrade.hs → ...c/Distribution/Client/Win32SelfUpgrade.hs
diff --git a/cabal-install/Distribution/Client/World.hs → ...-install/src/Distribution/Client/World.hs b/cabal-install/Distribution/Client/World.hs → ...-install/src/Distribution/Client/World.hs
diff --git a/...all/Distribution/Deprecated/ParseUtils.hs → ...src/Distribution/Deprecated/ParseUtils.hs b/...all/Distribution/Deprecated/ParseUtils.hs → ...src/Distribution/Deprecated/ParseUtils.hs
diff --git a/...-install/Distribution/Deprecated/ReadP.hs → ...tall/src/Distribution/Deprecated/ReadP.hs b/...-install/Distribution/Deprecated/ReadP.hs → ...tall/src/Distribution/Deprecated/ReadP.hs
diff --git a/...stribution/Deprecated/ViewAsFieldDescr.hs → ...stribution/Deprecated/ViewAsFieldDescr.hs b/...stribution/Deprecated/ViewAsFieldDescr.hs → ...stribution/Deprecated/ViewAsFieldDescr.hs
diff --git a/...all/Distribution/Solver/Compat/Prelude.hs → ...src/Distribution/Solver/Compat/Prelude.hs b/...all/Distribution/Solver/Compat/Prelude.hs → ...src/Distribution/Solver/Compat/Prelude.hs
diff --git a/cabal-install/Distribution/Solver/Modular.hs → ...nstall/src/Distribution/Solver/Modular.hs b/cabal-install/Distribution/Solver/Modular.hs → ...nstall/src/Distribution/Solver/Modular.hs
diff --git a/...Distribution/Solver/Modular/Assignment.hs → ...Distribution/Solver/Modular/Assignment.hs b/...Distribution/Solver/Modular/Assignment.hs → ...Distribution/Solver/Modular/Assignment.hs
diff --git a/...ll/Distribution/Solver/Modular/Builder.hs → ...rc/Distribution/Solver/Modular/Builder.hs b/...ll/Distribution/Solver/Modular/Builder.hs → ...rc/Distribution/Solver/Modular/Builder.hs
diff --git a/...Distribution/Solver/Modular/Configured.hs → ...Distribution/Solver/Modular/Configured.hs b/...Distribution/Solver/Modular/Configured.hs → ...Distribution/Solver/Modular/Configured.hs
diff --git a/...on/Solver/Modular/ConfiguredConversion.hs → ...on/Solver/Modular/ConfiguredConversion.hs b/...on/Solver/Modular/ConfiguredConversion.hs → ...on/Solver/Modular/ConfiguredConversion.hs
diff --git a/...istribution/Solver/Modular/ConflictSet.hs → ...istribution/Solver/Modular/ConflictSet.hs b/...istribution/Solver/Modular/ConflictSet.hs → ...istribution/Solver/Modular/ConflictSet.hs
diff --git a/...all/Distribution/Solver/Modular/Cycles.hs → ...src/Distribution/Solver/Modular/Cycles.hs b/...all/Distribution/Solver/Modular/Cycles.hs → ...src/Distribution/Solver/Modular/Cycles.hs
diff --git a/...Distribution/Solver/Modular/Dependency.hs → ...Distribution/Solver/Modular/Dependency.hs b/...Distribution/Solver/Modular/Dependency.hs → ...Distribution/Solver/Modular/Dependency.hs
diff --git a/...ll/Distribution/Solver/Modular/Explore.hs → ...rc/Distribution/Solver/Modular/Explore.hs b/...ll/Distribution/Solver/Modular/Explore.hs → ...rc/Distribution/Solver/Modular/Explore.hs
diff --git a/...stall/Distribution/Solver/Modular/Flag.hs → ...l/src/Distribution/Solver/Modular/Flag.hs b/...stall/Distribution/Solver/Modular/Flag.hs → ...l/src/Distribution/Solver/Modular/Flag.hs
diff --git a/...tall/Distribution/Solver/Modular/Index.hs → .../src/Distribution/Solver/Modular/Index.hs b/...tall/Distribution/Solver/Modular/Index.hs → .../src/Distribution/Solver/Modular/Index.hs
diff --git a/...ibution/Solver/Modular/IndexConversion.hs → ...ibution/Solver/Modular/IndexConversion.hs b/...ibution/Solver/Modular/IndexConversion.hs → ...ibution/Solver/Modular/IndexConversion.hs
diff --git a/...stribution/Solver/Modular/LabeledGraph.hs → ...stribution/Solver/Modular/LabeledGraph.hs b/...stribution/Solver/Modular/LabeledGraph.hs → ...stribution/Solver/Modular/LabeledGraph.hs
diff --git a/...ll/Distribution/Solver/Modular/Linking.hs → ...rc/Distribution/Solver/Modular/Linking.hs b/...ll/Distribution/Solver/Modular/Linking.hs → ...rc/Distribution/Solver/Modular/Linking.hs
diff --git a/...nstall/Distribution/Solver/Modular/Log.hs → ...ll/src/Distribution/Solver/Modular/Log.hs b/...nstall/Distribution/Solver/Modular/Log.hs → ...ll/src/Distribution/Solver/Modular/Log.hs
diff --git a/...ll/Distribution/Solver/Modular/Message.hs → ...rc/Distribution/Solver/Modular/Message.hs b/...ll/Distribution/Solver/Modular/Message.hs → ...rc/Distribution/Solver/Modular/Message.hs
diff --git a/...nstall/Distribution/Solver/Modular/PSQ.hs → ...ll/src/Distribution/Solver/Modular/PSQ.hs b/...nstall/Distribution/Solver/Modular/PSQ.hs → ...ll/src/Distribution/Solver/Modular/PSQ.hs
diff --git a/...ll/Distribution/Solver/Modular/Package.hs → ...rc/Distribution/Solver/Modular/Package.hs b/...ll/Distribution/Solver/Modular/Package.hs → ...rc/Distribution/Solver/Modular/Package.hs
diff --git a/...Distribution/Solver/Modular/Preference.hs → ...Distribution/Solver/Modular/Preference.hs b/...Distribution/Solver/Modular/Preference.hs → ...Distribution/Solver/Modular/Preference.hs
diff --git a/...l/Distribution/Solver/Modular/RetryLog.hs → ...c/Distribution/Solver/Modular/RetryLog.hs b/...l/Distribution/Solver/Modular/RetryLog.hs → ...c/Distribution/Solver/Modular/RetryLog.hs
diff --git a/...all/Distribution/Solver/Modular/Solver.hs → ...src/Distribution/Solver/Modular/Solver.hs b/...all/Distribution/Solver/Modular/Solver.hs → ...src/Distribution/Solver/Modular/Solver.hs
diff --git a/...stall/Distribution/Solver/Modular/Tree.hs → ...l/src/Distribution/Solver/Modular/Tree.hs b/...stall/Distribution/Solver/Modular/Tree.hs → ...l/src/Distribution/Solver/Modular/Tree.hs
diff --git a/...l/Distribution/Solver/Modular/Validate.hs → ...c/Distribution/Solver/Modular/Validate.hs b/...l/Distribution/Solver/Modular/Validate.hs → ...c/Distribution/Solver/Modular/Validate.hs
diff --git a/...nstall/Distribution/Solver/Modular/Var.hs → ...ll/src/Distribution/Solver/Modular/Var.hs b/...nstall/Distribution/Solver/Modular/Var.hs → ...ll/src/Distribution/Solver/Modular/Var.hs
diff --git a/...ll/Distribution/Solver/Modular/Version.hs → ...rc/Distribution/Solver/Modular/Version.hs b/...ll/Distribution/Solver/Modular/Version.hs → ...rc/Distribution/Solver/Modular/Version.hs
diff --git a/...istribution/Solver/Modular/WeightedPSQ.hs → ...istribution/Solver/Modular/WeightedPSQ.hs b/...istribution/Solver/Modular/WeightedPSQ.hs → ...istribution/Solver/Modular/WeightedPSQ.hs
diff --git a/...istribution/Solver/Types/ComponentDeps.hs → ...istribution/Solver/Types/ComponentDeps.hs b/...istribution/Solver/Types/ComponentDeps.hs → ...istribution/Solver/Types/ComponentDeps.hs
diff --git a/...ribution/Solver/Types/ConstraintSource.hs → ...ribution/Solver/Types/ConstraintSource.hs b/...ribution/Solver/Types/ConstraintSource.hs → ...ribution/Solver/Types/ConstraintSource.hs
diff --git a/...bution/Solver/Types/DependencyResolver.hs → ...bution/Solver/Types/DependencyResolver.hs b/...bution/Solver/Types/DependencyResolver.hs → ...bution/Solver/Types/DependencyResolver.hs
diff --git a/...install/Distribution/Solver/Types/Flag.hs → ...all/src/Distribution/Solver/Types/Flag.hs b/...install/Distribution/Solver/Types/Flag.hs → ...all/src/Distribution/Solver/Types/Flag.hs
diff --git a/...ibution/Solver/Types/InstSolverPackage.hs → ...ibution/Solver/Types/InstSolverPackage.hs b/...ibution/Solver/Types/InstSolverPackage.hs → ...ibution/Solver/Types/InstSolverPackage.hs
diff --git a/...ution/Solver/Types/InstalledPreference.hs → ...ution/Solver/Types/InstalledPreference.hs b/...ution/Solver/Types/InstalledPreference.hs → ...ution/Solver/Types/InstalledPreference.hs
diff --git a/.../Solver/Types/LabeledPackageConstraint.hs → .../Solver/Types/LabeledPackageConstraint.hs b/.../Solver/Types/LabeledPackageConstraint.hs → .../Solver/Types/LabeledPackageConstraint.hs
diff --git a/...stribution/Solver/Types/OptionalStanza.hs → ...stribution/Solver/Types/OptionalStanza.hs b/...stribution/Solver/Types/OptionalStanza.hs → ...stribution/Solver/Types/OptionalStanza.hs
diff --git a/...ibution/Solver/Types/PackageConstraint.hs → ...ibution/Solver/Types/PackageConstraint.hs b/...ibution/Solver/Types/PackageConstraint.hs → ...ibution/Solver/Types/PackageConstraint.hs
diff --git a/...ribution/Solver/Types/PackageFixedDeps.hs → ...ribution/Solver/Types/PackageFixedDeps.hs b/...ribution/Solver/Types/PackageFixedDeps.hs → ...ribution/Solver/Types/PackageFixedDeps.hs
diff --git a/...Distribution/Solver/Types/PackageIndex.hs → ...Distribution/Solver/Types/PackageIndex.hs b/...Distribution/Solver/Types/PackageIndex.hs → ...Distribution/Solver/Types/PackageIndex.hs
diff --git a/.../Distribution/Solver/Types/PackagePath.hs → .../Distribution/Solver/Types/PackagePath.hs b/.../Distribution/Solver/Types/PackagePath.hs → .../Distribution/Solver/Types/PackagePath.hs
diff --git a/...bution/Solver/Types/PackagePreferences.hs → ...bution/Solver/Types/PackagePreferences.hs b/...bution/Solver/Types/PackagePreferences.hs → ...bution/Solver/Types/PackagePreferences.hs
diff --git a/.../Distribution/Solver/Types/PkgConfigDb.hs → .../Distribution/Solver/Types/PkgConfigDb.hs b/.../Distribution/Solver/Types/PkgConfigDb.hs → .../Distribution/Solver/Types/PkgConfigDb.hs
diff --git a/...all/Distribution/Solver/Types/Progress.hs → ...src/Distribution/Solver/Types/Progress.hs b/...all/Distribution/Solver/Types/Progress.hs → ...src/Distribution/Solver/Types/Progress.hs
diff --git a/...tribution/Solver/Types/ResolverPackage.hs → ...tribution/Solver/Types/ResolverPackage.hs b/...tribution/Solver/Types/ResolverPackage.hs → ...tribution/Solver/Types/ResolverPackage.hs
diff --git a/...all/Distribution/Solver/Types/Settings.hs → ...src/Distribution/Solver/Types/Settings.hs b/...all/Distribution/Solver/Types/Settings.hs → ...src/Distribution/Solver/Types/Settings.hs
diff --git a/...all/Distribution/Solver/Types/SolverId.hs → ...src/Distribution/Solver/Types/SolverId.hs b/...all/Distribution/Solver/Types/SolverId.hs → ...src/Distribution/Solver/Types/SolverId.hs
diff --git a/...istribution/Solver/Types/SolverPackage.hs → ...istribution/Solver/Types/SolverPackage.hs b/...istribution/Solver/Types/SolverPackage.hs → ...istribution/Solver/Types/SolverPackage.hs
diff --git a/...istribution/Solver/Types/SourcePackage.hs → ...istribution/Solver/Types/SourcePackage.hs b/...istribution/Solver/Types/SourcePackage.hs → ...istribution/Solver/Types/SourcePackage.hs
diff --git a/...all/Distribution/Solver/Types/Variable.hs → ...src/Distribution/Solver/Types/Variable.hs b/...all/Distribution/Solver/Types/Variable.hs → ...src/Distribution/Solver/Types/Variable.hs