From 58caebf0327aafe6240612f28c339f5a00cd2c92 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 14 Jan 2015 17:05:10 +0100 Subject: build: Use the canonical list of supported systems in 'assert-*'. * build-aux/check-available-binaries.scm (%supported-systems): Remove. * build-aux/check-final-inputs-self-contained.scm (%supported-systems): Remove. --- build-aux/check-available-binaries.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'build-aux/check-available-binaries.scm') diff --git a/build-aux/check-available-binaries.scm b/build-aux/check-available-binaries.scm index d5163a9503..74a43ff1d8 100644 --- a/build-aux/check-available-binaries.scm +++ b/build-aux/check-available-binaries.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,9 +28,6 @@ (srfi srfi-1) (srfi srfi-26)) -(define %supported-systems - '("x86_64-linux" "i686-linux")) - (let* ((store (open-connection)) (native (append-map (lambda (system) (map (cut package-derivation store <> system) -- cgit v1.2.3 From 619c9522b2d6d7c451f90524c3a041c5fb12c28e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 14 Jan 2015 18:20:01 +0100 Subject: check-available-binaries: Use 'with-store'. * build-aux/check-available-binaries.scm: Use 'with-store' instead of an explicit 'open-connection'. --- build-aux/check-available-binaries.scm | 48 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'build-aux/check-available-binaries.scm') diff --git a/build-aux/check-available-binaries.scm b/build-aux/check-available-binaries.scm index 74a43ff1d8..ebe94d2f7f 100644 --- a/build-aux/check-available-binaries.scm +++ b/build-aux/check-available-binaries.scm @@ -28,28 +28,28 @@ (srfi srfi-1) (srfi srfi-26)) -(let* ((store (open-connection)) - (native (append-map (lambda (system) - (map (cut package-derivation store <> system) - (list %bootstrap-tarballs emacs))) - %supported-systems)) - (cross (map (cut package-cross-derivation store - %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)))) +(with-store store + (let* ((native (append-map (lambda (system) + (map (cut package-derivation store <> system) + (list %bootstrap-tarballs emacs))) + %supported-systems)) + (cross (map (cut package-cross-derivation store + %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)))) - (set-build-options store #:use-substitutes? #t) - (let ((result (every (compose (warn (cut has-substitutes? store <>)) - derivation->output-path) - total))) - (when result - (format (current-error-port) "~a packages found substitutable~%" - (length total))) - (exit result))) + (set-build-options store #:use-substitutes? #t) + (let ((result (every (compose (warn (cut has-substitutes? store <>)) + derivation->output-path) + total))) + (when result + (format (current-error-port) "~a packages found substitutable~%" + (length total))) + (exit result)))) -- cgit v1.2.3 From df5188ddfa0c004009c7fcb0ce09a27bb50b9a59 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 14 Jan 2015 18:28:46 +0100 Subject: 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 file changed, 10 insertions(+), 10 deletions(-) (limited to 'build-aux/check-available-binaries.scm') diff --git a/build-aux/check-available-binaries.scm b/build-aux/check-available-binaries.scm index ebe94d2f7f..7ac4352839 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))) -- cgit v1.2.3