01/02: installer: Ensure 'packages' field is a superset of '%base-packages'.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit ecb0df6817eb3767e6b4dcf1945f3c2dfbe3b44f
Author: Ludovic Courtès <address@hidden>
Date:   Fri May 3 13:44:15 2019 +0200

    installer: Ensure 'packages' field is a superset of '%base-packages'.
    
    Fixes <https://bugs.gnu.org/35541>.
    Reported by Florian Pelz <address@hidden>.
    
    * gnu/installer/services.scm (system-services->configuration): Generate
    a snippet that appends PACKAGES to %BASE-PACKAGES.
---
 gnu/installer/services.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index fbfcdac..d1dc516 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -130,11 +130,13 @@
     (if (null? snippets)
         `(,@(if (null? packages)
                 '()
-                `((packages (list ,@packages))))
+                `((packages (append (list ,@packages)
+                                    %base-packages))))
           (services ,base))
         `(,@(if (null? packages)
                 '()
-                `((packages (list ,@packages))))
+                `((packages (append (list ,@packages)
+                                    %base-packages))))
           (services (append (list ,@snippets
 
                                   ,@(if desktop?