guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: check-available-binaries: Use 'substitution-oracle'.


From: Ludovic Courtès
Subject: 03/03: check-available-binaries: Use 'substitution-oracle'.
Date: Wed, 14 Jan 2015 17:54:00 +0000

civodul pushed a commit to branch core-updates
in repository guix.

commit df5188ddfa0c004009c7fcb0ce09a27bb50b9a59
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jan 14 18:28:46 2015 +0100

    check-available-binaries: Use 'substitution-oracle'.
    
    * build-aux/check-available-binaries.scm: Use 'substitution-oracle'.
      Changer caller and 'warn' accordingly.
---
 build-aux/check-available-binaries.scm |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build-aux/check-available-binaries.scm 
b/build-aux/check-available-binaries.scm
index ebe94d2..7ac4352 100644
--- a/build-aux/check-available-binaries.scm
+++ b/build-aux/check-available-binaries.scm
@@ -37,18 +37,18 @@
                            %bootstrap-tarballs <>)
                       '("mips64el-linux-gnuabi64")))
          (total  (append native cross)))
-    (define (warn proc)
-      (lambda (drv)
-        (or (proc drv)
-            (begin
-              (format (current-error-port) "~a is not substitutable~%"
-                      drv)
-              #f))))
+    (define (warn item system)
+      (format (current-error-port) "~a (~a) is not substitutable~%"
+              item system)
+      #f)
 
     (set-build-options store #:use-substitutes? #t)
-    (let ((result (every (compose (warn (cut has-substitutes? store <>))
-                                  derivation->output-path)
-                         total)))
+    (let* ((substitutable? (substitution-oracle store total))
+           (result         (every (lambda (drv)
+                                    (let ((out (derivation->output-path drv)))
+                                      (or (substitutable? out)
+                                          (warn out (derivation-system drv)))))
+                                  total)))
       (when result
         (format (current-error-port) "~a packages found substitutable~%"
                 (length total)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]