restore initial generateTestOkHash

artiq/windows/qemu.nix

@@ -15,12 +15,11 @@ let
         if isolateNetwork
         then "on"
         else "off";
-      nc = "${netcat}/bin/nc";
-      # use netcat instead of `tcp:…` to allow multiple connections
+      # use socat instead of `tcp:…` to allow multiple connections
       guestfwds =
         builtins.concatStringsSep ""
         (map ({ listenAddr, targetAddr, port }:
-          ",guestfwd=tcp:${listenAddr}:${toString port}-cmd:${nc}\\ ${targetAddr}\\ ${toString port}"
+          ",guestfwd=tcp:${listenAddr}:${toString port}-cmd:${socat}/bin/socat\\ -\\ tcp:${targetAddr}:${toString port}"
         ) forwardedPorts);
       args = [
         "-enable-kvm"

main.nix

@@ -24,7 +24,7 @@ let
   generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; }
     ''
     TMPDIR=`mktemp -d`
-    cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed2
+    cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed
     HASH=`nix-hash --type sha256 --base32 $TMPDIR`
     echo \"$HASH\" > $out
     '';
@@ -104,7 +104,7 @@ in
       ${windowsRunner { testCommand = "set ARTIQ_ROOT=%cd%\\anaconda\\envs\\artiq-env\\Lib\\site-packages\\artiq\\examples\\kc705_nist_clock&&set ARTIQ_LOW_LATENCY=1&&python -m unittest discover -v artiq.test.coredevice"; }}/bin/run.sh
 
       mkdir $out
-      cp ${generatedNix}/pkgs/artiq-version.nix $out/passed2
+      cp ${generatedNix}/pkgs/artiq-version.nix $out/passed
       '';
     };
   }