diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-22 11:59:38 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-22 11:59:38 -0500 |
| commit | a8494de0be0a705fc379ea35531d60386dc25132 (patch) | |
| tree | 53750ca115ff6637757e7c45146a36efa89621d8 /doc/manual/command-ref | |
| parent | c33244d7c19a43173676d14215e188270f31f115 (diff) | |
| parent | 7bd8299c6c48217ec2cb516929b13a118bde7db1 (diff) | |
Merge branch 'docs/channels-path' of git://github.com/iElectric/nix
Diffstat (limited to 'doc/manual/command-ref')
| -rw-r--r-- | doc/manual/command-ref/nix-channel.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/manual/command-ref/nix-channel.xml b/doc/manual/command-ref/nix-channel.xml index 531b41fc0..a6f4a2720 100644 --- a/doc/manual/command-ref/nix-channel.xml +++ b/doc/manual/command-ref/nix-channel.xml @@ -129,7 +129,7 @@ $ nix-instantiate --eval -E '(import <nixpkgs> {}).lib.nixpkgsVersion' <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 <command>nix-env</command> profile to keep track of previous @@ -144,7 +144,7 @@ $ nix-instantiate --eval -E '(import <nixpkgs> {}).lib.nixpkgsVersion' <varlistentry><term><filename>~/.nix-defexpr/channels</filename></term> <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 a multi-user installation, you may also have <filename>~/.nix-defexpr/channels_root</filename>, which links to |