1 files changed, 3 insertions, 48 deletions
diff --git a/guix-build-coordinator/utils.scm b/guix-build-coordinator/utils.scm
index a549f20..0acd62a 100644
--- a/guix-build-coordinator/utils.scm
+++ b/guix-build-coordinator/utils.scm
@@ -39,9 +39,6 @@
   #:use-module ((guix http-client)
                 #:select (http-fetch))
   #:use-module (guix serialization)
-  #:use-module ((guix build download)
-                #:select ((open-connection-for-uri
-                           . guix:open-connection-for-uri)))
   #:use-module ((guix build syscalls)
                 #:select (set-thread-name))
   #:use-module (guix scripts substitute)
@@ -66,7 +63,7 @@
 
             read-derivation-from-file*
 
-            with-store/non-blocking
+            non-blocking-port
 
             substitute-derivation
             read-derivation-through-substitutes
@@ -86,9 +83,6 @@
             create-work-queue
             create-thread-pool
 
-            with-timeout
-            reset-timeout
-
             throttle
 
             get-load-average
@@ -399,23 +393,6 @@
       (fcntl port F_SETFL (logior O_NONBLOCK flags)))
     port))
 
-(define (ensure-non-blocking-store-connection store)
-  "Mark the file descriptor that backs STORE, a <store-connection>, as
-O_NONBLOCK."
-  (match (store-connection-socket store)
-    ((? file-port? port)
-     (non-blocking-port port))
-    (_ #f)))
-
-(define-syntax-rule (with-store/non-blocking store exp ...)
-  "Like 'with-store', bind STORE to a connection to the store, but ensure that
-said connection is non-blocking (O_NONBLOCK).  Evaluate EXP... in that
-context."
-  (with-store store
-    (ensure-non-blocking-store-connection store)
-    (let ()
-      exp ...)))
-
 (define* (substitute-derivation store
                                 derivation-name
                                 #:key substitute-urls)
@@ -487,10 +464,9 @@ context."
              (match (assoc-ref cache key)
                (#f
                 (let ((socket
-                       (guix:open-connection-for-uri
+                       (open-socket-for-uri*
                         uri
-                        #:verify-certificate? verify-certificate?
-                        #:timeout timeout)))
+                        #:verify-certificate? verify-certificate?)))
                   (set! cache (alist-cons key socket cache))
                   socket))
                (socket
@@ -1268,27 +1244,6 @@ References: ~a~%"
 
     (values pool-mutex job-available count-threads list-jobs)))
 
-;; copied from (guix scripts substitute)
-(define-syntax-rule (with-timeout duration handler body ...)
-  "Run BODY; when DURATION seconds have expired, call HANDLER, and run BODY
-again."
-  (begin
-    (sigaction SIGALRM
-      (lambda (signum)
-        (sigaction SIGALRM SIG_DFL)
-        handler))
-    (alarm duration)
-    (call-with-values
-        (lambda ()
-          body ...)
-      (lambda result
-        (alarm 0)
-        (sigaction SIGALRM SIG_DFL)
-        (apply values result)))))
-
-(define (reset-timeout duration)
-  (alarm duration))
-
 (define (throttle min-duration thunk)
   (let ((next-min-runtime 0))
     (lambda ()