Merge remote-tracking branch 'upstream/master' into trustless-remote-builder-simple

tests/build-hook-ca.nix

@@ -18,6 +18,7 @@ let
     shell = busybox;
     name = "build-remote-input-1";
     buildCommand = "echo FOO > $out";
+    requiredSystemFeatures = ["foo"];
     outputHash = "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=";
   };
 
@@ -25,6 +26,7 @@ let
     shell = busybox;
     name = "build-remote-input-2";
     buildCommand = "echo BAR > $out";
+    requiredSystemFeatures = ["bar"];
     outputHash = "sha256-XArauVH91AVwP9hBBQNlkX9ccuPpSYx9o0zeIHb6e+Q=";
   };
 
@@ -35,6 +37,7 @@ let
       read x < ${input2}
       echo $x BAZ > $out
     '';
+    requiredSystemFeatures = ["baz"];
     outputHash = "sha256-daKAcPp/+BYMQsVi/YYMlCKoNAxCNDsaivwSHgQqD2s=";
   };
 
@@ -43,10 +46,11 @@ in
   mkDerivation {
     shell = busybox;
     name = "build-remote";
-    buildCommand = ''
-      read x < ${input1}
-      read y < ${input3}
-      echo "$x $y" > $out
-    '';
+    buildCommand =
+      ''
+        read x < ${input1}
+        read y < ${input3}
+        echo "$x $y" > $out
+      '';
     outputHash = "sha256-5SxbkUw6xe2l9TE1uwCvTtTDysD1vhRor38OtDF0LqQ=";
   }

tests/build-remote-content-addressed-fixed.sh

@@ -0,0 +1,5 @@
+source common.sh
+
+file=build-hook-ca.nix
+
+source build-remote.sh

tests/build-remote-input-addressed.sh

@@ -0,0 +1,5 @@
+source common.sh
+
+file=build-hook.nix
+
+source build-remote.sh

tests/build-remote-trustless.sh

@@ -4,10 +4,8 @@ if ! [[ $busybox =~ busybox ]]; then exit; fi
 unset NIX_STORE_DIR
 unset NIX_STATE_DIR
 
-# Note: ssh://localhost bypasses ssh, directly invoking nix-store as a
-# child process. This allows us to test LegacySSHStore::buildDerivation().
-# ssh-ng://... likewise allows us to test RemoteStore::buildDerivation().
-
+# Note: ssh{-ng}://localhost bypasses ssh. See tests/build-remote.sh for
+# more details.
 nix build -L -v -f $file -o $TEST_ROOT/result --max-jobs 0 \
   --arg busybox $busybox \
   --store $TEST_ROOT/local \

tests/build-remote.sh

@@ -1,5 +1,3 @@
-source common.sh
-
 if ! canUseSandbox; then exit; fi
 if ! [[ $busybox =~ busybox ]]; then exit; fi
 
@@ -19,7 +17,7 @@ builders=(
 # Note: ssh://localhost bypasses ssh, directly invoking nix-store as a
 # child process. This allows us to test LegacySSHStore::buildDerivation().
 # ssh-ng://... likewise allows us to test RemoteStore::buildDerivation().
-nix build -L -v -f build-hook.nix -o $TEST_ROOT/result --max-jobs 0 \
+nix build -L -v -f $file -o $TEST_ROOT/result --max-jobs 0 \
   --arg busybox $busybox \
   --store $TEST_ROOT/machine0 \
   --builders "$(join_by '; ' "${builders[@]}")"

tests/local.mk

@@ -14,7 +14,8 @@ nix_tests = \
   placeholders.sh nix-shell.sh \
   linux-sandbox.sh \
   build-dry.sh \
-  build-remote.sh \
+  build-remote-input-addressed.sh \
+  build-remote-content-addressed-fixed.sh \
   build-remote-trustless-should-pass-1.sh \
   build-remote-trustless-should-pass-2.sh \
   build-remote-trustless-should-pass-3.sh \