diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
commit | 8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e (patch) | |
tree | 6fa0f8ba32b83a996625bc188903ccebfb7e7c2c /doc/guix-cookbook.texi | |
parent | 5d9e2187929ed7e8d46ec3cb3174fd78c1846360 (diff) | |
parent | 229f4fa9522fb56b014ee9c0d8111e8fb6da764d (diff) |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/backup.scm
gnu/packages/emacs-xyz.scm
gnu/packages/guile.scm
gnu/packages/lisp.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/web.scm
gnu/packages/xorg.scm
Diffstat (limited to 'doc/guix-cookbook.texi')
-rw-r--r-- | doc/guix-cookbook.texi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 82700a48ad..f58d18d47c 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -13,6 +13,7 @@ Copyright @copyright{} 2019 Efraim Flashner@* Copyright @copyright{} 2019 Pierre Neidhardt@* Copyright @copyright{} 2020 Oleg Pykhalov@* Copyright @copyright{} 2020 Matthew Brooks@* +Copyright @copyright{} 2020 Marcin Karpezo@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -1575,7 +1576,7 @@ available for inclusion into the initrd. @cindex stumpwm You could install StumpWM with a Guix system by adding -@code{stumpwm-checkout} and optionally @code{`(,stumpwm-checkout "lib")} +@code{stumpwm} and optionally @code{`(,stumpwm "lib")} packages to a system configuration file, e.g.@: @file{/etc/config.scm}. An example configuration can look like this: @@ -1586,7 +1587,7 @@ An example configuration can look like this: (operating-system ;; … - (packages (append (list sbcl stumpwm-checkout `(,stumpwm-checkout "lib")) + (packages (append (list sbcl stumpwm `(,stumpwm "lib")) %base-packages))) @end lisp @@ -1601,7 +1602,7 @@ module @code{sbcl-stumpwm-ttf-fonts}, adding it to Guix system packages: (operating-system ;; … - (packages (append (list sbcl stumpwm-checkout `(,stumpwm-checkout "lib")) + (packages (append (list sbcl stumpwm `(,stumpwm "lib")) sbcl-stumpwm-ttf-fonts font-dejavu %base-packages))) @end lisp |