@@ -137,7 +137,7 @@ instance MonadExec IO where
137137 (prog : args) -> do
138138 (exitCode, out, _) <- liftIO $ readProcessWithExitCode (toString prog) (toString <$> args) " "
139139 let
140- t = Text. strip $ toText out
140+ t = Text. strip $ fromString out
141141 emsg = " program[" <> prog <> " ] args=" <> show args
142142 case exitCode of
143143 ExitSuccess ->
@@ -194,7 +194,7 @@ instance MonadInstantiate IO where
194194 either
195195 (\ e -> Left $ ErrorCall $ " Error parsing output of nix-instantiate: " <> show e)
196196 pure
197- (parseNixTextLoc $ toText out)
197+ (parseNixTextLoc $ fromString out)
198198 status -> Left $ ErrorCall $ " nix-instantiate failed: " <> show status <> " : " <> err
199199
200200deriving
@@ -230,12 +230,12 @@ class
230230-- ** Instances
231231
232232instance MonadEnv IO where
233- getEnvVar = (<<$>>) toText . lookupEnv . toString
233+ getEnvVar = (<<$>>) fromString . lookupEnv . toString
234234
235- getCurrentSystemOS = pure $ toText System.Info. os
235+ getCurrentSystemOS = pure $ fromString System.Info. os
236236
237237 -- Invert the conversion done by GHC_CONVERT_CPU in GHC's aclocal.m4
238- getCurrentSystemArch = pure $ toText $ case System.Info. arch of
238+ getCurrentSystemArch = pure $ fromString $ case System.Info. arch of
239239 " i386" -> " i686"
240240 arch -> arch
241241
@@ -438,7 +438,7 @@ addPath p =
438438 either
439439 throwError
440440 pure
441- =<< addToStore (toText $ takeFileName (coerce p)) p True False
441+ =<< addToStore (fromString $ takeFileName (coerce p)) p True False
442442
443- toFile_ :: (Framed e m , MonadStore m ) => Path -> String -> m StorePath
444- toFile_ p contents = addTextToStore (toText p) (toText contents) mempty False
443+ toFile_ :: (Framed e m , MonadStore m ) => Path -> Text -> m StorePath
444+ toFile_ p contents = addTextToStore (toText p) contents mempty False
0 commit comments