Merge branch 'master' into core-updates

 Conflicts:
	gnu/packages/icu4c.scm
	gnu/packages/man.scm
	gnu/packages/python-xyz.scm
	guix/scripts/environment.scm
	guix/scripts/pack.scm
	guix/scripts/package.scm
	guix/scripts/pull.scm
	guix/store.scm

1 files changed, 26 insertions, 4 deletions

diff --git a/doc/guix.texi b/doc/guix.texi
index 92125abccc..af87d76087 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -75,6 +75,7 @@ Copyright @copyright{} 2020 Wiktor Żelazny@*
 Copyright @copyright{} 2020 Damien Cassou@*
 Copyright @copyright{} 2020 Jakub Kądziołka@*
 Copyright @copyright{} 2020 Jack Hill@*
+Copyright @copyright{} 2020 Naga Malleswari@*
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -4207,7 +4208,7 @@ guix time-machine @var{options}@dots{} -- @var{command} @var {arg}@dots{}
 @end example
 
 where @var{command} and @var{arg}@dots{} are passed unmodified to the
-@command{guix} command if the specified revision.  The @var{options} that define
+@command{guix} command of the specified revision.  The @var{options} that define
 this revision are the same as for @command{guix pull} (@pxref{Invoking guix pull}):
 
 @table @code
@@ -4746,7 +4747,7 @@ the following command creates a Guix development environment that
 additionally includes Git and strace:
 
 @example
-guix environment guix --ad-hoc git strace
+guix environment --pure guix --ad-hoc git strace
 @end example
 
 Sometimes it is desirable to isolate the environment as much as
@@ -11221,6 +11222,10 @@ The package object of the operating system kernel to use@footnote{Currently
 only the Linux-libre kernel is supported.  In the future, it will be
 possible to use the GNU@tie{}Hurd.}.
 
+@item @code{kernel-loadable-modules} (default: '())
+A list of objects (usually packages) to collect loadable kernel modules
+from--e.g. @code{(list ddcci-driver-linux)}.
+
 @item @code{kernel-arguments} (default: @code{'("quiet")})
 List of strings or gexps representing additional arguments to pass on
 the command-line of the kernel---e.g., @code{("console=ttyS0")}.
@@ -12282,6 +12287,23 @@ symlink:
 Return a service that sets the host name to @var{name}.
 @end deffn
 
+@defvr {Scheme Variable} console-font-service-type
+Install the given fonts on the specified ttys (fonts are per
+virtual console on the kernel Linux).  The value of this service is a list of
+tty/font pairs.  The font can be the name of a font provided by the @code{kbd}
+package or any valid argument to @command{setfont}, as in this example:
+
+@lisp
+`(("tty1" . "LatGrkCyr-8x16")
+  ("tty2" . ,(file-append
+                font-tamzen
+                "/share/kbd/consolefonts/TamzenForPowerline10x20.psf"))
+  ("tty3" . ,(file-append
+                font-terminus
+                "/share/consolefonts/ter-132n"))) ; for HDPI
+@end lisp
+@end defvr
+
 @deffn {Scheme Procedure} login-service @var{config}
 Return a service to run login according to @var{config}, a
 @code{<login-configuration>} object, which specifies the message of the day,
@@ -12847,7 +12869,7 @@ well as in the @var{groups} field of the @var{operating-system} record.
 
 (operating-system
   ;; @dots{}
-  (users (cons (user-acount
+  (users (cons (user-account
                 ;; @dots{}
                 (supplementary-groups
                  '("adbusers"   ;for adb
@@ -27007,7 +27029,7 @@ be accomplished with the following operating system configuration snippet:
      (plain-file "sudoers"
                  (string-append (plain-file-content %sudoers-specification)
                                 (format #f "~a ALL = NOPASSWD: ALL~%"
-                                        %username)))))
+                                        %user)))))
 
 @end lisp