From 853aaa6a7ceac047d6d876459a98ca6b0ecd8df1 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Fri, 9 Oct 2020 19:30:48 +0100
Subject: [PATCH] Use letpar& for systems and targets in
 render-compare/derivations

---
 guix-data-service/web/compare/controller.scm | 40 +++++++++++---------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/guix-data-service/web/compare/controller.scm b/guix-data-service/web/compare/controller.scm
index 17b5550..07b03be 100644
--- a/guix-data-service/web/compare/controller.scm
+++ b/guix-data-service/web/compare/controller.scm
@@ -520,16 +520,19 @@
          (render-json
           '((error . "invalid query"))))
         (else
+         (letpar& ((systems
+                    (with-thread-postgresql-connection
+                     valid-systems))
+                   (targets
+                    (with-thread-postgresql-connection
+                     valid-targets)))
          (render-html
           #:sxml (compare/derivations
                   query-parameters
-                  (parallel-via-thread-pool-channel
-                   (with-thread-postgresql-connection valid-systems))
-                  (valid-targets->options
-                   (parallel-via-thread-pool-channel
-                    (with-thread-postgresql-connection valid-targets)))
+                  systems
+                  (valid-targets->options targets)
                   build-status-strings
-                  '()))))
+                  '())))))
 
       (let ((base-commit    (assq-ref query-parameters 'base_commit))
             (target-commit  (assq-ref query-parameters 'target_commit))
@@ -562,17 +565,20 @@
                     derivation-changes
                     #:extra-headers http-headers-for-unchanging-content))
                   (else
-                   (render-html
-                    #:sxml (compare/derivations
-                            query-parameters
-                            (parallel-via-thread-pool-channel
-                             (with-thread-postgresql-connection valid-systems))
-                            (valid-targets->options
-                             (parallel-via-thread-pool-channel
-                              (with-thread-postgresql-connection valid-targets)))
-                            build-status-strings
-                            derivation-changes)
-                    #:extra-headers http-headers-for-unchanging-content))))))))))
+                   (letpar& ((systems
+                              (with-thread-postgresql-connection
+                               valid-systems))
+                             (targets
+                              (with-thread-postgresql-connection
+                               valid-targets)))
+                     (render-html
+                      #:sxml (compare/derivations
+                              query-parameters
+                              systems
+                              (valid-targets->options targets)
+                              build-status-strings
+                              derivation-changes)
+                      #:extra-headers http-headers-for-unchanging-content)))))))))))
 
 (define (render-compare-by-datetime/derivations mime-types
                                                 query-parameters)