summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSymphorien Gibol <symphorien+git@xlumurb.eu>2019-08-15 10:09:46 +0200
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-08-17 18:04:43 +0200
commitc3e1e64e4c54ffa06d12be2c499c0acdfd9faf92 (patch)
tree465f96f912b12f6357524d84c09e662f981a449a
parent7a6c6ac374f79bb8897b3bc369bbfaad8e285874 (diff)
remove all instances of nix-env -i without -A in the NixOS manual
motivation: https://nixos.wiki/wiki/FAQ/Why_not_use_nix-env_-i_foo%3F
-rw-r--r--nixos/doc/manual/installation/installing.xml6
-rw-r--r--nixos/modules/services/editors/emacs.xml2
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index e5fb95f7dcf0..9cea2db610e0 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -335,7 +335,7 @@
If you’re using the graphical ISO image, other editors may be available
(such as <command>vim</command>). If you have network access, you can also
install other editors — for instance, you can install Emacs by running
- <literal>nix-env -i emacs</literal>.
+ <literal>nix-env -f '&lt;nixpkgs&gt;' -iA emacs</literal>.
</para>
<variablelist>
<varlistentry>
@@ -467,10 +467,10 @@ Retype new UNIX password: ***</screen>
<para>
You may also want to install some software. For instance,
<screen>
-<prompt>$ </prompt>nix-env -qa \*</screen>
+<prompt>$ </prompt>nix-env -qaP \*</screen>
shows what packages are available, and
<screen>
-<prompt>$ </prompt>nix-env -i w3m</screen>
+<prompt>$ </prompt>nix-env -f '&lt;nixpkgs&gt;' -iA w3m</screen>
install the <literal>w3m</literal> browser.
</para>
</listitem>
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index a3041ae22e78..acd69f18376c 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -552,7 +552,7 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
<xref linkend="opt-environment.systemPackages"/>
(<link
linkend="sec-declarative-package-mgmt">NixOS</link>), or run
- <literal>nix-env -i pkgs.docbook5</literal>
+ <literal>nix-env -f '&lt;nixpkgs&gt;' -iA docbook5</literal>
(<link linkend="sec-ad-hoc-packages">Nix</link>).
</para>