13/33: Return two values from channel->source-and-derivations-by-system

[Christopher Baines]

cbaines pushed a commit to branch master
in repository data-service.

commit 2da3a195ea26fb6804475f21d1ad1c65aef19f6c
Author: Christopher Baines <m...@cbaines.net>
AuthorDate: Fri Jul 19 11:50:14 2024 +0100

    Return two values from channel->source-and-derivations-by-system
---
 guix-data-service/jobs/load-new-guix-revision.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm 
b/guix-data-service/jobs/load-new-guix-revision.scm
index 9f46c47..fec32b9 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -1249,7 +1249,7 @@
                         derivation-file-name)))
       derivation-file-names-by-system)
 
-     (cons source derivation-file-names-by-system))))
+     (values source derivation-file-names-by-system))))
 
 (prevent-inlining-for-tests channel->source-and-derivations-by-system)
 
@@ -1679,16 +1679,13 @@
           (channel (name 'guix)
                    (url git-repository-url)
                    (commit commit)))
-         (source-and-channel-derivations-by-system
+         (guix-source
+          channel-derivations-by-system
           (channel->source-and-derivations-by-system
            conn
            channel-for-commit
            fetch-with-authentication?
            #:parallelism parallelism))
-         (guix-source
-          (car source-and-channel-derivations-by-system))
-         (channel-derivations-by-system
-          (cdr source-and-channel-derivations-by-system))
          (guix-revision-id
           (load-channel-instances git-repository-id commit
                                   channel-derivations-by-system)))