From 587277f347a2581a245a88a000b481808e27aa40 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Fri, 19 Jul 2024 12:15:21 +0100
Subject: [PATCH] Insert package derivations earlier

---
 .../jobs/load-new-guix-revision.scm           | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index fec32b9..79e5b1a 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -1557,6 +1557,26 @@
         "inserting data"
       (let* ((package-ids
               (insert-packages conn packages-data)))
+        (let* ((package-derivation-ids
+                (with-time-logging "inferior-data->package-derivation-ids"
+                  (inferior-data->package-derivation-ids
+                   conn
+                   inf
+                   package-ids
+                   inferior-packages-system-and-target-to-derivations-alist)))
+               (ids-count
+                (length package-derivation-ids)))
+          (chunk-for-each! (lambda (package-derivation-ids-chunk)
+                             (insert-guix-revision-package-derivations
+                              conn
+                              guix-revision-id
+                              package-derivation-ids-chunk))
+                           2000
+                           package-derivation-ids)
+          (simple-format
+           #t "Successfully loaded ~A package/derivation pairs\n"
+           ids-count))
+
         (when inferior-lint-warnings
           (let* ((lint-checker-ids
                   (lint-checkers->lint-checker-ids
@@ -1592,26 +1612,6 @@
                                                  guix-revision-id
                                                  inferior-system-tests))
 
-        (let* ((package-derivation-ids
-                (with-time-logging "inferior-data->package-derivation-ids"
-                  (inferior-data->package-derivation-ids
-                   conn
-                   inf
-                   package-ids
-                   inferior-packages-system-and-target-to-derivations-alist)))
-               (ids-count
-                (length package-derivation-ids)))
-          (chunk-for-each! (lambda (package-derivation-ids-chunk)
-                             (insert-guix-revision-package-derivations
-                              conn
-                              guix-revision-id
-                              package-derivation-ids-chunk))
-                           2000
-                           package-derivation-ids)
-          (simple-format
-           #t "Successfully loaded ~A package/derivation pairs\n"
-           ids-count))
-
         (with-time-logging
             "insert-guix-revision-package-derivation-distribution-counts"
           (insert-guix-revision-package-derivation-distribution-counts