Merge remote-tracking branch 'upstream/master' into split-buildRemote

src/hydra-queue-runner/state.hh

@@ -21,6 +21,7 @@
 #include "store-api.hh"
 #include "sync.hh"
 #include "nar-extractor.hh"
+#include "worker-protocol.hh"
 
 
 typedef unsigned int BuildID;
@@ -308,6 +309,16 @@ struct Machine
 
         // Backpointer to the machine
         ptr machine;
+
+        operator nix::WorkerProto::ReadConn ()
+        {
+            return { .from = from };
+        }
+
+        operator nix::WorkerProto::WriteConn ()
+        {
+            return { .to = to };
+        }
     };
 };