Package registration files are always UTF8

As is the output from ghc-pkg dump.

Distribution/Simple/Program/HcPkg.hs

@@ -38,7 +38,7 @@ import Distribution.Simple.Compiler
 import Distribution.Simple.Program.Types
          ( ConfiguredProgram(programId, programVersion) )
 import Distribution.Simple.Program.Run
-         ( ProgramInvocation(..), programInvocation
+         ( ProgramInvocation(..), IOEncoding(..), programInvocation
          , runProgramInvocation, getProgramInvocationOutput )
 import Distribution.Version
          ( Version(..) )
@@ -168,21 +168,25 @@ registerInvocation, reregisterInvocation
 registerInvocation   = registerInvocation' "register"
 reregisterInvocation = registerInvocation' "update"
 
+
 registerInvocation' :: String
                     -> ConfiguredProgram -> Verbosity -> PackageDB
                     -> Either FilePath InstalledPackageInfo
                     -> ProgramInvocation
 registerInvocation' cmdname hcPkg verbosity packagedb (Left pkgFile) =
-  programInvocation hcPkg $
-       [cmdname, pkgFile, packageDbOpts packagedb]
-    ++ verbosityOpts hcPkg verbosity
+    programInvocation hcPkg args
+  where
+    args = [cmdname, pkgFile, packageDbOpts packagedb]
+        ++ verbosityOpts hcPkg verbosity
 
 registerInvocation' cmdname hcPkg verbosity packagedb (Right pkgInfo) =
-  let args = [cmdname, "-", packageDbOpts packagedb]
-           ++ verbosityOpts hcPkg verbosity
-   in (programInvocation hcPkg args) {
-         progInvokeInput = Just (showInstalledPackageInfo pkgInfo)
-      }
+    (programInvocation hcPkg args) {
+      progInvokeInput         = Just (showInstalledPackageInfo pkgInfo),
+      progInvokeInputEncoding = IOEncodingUTF8
+    }
+  where
+    args = [cmdname, "-", packageDbOpts packagedb]
+        ++ verbosityOpts hcPkg verbosity
 
 
 unregisterInvocation :: ConfiguredProgram
@@ -213,9 +217,12 @@ hideInvocation hcPkg verbosity packagedb pkgid =
 dumpInvocation :: ConfiguredProgram
                -> Verbosity -> PackageDB -> ProgramInvocation
 dumpInvocation hcPkg verbosity packagedb =
-  programInvocation hcPkg $
-       ["dump", packageDbOpts packagedb]
-    ++ verbosityOpts hcPkg verbosity
+    (programInvocation hcPkg args) {
+      progInvokeOutputEncoding = IOEncodingUTF8
+    }
+  where
+    args = ["dump", packageDbOpts packagedb]
+        ++ verbosityOpts hcPkg verbosity
 
 
 packageDbOpts :: PackageDB -> String

Distribution/Simple/Register.hs

@@ -90,7 +90,7 @@ import Distribution.InstalledPackageInfo
          , showInstalledPackageInfo )
 import qualified Distribution.InstalledPackageInfo as IPI
 import Distribution.Simple.Utils
-         ( createDirectoryIfMissingVerbose, writeFileAtomic
+         ( createDirectoryIfMissingVerbose, writeUTF8File, writeFileAtomic
          , die, notice, setupMessage )
 import Distribution.System
          ( OS(..), buildOS )
@@ -148,7 +148,7 @@ register pkg@PackageDescription { library       = Just lib  }
 
     writeRegistrationFile installedPkgInfo = do
       notice verbosity ("Creating package registration file: " ++ regFile)
-      writeFileAtomic regFile (showInstalledPackageInfo installedPkgInfo)
+      writeUTF8File regFile (showInstalledPackageInfo installedPkgInfo)
 
     writeRegisterScript installedPkgInfo =
       case compilerFlavor (compiler lbi) of
@@ -236,8 +236,8 @@ registerPackageHugs verbosity installedPkgInfo pkg lbi inplace _packageDb = do
   when inplace $ die "--inplace is not supported with Hugs"
   let installDirs = absoluteInstallDirs pkg lbi NoCopyDest
   createDirectoryIfMissingVerbose verbosity True (libdir installDirs)
-  writeFileAtomic (libdir installDirs </> "package.conf")
-                  (showInstalledPackageInfo installedPkgInfo)
+  writeUTF8File (libdir installDirs </> "package.conf")
+                (showInstalledPackageInfo installedPkgInfo)
 
 
 writeHcPkgRegisterScript :: Verbosity
@@ -251,7 +251,7 @@ writeHcPkgRegisterScript verbosity installedPkgInfo hcPkg packageDb = do
       regScript   = invocationAsSystemScript buildOS   invocation
 
   notice verbosity ("Creating package registration script: " ++ regScriptFileName)
-  writeFileAtomic regScriptFileName regScript
+  writeUTF8File regScriptFileName regScript
   setFileExecutable regScriptFileName
 
 regScriptFileName :: FilePath