Clean up.

src/Package.hs

@@ -6,7 +6,6 @@ import Util
 import Data.Function
 import GHC.Generics
 import Development.Shake.Classes
-import Development.Shake.FilePath
 
 -- pkgPath is the path to the source code relative to the root
 data Package = Package

src/Rules/Data.hs

@@ -16,7 +16,6 @@ import Rules.Actions
 import Control.Applicative
 import Control.Monad.Extra
 import Development.Shake
-import Development.Shake.FilePath
 
 -- Build package-data.mk by using GhcCabal to process pkgCabal file
 buildPackageData :: StagePackageTarget -> Rules ()

src/Settings/GhcPkg.hs

@@ -12,8 +12,8 @@ import Development.Shake.FilePath
 
 ghcPkgArgs :: Args
 ghcPkgArgs = do
-    pkg <- asks getPackage
     stage <- asks getStage
+    pkg   <- asks getPackage
     builder (GhcPkg stage) ? mconcat
         [ arg "update"
         , arg "--force"

src/Util.hs

 module Util (
     module Data.Char,
     module System.Console.ANSI,
+    module Development.Shake.FilePath,
     replaceIf, replaceEq, replaceSeparators,
     unifyPath,
     chunksOfSize,