diff options
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/build-self.scm | 4 | ||||
| -rw-r--r-- | build-aux/check-available-binaries.scm | 24 | ||||
| -rw-r--r-- | build-aux/update-NEWS.scm | 4 |
3 files changed, 28 insertions, 4 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 1ddd2233b0..0a1234abb5 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -399,6 +399,7 @@ files." (mlet %store-monad ((build (build-program source version guile-version #:pull-version pull-version)) (system (if system (return system) (current-system))) + (home -> (getenv "HOME")) ;; Note: Use the deprecated names here because the ;; caller might be Guix <= 0.16.0. @@ -419,6 +420,9 @@ files." ;; $GUILE_LOAD_PATH & co. (with-clean-environment (setenv "GUILE_WARN_DEPRECATED" "no") ;be quiet and drive + (when home + ;; Inherit HOME so that 'xdg-directory' works. + (setenv "HOME" home)) (open-pipe* OPEN_READ (derivation->output-path build) source system version 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 <>) diff --git a/build-aux/update-NEWS.scm b/build-aux/update-NEWS.scm index bf5f0e141b..a05ecad091 100644 --- a/build-aux/update-NEWS.scm +++ b/build-aux/update-NEWS.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -105,7 +105,7 @@ paragraph." (define (write-packages-updates news-file old new) "Write to NEWS-FILE the list of packages upgraded between OLD and NEW." (define important - '("gcc" "glibc" "binutils" "gdb" ;toolchain + '("gcc-toolchain" "glibc" "binutils" "gdb" ;toolchain "shepherd" "linux-libre" "xorg-server" "cups" ;OS "gnome" "xfce" "enlightenment" "lxde" "mate" ;desktop env. "guile" "bash" "python" "python2" "perl" ;languages |