summary refs log tree commit diff
path: root/gnu/installer/services.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2023-01-30 11:33:18 +0200
committerEfraim Flashner <efraim@flashner.co.il>2023-01-30 12:39:40 +0200
commit4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch)
tree9fd64956ee60304c15387eb394cd649e49f01467 /gnu/installer/services.scm
parentedb8c09addd186d9538d43b12af74d6c7aeea082 (diff)
parent595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff)
downloadguix-4cf1acc7f3033b50b0bf19e02c9f522d522d338c.tar.gz
Merge remote-tracking branch 'origin/master' into core-updates
 Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm
Diffstat (limited to 'gnu/installer/services.scm')
-rw-r--r--gnu/installer/services.scm21
1 files changed, 14 insertions, 7 deletions
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index 6c5f49622f..d08bab47fd 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -159,25 +159,32 @@
          (base     (if desktop?
                        '%desktop-services
                        '%base-services))
-         (heading  (list (vertical-space 1)
-                         (comment (G_ "\
+         (service-heading (list (vertical-space 1)
+                                (comment (G_ "\
 ;; Below is the list of system services.  To search for available
-;; services, run 'guix system search KEYWORD' in a terminal.\n")))))
+;; services, run 'guix system search KEYWORD' in a terminal.\n"))))
+         (package-heading (list (vertical-space 1)
+                                (comment (G_ "\
+;; Packages installed system-wide.  Users can also install packages
+;; under their own account: use 'guix search KEYWORD' to search
+;; for packages and 'guix install PACKAGE' to install a package.\n")))))
 
     (if (null? snippets)
         `(,@(if (null? packages)
                 '()
-                `((packages (append (list ,@packages)
+                `(,@package-heading
+                  (packages (append (list ,@packages)
                                     %base-packages))))
 
-          ,@heading
+          ,@service-heading
           (services ,base))
         `(,@(if (null? packages)
                 '()
-                `((packages (append (list ,@packages)
+                `(,@package-heading
+                  (packages (append (list ,@packages)
                                     %base-packages))))
 
-          ,@heading
+          ,@service-heading
           (services (append (list ,@snippets
 
                                   ,@(if desktop?