From 762ba22efe01006d959503dc368ee54b16ccea31 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 16 May 2019 18:50:20 +0200
Subject: maint: 'check-available-binaries' checks for more packages.

Fixes <https://bugs.gnu.org/35539>.
Reported by Florian Pelz <pelzflorian@pelzflorian.de>.

* build-aux/check-available-binaries.scm (packages-for-system): New procedure.
<top level>: Use it.
---
 build-aux/check-available-binaries.scm | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'build-aux')

diff --git a/build-aux/check-available-binaries.scm b/build-aux/check-available-binaries.scm
index c80db1a37e..f39874ab71 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, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,17 +24,37 @@
              (guix grafts)
              (guix packages)
              (guix derivations)
+             (gnu packages)
+             (gnu packages certs)
              (gnu packages emacs)
              (gnu packages make-bootstrap)
+             (gnu packages ssh)
              (srfi srfi-1)
              (srfi srfi-26)
              (ice-9 format))
 
+(define (packages-for-system system)
+  "Return the list of packages to check for SYSTEM."
+  (let ((base (list %bootstrap-tarballs emacs nss-certs openssh)))
+    ;; On Intel systems, make sure key packages proposed by the installer are
+    ;; available.
+    (if (member system '("x86_64-linux" "i686-linux"))
+        (append (map specification->package
+                     '("xfce" "gnome" "mate" "enlightenment"
+                       "openbox" "awesome" "i3-wm" "ratpoison"
+                       "network-manager-applet" "xlockmore"
+                       "linux-libre" "grub-hybrid" "xorg-server"
+                       "libreoffice"
+                       ;; FIXME: Add IceCat when Rust is available on i686.
+                       #;"icecat"))
+                base)
+        base)))
+
 (with-store store
   (parameterize ((%graft? #f))
     (let* ((native (append-map (lambda (system)
                                  (map (cut package-derivation store <> system)
-                                      (list %bootstrap-tarballs emacs)))
+                                      (packages-for-system system)))
                                %hydra-supported-systems))
            (cross  (map (cut package-cross-derivation store
                              %bootstrap-tarballs <>)
-- 
cgit 1.4.1