From 46eb5369d2470e333413e55642c14ec44ca761f0 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Wed, 17 Jul 2024 07:00:42 +0000
Subject: [PATCH] fix binary cache test on old sshd

---
 nix/tests/vm-test/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nix/tests/vm-test/default.nix b/nix/tests/vm-test/default.nix
index 598d568..ed215a2 100644
--- a/nix/tests/vm-test/default.nix
+++ b/nix/tests/vm-test/default.nix
@@ -138,8 +138,10 @@ let
       targetArg = pkg: "--substitution-targets ${pkg.outPath}";
       targetArgs = lib.concatMapStringsSep " " targetArg rootPaths;
     in {
+      # We need -O for the old scp protocol because RHEL 8 has old SSH with broken SFTP
+      # Might be deprecated soon, so remove when we remove RHEL 8
       copyTarball = ''
-        scp -P 20022 $ssh_opts -r ${binaryCache} vagrant@localhost:binaryCache
+        scp -O -P 20022 $ssh_opts -r ${binaryCache} vagrant@localhost:binaryCache
       '';
       install = ''
         pushd binaryCache