src: Nix: replace last FilePath in function types for Path

Author: Anton-Latukha

main/Main.hs

@@ -154,7 +154,7 @@ main' opts@Options{..} = runWithBasicEffectsIO opts execContentsFilesOrRepl
     | evaluate =
       if
         | tracing                       -> evaluateExprWithEvaluator nixTracingEvalExprLoc expr
-        | Just path <- reduce           -> evaluateExprWithEvaluator (reduction (coerce path) . coerce) expr
+        | Just path <- reduce           -> evaluateExprWithEvaluator (reduction path . coerce) expr
         | null arg || null argstr       -> evaluateExprWithEvaluator nixEvalExprLoc expr
         | otherwise                     -> processResult printer <=< nixEvalExprLoc (coerce mpath) $ expr
     | xml                        = fail "Rendering expression trees to XML is not yet implemented"

src/Nix.hs

@@ -58,15 +58,15 @@ nixEval
   :: (MonadNix e t f m, Has e Options, Functor g)
   => Transform g (m a)
   -> Alg g (m a)
-  -> Maybe FilePath
+  -> Maybe Path
   -> Fix g
   -> m a
-nixEval transform alg mpath = withNixContext (coerce mpath) . adi transform alg
+nixEval transform alg mpath = withNixContext mpath . adi transform alg
 
 -- | Evaluate a nix expression in the default context
 nixEvalExpr
   :: (MonadNix e t f m, Has e Options)
-  => Maybe FilePath
+  => Maybe Path
   -> NExpr
   -> m (NValue t f m)
 nixEvalExpr = nixEval id Eval.eval
@@ -75,7 +75,7 @@ nixEvalExpr = nixEval id Eval.eval
 nixEvalExprLoc
   :: forall e t f m
    . (MonadNix e t f m, Has e Options)
-  => Maybe FilePath
+  => Maybe Path
   -> NExprLoc
   -> m (NValue t f m)
 nixEvalExprLoc =
@@ -90,15 +90,15 @@ nixEvalExprLoc =
 --   context.
 nixTracingEvalExprLoc
   :: (MonadNix e t f m, Has e Options, MonadIO m, Alternative m)
-  => Maybe FilePath
+  => Maybe Path
   -> NExprLoc
   -> m (NValue t f m)
-nixTracingEvalExprLoc mpath = withNixContext (coerce mpath) . evalExprLoc
+nixTracingEvalExprLoc mpath = withNixContext mpath . evalExprLoc
 
 evaluateExpression
   :: (MonadNix e t f m, Has e Options)
-  => Maybe FilePath
-  -> (Maybe FilePath -> NExprLoc -> m (NValue t f m))
+  => Maybe Path
+  -> (Maybe Path -> NExprLoc -> m (NValue t f m))
   -> (NValue t f m -> m a)
   -> NExprLoc
   -> m a

src/Nix/Builtins.hs

@@ -1115,10 +1115,10 @@ toFileNix name s =
         (stringIgnoreContext s')
 
     let
-      t  = coerce $ toText @FilePath $ coerce mres
-      sc = StringContext t DirectPath
+      storepath  = coerce $ toText @FilePath $ coerce mres
+      sc = StringContext storepath DirectPath
 
-    toValue $ mkNixStringWithSingletonContext t sc
+    toValue $ mkNixStringWithSingletonContext storepath sc
 
 toPathNix :: MonadNix e t f m => NValue t f m -> m (NValue t f m)
 toPathNix = toValue @Path <=< fromValue @Path