diff --git a/Cabal/Distribution/System.hs b/Cabal/Distribution/System.hs
index fbeb1f33ffbe4de7a9309693190ad22d62611f2e..efcb47f11cd788b44f72a26c2fd8859adbfad32e 100644
--- a/Cabal/Distribution/System.hs
+++ b/Cabal/Distribution/System.hs
@@ -167,6 +167,7 @@ instance Text Platform where
     os   <- parse
     return (Platform arch os)
 
+
 buildPlatform :: Platform
 buildPlatform = Platform buildArch buildOS
 
@@ -180,13 +181,14 @@ lowercase :: String -> String
 lowercase = map Char.toLower
 
 platformFromTriple :: String -> Maybe Platform
-platformFromTriple triple = fmap fst (listToMaybe $ Parse.readP_to_S parseTriple triple)
+platformFromTriple triple =
+  fmap fst (listToMaybe $ Parse.readP_to_S parseTriple triple)
   where parseWord = Parse.munch1 (\c -> Char.isAlphaNum c || c == '_')
         parseTriple = do
           arch <- fmap (classifyArch Strict) parseWord
           _ <- Parse.char '-'
           _ <- parseWord -- Skip vendor
           _ <- Parse.char '-'
-          os <- fmap (classifyOS Compat) ident -- OS may have hyphens, like 'nto-qnx'
+          os <- fmap (classifyOS Compat) ident -- OS may have hyphens, like
+                                               -- 'nto-qnx'
           return $ Platform arch os
-
diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index 9d3af4e0df8ea99f0287ca930bceb7e3cfc7b31b..f65c5dfb304d3ec1a32ae580dea8c6b797a74221 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -88,7 +88,8 @@ import Distribution.Client.JobControl
 import Distribution.Simple.Compiler
          ( CompilerId(..), Compiler(compilerId), compilerFlavor
          , PackageDB(..), PackageDBStack )
-import Distribution.Simple.Program (ProgramConfiguration, defaultProgramConfiguration)
+import Distribution.Simple.Program (ProgramConfiguration,
+                                    defaultProgramConfiguration)
 import qualified Distribution.Simple.InstallDirs as InstallDirs
 import qualified Distribution.Simple.PackageIndex as PackageIndex
 import Distribution.Simple.PackageIndex (PackageIndex)
@@ -474,7 +475,8 @@ packageStatus installedPkgIndex cpkg =
   case PackageIndex.lookupPackageName installedPkgIndex
                                       (packageName cpkg) of
     [] -> NewPackage
-    ps ->  case filter ((==packageId cpkg) . Installed.sourcePackageId) (concatMap snd ps) of
+    ps ->  case filter ((==packageId cpkg)
+                        . Installed.sourcePackageId) (concatMap snd ps) of
       []           -> NewVersion (map fst ps)
       pkgs@(pkg:_) -> Reinstall (map Installed.installedPackageId pkgs)
                                 (changes pkg cpkg)
@@ -484,15 +486,17 @@ packageStatus installedPkgIndex cpkg =
     changes :: Installed.InstalledPackageInfo
             -> ConfiguredPackage
             -> [MergeResult PackageIdentifier PackageIdentifier]
-    changes pkg pkg' = filter changed
-                     $ mergeBy (comparing packageName)
-                         -- get dependencies of installed package (convert to source pkg ids via index)
-                         (nub . sort . concatMap (maybeToList .
-                                                  fmap Installed.sourcePackageId .
-                                                  PackageIndex.lookupInstalledPackageId installedPkgIndex) .
-                                                  Installed.depends $ pkg)
-                         -- get dependencies of configured package
-                         (nub . sort . depends $ pkg')
+    changes pkg pkg' =
+      filter changed
+      $ mergeBy (comparing packageName)
+        -- get dependencies of installed package (convert to source pkg ids via
+        -- index)
+        (nub . sort . concatMap
+         (maybeToList . fmap Installed.sourcePackageId .
+          PackageIndex.lookupInstalledPackageId installedPkgIndex) .
+         Installed.depends $ pkg)
+        -- get dependencies of configured package
+        (nub . sort . depends $ pkg')
 
     changed (InBoth    pkgid pkgid') = pkgid /= pkgid'
     changed _                        = True
@@ -509,7 +513,8 @@ printPlan dryRun verbosity plan sourcePkgDb = case plan of
         ("In order, the following " ++ wouldWill ++ " be installed:")
       : map showPkgAndReason pkgs
     | otherwise -> notice verbosity $ unlines $
-        ("In order, the following " ++ wouldWill ++ " be installed (use -v for more details):")
+        ("In order, the following " ++ wouldWill
+         ++ " be installed (use -v for more details):")
       : map showPkg pkgs
   where
     wouldWill | dryRun    = "would"
@@ -604,7 +609,8 @@ postInstallActions verbosity
       | UserTargetNamed dep <- targets ]
 
   let buildReports = BuildReports.fromInstallPlan installPlan
-  BuildReports.storeLocal (installSummaryFile installFlags) buildReports (InstallPlan.planPlatform installPlan)
+  BuildReports.storeLocal (installSummaryFile installFlags) buildReports
+    (InstallPlan.planPlatform installPlan)
   when (reportingLevel >= AnonymousReports) $
     BuildReports.storeAnonymous buildReports
   when (reportingLevel == DetailedReports) $
@@ -888,7 +894,8 @@ performInstallations verbosity
     substLogFileName template pkg = fromPathTemplate
                                   . substPathTemplate env
                                   $ template
-      where env = initialPathTemplateEnv (packageId pkg) (compilerId comp) platform
+      where env = initialPathTemplateEnv (packageId pkg)
+                  (compilerId comp) platform
 
     miscOptions  = InstallMisc {
       rootCmd    = if fromFlag (configUserInstall configFlags)
@@ -981,7 +988,8 @@ installConfiguredPackage :: Platform -> CompilerId
                                          -> PackageDescriptionOverride -> a)
                          -> a
 installConfiguredPackage platform comp configFlags
-  (ConfiguredPackage (SourcePackage _ gpkg source pkgoverride) flags stanzas deps)
+  (ConfiguredPackage (SourcePackage _ gpkg source pkgoverride)
+   flags stanzas deps)
   installPkg = installPkg configFlags {
     configConfigurationsFlags = flags,
     configConstraints = map thisPackageVersion deps,
@@ -1236,7 +1244,8 @@ withWin32SelfUpgrade verbosity configFlags compid platform pkg action = do
         templateDirs   = InstallDirs.combineInstallDirs fromFlagOrDefault
                            defaultDirs (configInstallDirs configFlags)
         absoluteDirs   = InstallDirs.absoluteInstallDirs
-                           pkgid compid InstallDirs.NoCopyDest platform templateDirs
+                           pkgid compid InstallDirs.NoCopyDest
+                           platform templateDirs
         substTemplate  = InstallDirs.fromPathTemplate
                        . InstallDirs.substPathTemplate env
           where env = InstallDirs.initialPathTemplateEnv pkgid compid platform
diff --git a/cabal-install/src/Main.hs b/cabal-install/src/Main.hs
index 12b267cd09b004a3e57a02a7214af3f3bf8ca5cb..4cebbe79e056a5f242b8245aeb8dfaf6ffd26c7c 100644
--- a/cabal-install/src/Main.hs
+++ b/cabal-install/src/Main.hs
@@ -345,7 +345,8 @@ reconfigure verbosity distPref    addConfigFlags
                     | otherwise -> case LBI.pkgDescrFile lbi of
                         Nothing -> return Nothing
                         Just pdFile -> do
-                            outdated <- checkPersistBuildConfigOutdated distPref pdFile
+                            outdated <- checkPersistBuildConfigOutdated
+                                        distPref pdFile
                             return $! if outdated
                                 then Just $! outdatedMessage pdFile
                                 else Nothing
@@ -399,7 +400,8 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags)
   (comp, _, conf) <- configCompilerAux' configFlags'
   install verbosity
           (configPackageDB' configFlags') (globalRepos globalFlags')
-          comp conf globalFlags' configFlags' configExFlags' installFlags' haddockFlags
+          comp conf globalFlags' configFlags' configExFlags'
+          installFlags' haddockFlags
           targets
 
 testAction :: TestFlags -> [String] -> GlobalFlags -> IO ()