[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
63/63: install: Add nvi to the image.
From: |
Mark H. Weaver |
Subject: |
63/63: install: Add nvi to the image. |
Date: |
Thu, 4 Aug 2016 07:44:59 +0000 (UTC) |
mhw pushed a commit to branch core-updates-2016-08-01
in repository guix.
commit a8cb87abe98d57fb763d5b14524dc32c96bd31b5
Author: Ludovic Courtès <address@hidden>
Date: Mon Aug 1 23:08:48 2016 +0200
install: Add nvi to the image.
* gnu/system/install.scm (installation-os)[packages]: Add NVI.
* doc/guix.texi (Proceeding with the Installation): Mention it.
---
doc/guix.texi | 5 +++--
gnu/system/install.scm | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index de99690..f1848a1 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -6394,8 +6394,9 @@ builds to @file{/gnu/store} which, initially, is an
in-memory file system.
Next, you have to edit a file and
provide the declaration of the operating system to be installed. To
-that end, the installation system comes with two text editors: GNU nano
-(@pxref{Top,,, nano, GNU nano Manual}), and GNU Zile, an Emacs clone.
+that end, the installation system comes with three text editors: GNU nano
+(@pxref{Top,,, nano, GNU nano Manual}), GNU Zile (an Emacs clone), and
+nvi (a clone of the original BSD @command{vi} editor).
We strongly recommend storing that file on the target root file system, say,
as @file{/mnt/etc/config.scm}. Failing to do that, you will have lost your
configuration file once you have rebooted into the newly-installed system.
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 734a361..5acfa2c 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -35,6 +35,7 @@
#:use-module (gnu packages grub)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages nvi)
#:use-module (ice-9 match)
#:use-module (srfi srfi-26)
#:export (self-contained-tarball
@@ -401,6 +402,7 @@ Use Alt-F2 for documentation.
;; space; furthermore util-linux's fdisk is already
;; available here, so we keep that.
bash-completion
+ nvi ;:wq!
%base-packages))))
;; Return it here so 'guix system' can consume it directly.
- 47/63: gnu: wine: Update to 1.9.15., (continued)
- 47/63: gnu: wine: Update to 1.9.15., Mark H. Weaver, 2016/08/04
- 55/63: download: Add mirror.hydra.gnu.org as a content-addressed mirror., Mark H. Weaver, 2016/08/04
- 59/63: gnu: unison: Add input ghostscript., Mark H. Weaver, 2016/08/04
- 41/63: Merge branch 'master' into core-updates, Mark H. Weaver, 2016/08/04
- 39/63: Merge branch 'master' into core-updates, Mark H. Weaver, 2016/08/04
- 37/63: gnu: dico: Patch 'idxgcide' bug., Mark H. Weaver, 2016/08/04
- 49/63: gnu: dealii: Unregister deleted patch., Mark H. Weaver, 2016/08/04
- 57/63: gnu: ecl: Use "kernel-headers" instead of "linux-headers" to designate input., Mark H. Weaver, 2016/08/04
- 56/63: tests: 'guix-environment-container.sh' works when run from a tmpfs., Mark H. Weaver, 2016/08/04
- 62/63: build: Set XDG_CACHE_HOME to avoid loading stale .go files., Mark H. Weaver, 2016/08/04
- 63/63: install: Add nvi to the image.,
Mark H. Weaver <=
- 53/63: gnu: rapicorn: Add patch to handle isnan., Mark H. Weaver, 2016/08/04
- 40/63: Merge branch 'master' into core-updates, Mark H. Weaver, 2016/08/04
- 61/63: Update NEWS., Mark H. Weaver, 2016/08/04
- 44/63: gnu: glibc-locales: Fix build., Mark H. Weaver, 2016/08/04