Merge "Remove ancient `let` from 2 test files" into main

2 files changed, 21 insertions, 27 deletions

diff --git a/tests/functional/dependencies.nix b/tests/functional/dependencies.nix
index be1a7ae9a..0ede76b71 100644
--- a/tests/functional/dependencies.nix
+++ b/tests/functional/dependencies.nix
@@ -1,8 +1,7 @@
 { hashInvalidator ? "" }:
 with import ./config.nix;
 
-let {
-
+let
   input0 = mkDerivation {
     name = "dependencies-input-0";
     buildCommand = "mkdir $out; echo foo > $out/bar";
@@ -32,17 +31,15 @@ let {
     outputHashAlgo = "sha256";
     outputHash = "1dq9p0hnm1y75q2x40fws5887bq1r840hzdxak0a9djbwvx0b16d";
   };
-
-  body = mkDerivation {
-    name = "dependencies-top";
-    builder = ./dependencies.builder0.sh + "/FOOBAR/../.";
-    input1 = input1 + "/.";
-    input2 = "${input2}/.";
-    input1_drv = input1;
-    input2_drv = input2;
-    input0_drv = input0;
-    fod_input_drv = fod_input;
-    meta.description = "Random test package";
-  };
-
+in
+mkDerivation {
+  name = "dependencies-top";
+  builder = ./dependencies.builder0.sh + "/FOOBAR/../.";
+  input1 = input1 + "/.";
+  input2 = "${input2}/.";
+  input1_drv = input1;
+  input2_drv = input2;
+  input0_drv = input0;
+  fod_input_drv = fod_input;
+  meta.description = "Random test package";
 }
diff --git a/tests/functional/hash-check.nix b/tests/functional/hash-check.nix
index f029f0cc9..6095bc57f 100644
--- a/tests/functional/hash-check.nix
+++ b/tests/functional/hash-check.nix
@@ -1,5 +1,4 @@
-let {
-
+let
   input1 = derivation {
     name = "dependencies-input-1";
     system = "i086-msdos";
@@ -16,14 +15,12 @@ let {
     outputHashAlgo = "md5";
     outputHash = "ffffffffffffffffffffffffffffffff";
   };
-
-  body = derivation {
-    name = "dependencies";
-    system = "i086-msdos";
-    builder = "/bar/sh";
-    args = ["-e" "-x" (./dummy  + "/FOOBAR/../.")];
-    input1 = input1 + "/.";
-    inherit input2;
-  };
-
+in
+derivation {
+  name = "dependencies";
+  system = "i086-msdos";
+  builder = "/bar/sh";
+  args = ["-e" "-x" (./dummy  + "/FOOBAR/../.")];
+  input1 = input1 + "/.";
+  inherit input2;
 }