nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

* gnu/installer/services.scm (system-services->configuration): Generate
a snippet that appends PACKAGES to %BASE-PACKAGES.
This commit is contained in:
Ludovic Courtès 2019-05-03 13:44:15 +02:00
parent 3e85909044
commit ecb0df6817
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/installer/services.scm
View File

@ -130,11 +130,13 @@
(if (null? snippets) (if (null? snippets)
`(,@(if (null? packages) `(,@(if (null? packages)
'() '()
`((packages (list ,@packages)))) `((packages (append (list ,@packages)
%base-packages))))
(services ,base)) (services ,base))
`(,@(if (null? packages) `(,@(if (null? packages)
'() '()
`((packages (list ,@packages)))) `((packages (append (list ,@packages)
%base-packages))))
(services (append (list ,@snippets (services (append (list ,@snippets
,@(if desktop? ,@(if desktop?