Merge branch 'core-updates'

3 files changed, 6 insertions, 6 deletions

diff --git a/build-aux/check-available-binaries.scm b/build-aux/check-available-binaries.scm
index bc6207eb2a..04f88b7d0c 100644
--- a/build-aux/check-available-binaries.scm
+++ b/build-aux/check-available-binaries.scm
@@ -33,7 +33,7 @@
     (let* ((native (append-map (lambda (system)
                                  (map (cut package-derivation store <> system)
                                       (list %bootstrap-tarballs emacs)))
-                               %supported-systems))
+                               %hydra-supported-systems))
            (cross  (map (cut package-cross-derivation store
                              %bootstrap-tarballs <>)
                         '("mips64el-linux-gnuabi64")))
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 9a47b4f423..c612ff1f12 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -210,10 +210,6 @@ valid."
              #f)))))
 
 
-(define %hydra-supported-systems
-  ;; This is the list of system types for which build slaves are available.
-  '("x86_64-linux" "i686-linux" "mips64el-linux"))
-
 ;;;
 ;;; Hydra entry point.
 ;;;
diff --git a/build-aux/list-packages.scm b/build-aux/list-packages.scm
index f3e4ac2846..c4f445291b 100755
--- a/build-aux/list-packages.scm
+++ b/build-aux/list-packages.scm
@@ -167,7 +167,11 @@ decreasing, is 1."
           ,system))
 
     `(div "status: "
-          ,(list-join (map url (package-transitive-supported-systems package))
+          ,(list-join (map url
+                           (lset-intersection
+                            string=?
+                            %hydra-supported-systems
+                            (package-transitive-supported-systems package)))
                       " ")))
 
   (define (package-logo name)