Fix test eval-okay-autoargs

src/Nix/Entry.hs

@@ -95,7 +95,7 @@ evaluateExpression opts mpath evaluator handler expr = do
         Success x -> x
         Failure err -> errorWithoutStackTrace (show err)
 
-    eval' = (normalForm =<<) . eval Nothing (include opts)
+    eval' = (normalForm =<<) . eval mpath (include opts)
 
     argmap args = embed $ Fix $ NVSet (M.fromList args) mempty
 

tests/NixLanguageTests.hs

@@ -122,8 +122,10 @@ assertEval files = catch go $ \case
         [".exp-disabled"] -> return ()
         [".exp", ".flags"] -> do
             flags <- Text.readFile (name ++ ".flags")
+            let flags' | Text.last flags == '\n' = Text.init flags
+                       | otherwise = flags
             case Opts.execParserPure Opts.defaultPrefs nixOptionsInfo
-                     (fixup (map Text.unpack (Text.splitOn " " flags))) of
+                     (fixup (map Text.unpack (Text.splitOn " " flags'))) of
                 Opts.Failure err -> errorWithoutStackTrace $
                     "Error parsing flags from " ++ name ++ ".flags: "
                         ++ show err