aboutsummaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-05-02 22:42:53 +0200
committerLudovic Courtès <ludo@gnu.org>2015-05-02 22:42:53 +0200
commitb9212a5455304661d1e969ced5df63aa9b6b761f (patch)
treee2857c8336cc1dbae087ba4717707bc24b4df2dd /build-aux
parenta413bc8bd3c2c7d00d8d021a2224a59d26765dad (diff)
parent5f6887e839c10f0c905969d07baca4e03f453e82 (diff)
downloadguix-b9212a5455304661d1e969ced5df63aa9b6b761f.tar
guix-b9212a5455304661d1e969ced5df63aa9b6b761f.tar.gz
Merge branch 'core-updates'
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/check-available-binaries.scm2
-rw-r--r--build-aux/hydra/gnu-system.scm4
-rwxr-xr-xbuild-aux/list-packages.scm6
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)