Rework future tense in user-facing messages

tests/functional/fetchGit.sh

@@ -81,7 +81,7 @@ path2=$(nix eval --raw --expr "(builtins.fetchGit { url = file://$repo; rev = \"
 [[ $(nix eval --raw --expr "builtins.readFile (fetchGit { url = file://$repo; rev = \"$rev2\"; } + \"/hello\")") = world ]]
 
 # But without a hash, it fails.
-expectStderr 1 nix eval --expr 'builtins.fetchGit "file:///foo"' | grepQuiet "'fetchGit' will not fetch unlocked input"
+expectStderr 1 nix eval --expr 'builtins.fetchGit "file:///foo"' | grepQuiet "'fetchGit' doesn't fetch unlocked input"
 
 # Fetch again. This should be cached.
 mv $repo ${repo}-tmp

tests/functional/flakes/unlocked-override.sh

@@ -33,7 +33,7 @@ echo 456 > "$flake1Dir"/x.nix
 
 # Dirty overrides require --allow-dirty-locks.
 expectStderr 1 nix flake lock "$flake2Dir" --override-input flake1 "$TEST_ROOT/flake1" |
-  grepQuiet "Will not write lock file.*because it has an unlocked input"
+  grepQuiet "Not writing lock file.*because it has an unlocked input"
 
 nix flake lock "$flake2Dir" --override-input flake1 "$TEST_ROOT/flake1" --allow-dirty-locks
 

tests/nixos/github-flakes.nix

@@ -1,8 +1,7 @@
-{
-  lib,
-  config,
-  nixpkgs,
-  ...
+{ lib
+, config
+, nixpkgs
+, ...
 }:
 let
   pkgs = config.nodes.client.nixpkgs.pkgs;
@@ -147,12 +146,11 @@ in
       };
 
     client =
-      {
-        config,
-        lib,
-        pkgs,
-        nodes,
-        ...
+      { config
+      , lib
+      , pkgs
+      , nodes
+      , ...
       }:
       {
         virtualisation.writableStore = true;
@@ -227,7 +225,7 @@ in
       # Fetching without a narHash should succeed if trust-github is set and fail otherwise.
       client.succeed(f"nix eval --raw --expr 'builtins.fetchTree github:github:fancy-enterprise/private-flake/{info['revision']}'")
       out = client.fail(f"nix eval --no-trust-tarballs-from-git-forges --raw --expr 'builtins.fetchTree github:github:fancy-enterprise/private-flake/{info['revision']}' 2>&1")
-      assert "will not fetch unlocked input" in out, "--no-trust-tarballs-from-git-forges did not fail with the expected error"
+      assert "doesn't fetch unlocked input" in out, "--no-trust-tarballs-from-git-forges did not fail with the expected error"
 
       # Shut down the web server. The flake should be cached on the client.
       github.succeed("systemctl stop httpd.service")