Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 4 insertions, 6 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/pkgs-lib/tests/formats.nix b/infra/libkookie/nixpkgs/pkgs/pkgs-lib/tests/formats.nix
index bf6be8595e1b..16b760a5ada1 100644
--- a/infra/libkookie/nixpkgs/pkgs/pkgs-lib/tests/formats.nix
+++ b/infra/libkookie/nixpkgs/pkgs/pkgs-lib/tests/formats.nix
@@ -15,11 +15,11 @@ let
     in formatSet.generate "test-format-file" config;
 
   runBuildTest = name: { drv, expected }: pkgs.runCommandNoCC name {} ''
-    if diff ${drv} ${builtins.toFile "expected" expected}; then
-      touch $out
+    if diff -u '${builtins.toFile "expected" expected}' '${drv}'; then
+      touch "$out"
     else
-      echo "Got: $(cat ${drv})"
-      echo "Should be: ${expected}"
+      echo
+      echo "Got different values than expected; diff above."
       exit 1
     fi
   '';
@@ -147,9 +147,7 @@ in runBuildTests {
       foo = "foo"
 
       [level1]
-
       [level1.level2]
-
       [level1.level2.level3]
       level4 = "deep"
     '';