From 8e8d984fd6db77bb5c1bec66369e5e99470d416f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 14 Apr 2020 15:10:24 +0200 Subject: maint: Actually check for the availablility of system packages. * etc/release-manifest.scm (%system-manifest): New variable. : Add it in 'concatenate-manifests' call. --- etc/release-manifest.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'etc') diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index 91471bd03b..ba2ab57aab 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -93,6 +93,13 @@ TARGET." %base-packages)) %hydra-supported-systems))) +(define %system-manifest + (manifest + (append-map (lambda (system) + (map (cut package->manifest-entry* <> system) + %system-packages)) + '("x86_64-linux" "i686-linux")))) ;Guix System + (define %cross-manifest (manifest (append-map (lambda (target) @@ -115,5 +122,6 @@ TARGET." ;; Return the union of all three manifests. (concatenate-manifests (list %base-manifest + %system-manifest %cross-manifest %cross-bootstrap-manifest)) -- cgit 1.4.1 From bab1f340b35078dcfd3cbac67ad56393b53bb46b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 14 Apr 2020 14:47:19 +0200 Subject: maint: Ensure substitutes are available for '%default-xorg-modules'. * etc/release-manifest.scm (%system-packages): Append %DEFAULT-XORG-MODULES. --- etc/release-manifest.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'etc') diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index ba2ab57aab..c2904c5822 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -23,6 +23,7 @@ (guix packages) (guix profiles) ((gnu ci) #:select (%cross-targets)) + ((gnu services xorg) #:select (%default-xorg-modules)) (guix utils) (srfi srfi-1) (srfi srfi-26)) @@ -49,16 +50,17 @@ TARGET." (define %system-packages ;; Key packages proposed by the Guix System installer. - (map specification->package - '("xorg-server" "xfce" "gnome" "mate" "enlightenment" - "openbox" "awesome" "i3-wm" "ratpoison" - "xlockmore" "slock" "libreoffice" - "connman" "network-manager" "network-manager-applet" - "openssh" "ntp" "tor" - "linux-libre" "grub-hybrid" - ;; FIXME: Add IceCat when Rust is available on i686. - ;;"icecat" - ))) + (append (map specification->package + '("xorg-server" "xfce" "gnome" "mate" "enlightenment" + "openbox" "awesome" "i3-wm" "ratpoison" + "xlockmore" "slock" "libreoffice" + "connman" "network-manager" "network-manager-applet" + "openssh" "ntp" "tor" + "linux-libre" "grub-hybrid" + ;; FIXME: Add IceCat when Rust is available on i686. + ;;"icecat" + )) + %default-xorg-modules)) (define %packages-to-cross-build ;; Packages that must be cross-buildable from x86_64-linux. -- cgit 1.4.1