Merge remote-tracking branch 'upstream/master' into path-info

2022-03-25 19:25:08 +00:00
parent 8ba089597f 1844172dd1
commit 0dc2974930
104 changed files with 1735 additions and 767 deletions
@@ -145,7 +145,7 @@ static void fetchTree(
        if (!params.allowNameArgument)
            if (auto nameIter = attrs.find("name"); nameIter != attrs.end())
                throw Error({
-                    .msg = hintfmt("attribute 'name' isn’t supported in call to 'fetchTree'"),
+                    .msg = hintfmt("attribute 'name' isn't supported in call to 'fetchTree'"),
                    .errPos = pos
                });

@@ -334,7 +334,7 @@ static RegisterPrimOp primop_fetchTarball({
    .fun = prim_fetchTarball,
 });

-static void prim_fetchGit(EvalState &state, const Pos &pos, Value **args, Value &v)
+static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
    fetchTree(state, pos, args, v, "git", FetchTreeParams { .emptyRevFallback = true, .allowNameArgument = true });
 }