about summary refs log tree commit diff
path: root/nixos/doc/manual/configuration/ad-hoc-packages.xml
diff options
context:
space:
mode:
Diffstat (limited to 'nixos/doc/manual/configuration/ad-hoc-packages.xml')
-rw-r--r--nixos/doc/manual/configuration/ad-hoc-packages.xml26
1 files changed, 5 insertions, 21 deletions
diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml
index c7e882d846fa..f15a22469a0b 100644
--- a/nixos/doc/manual/configuration/ad-hoc-packages.xml
+++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml
@@ -6,33 +6,18 @@
  <title>Ad-Hoc Package Management</title>
 
  <para>
-  With the command <command>nix-env</command>, you can install and uninstall
-  packages from the command line. For instance, to install Mozilla Thunderbird:
+  With the command <command>nix-env</command>, you can install and uninstall packages from the command line. For instance, to install Mozilla Thunderbird:
 <screen>
 <prompt>$ </prompt>nix-env -iA nixos.thunderbird</screen>
-  If you invoke this as root, the package is installed in the Nix profile
-  <filename>/nix/var/nix/profiles/default</filename> and visible to all users
-  of the system; otherwise, the package ends up in
-  <filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
-  and is not visible to other users. The <option>-A</option> flag specifies the
-  package by its attribute name; without it, the package is installed by
-  matching against its package name (e.g. <literal>thunderbird</literal>). The
-  latter is slower because it requires matching against all available Nix
-  packages, and is ambiguous if there are multiple matching packages.
+  If you invoke this as root, the package is installed in the Nix profile <filename>/nix/var/nix/profiles/default</filename> and visible to all users of the system; otherwise, the package ends up in <filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename> and is not visible to other users. The <option>-A</option> flag specifies the package by its attribute name; without it, the package is installed by matching against its package name (e.g. <literal>thunderbird</literal>). The latter is slower because it requires matching against all available Nix packages, and is ambiguous if there are multiple matching packages.
  </para>
 
  <para>
-  Packages come from the NixOS channel. You typically upgrade a package by
-  updating to the latest version of the NixOS channel:
+  Packages come from the NixOS channel. You typically upgrade a package by updating to the latest version of the NixOS channel:
 <screen>
 <prompt>$ </prompt>nix-channel --update nixos
 </screen>
-  and then running <literal>nix-env -i</literal> again. Other packages in the
-  profile are <emphasis>not</emphasis> affected; this is the crucial difference
-  with the declarative style of package management, where running
-  <command>nixos-rebuild switch</command> causes all packages to be updated to
-  their current versions in the NixOS channel. You can however upgrade all
-  packages for which there is a newer version by doing:
+  and then running <literal>nix-env -i</literal> again. Other packages in the profile are <emphasis>not</emphasis> affected; this is the crucial difference with the declarative style of package management, where running <command>nixos-rebuild switch</command> causes all packages to be updated to their current versions in the NixOS channel. You can however upgrade all packages for which there is a newer version by doing:
 <screen>
 <prompt>$ </prompt>nix-env -u '*'
 </screen>
@@ -53,8 +38,7 @@
  </para>
 
  <para>
-  <command>nix-env</command> has many more flags. For details, see the
-  <citerefentry>
+  <command>nix-env</command> has many more flags. For details, see the <citerefentry>
   <refentrytitle>nix-env</refentrytitle>
   <manvolnum>1</manvolnum></citerefentry> manpage or the Nix manual.
  </para>