Merge branch 'docs/channels-path' of git://github.com/iElectric/nix

This commit is contained in:
Shea Levy 2015-02-22 11:59:38 -05:00
commit a8494de0be

View file

@ -129,7 +129,7 @@ $ nix-instantiate --eval -E '(import <nixpkgs> {}).lib.nixpkgsVersion'
<variablelist> <variablelist>
<varlistentry><term><filename>/nix/var/nix/profiles/<replaceable>username</replaceable>/channels</filename></term> <varlistentry><term><filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/channels</filename></term>
<listitem><para><command>nix-channel</command> uses a <listitem><para><command>nix-channel</command> uses a
<command>nix-env</command> profile to keep track of previous <command>nix-env</command> profile to keep track of previous
@ -144,7 +144,7 @@ $ nix-instantiate --eval -E '(import &lt;nixpkgs> {}).lib.nixpkgsVersion'
<varlistentry><term><filename>~/.nix-defexpr/channels</filename></term> <varlistentry><term><filename>~/.nix-defexpr/channels</filename></term>
<listitem><para>This is a symlink to <listitem><para>This is a symlink to
<filename>/nix/var/nix/profiles/<replaceable>username</replaceable>/channels</filename>. It <filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/channels</filename>. It
ensures that <command>nix-env</command> can find your channels. In ensures that <command>nix-env</command> can find your channels. In
a multi-user installation, you may also have a multi-user installation, you may also have
<filename>~/.nix-defexpr/channels_root</filename>, which links to <filename>~/.nix-defexpr/channels_root</filename>, which links to