summary refs log tree commit diff
path: root/doc/configuration.xml
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-02-01 16:03:42 +0100
committerEelco Dolstra <edolstra@gmail.com>2017-02-01 16:07:55 +0100
commit9d6a55aefd771f047d2aa3085c9a3f8a2f452333 (patch)
tree5e249e50300763f8a3bf9c69745a5381f64f7011 /doc/configuration.xml
parent7dacca324d9e86fe7f7fad450ec833c746f21415 (diff)
downloadnixlib-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar
nixlib-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.gz
nixlib-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.bz2
nixlib-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.lz
nixlib-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.xz
nixlib-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.zst
nixlib-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.zip
~/.nixpkgs -> ~/.config/nixpkgs
The former is still respected as a fallback for config.nix for
backwards compatibility (but not for overlays because they're a new
feature).
Diffstat (limited to 'doc/configuration.xml')
-rw-r--r--doc/configuration.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/configuration.xml b/doc/configuration.xml
index caff1e510cdd..12e3b8ae851a 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -2,12 +2,12 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-packageconfig">
 
-<title><filename>~/.nixpkgs/config.nix</filename>: global configuration</title>
+<title>Global configuration</title>
 
 <para>Nix packages can be configured to allow or deny certain options.</para>
 
 <para>To apply the configuration edit
-<filename>~/.nixpkgs/config.nix</filename> and set it like
+<filename>~/.config/nixpkgs/config.nix</filename> and set it like
 
 <programlisting>
 {
@@ -89,7 +89,7 @@ packages via <literal>packageOverrides</literal></title>
 
 <para>You can define a function called
 <varname>packageOverrides</varname> in your local
-<filename>~/.nixpkgs/config.nix</filename> to overide nix packages.  It
+<filename>~/.config/nixpkgs/config.nix</filename> to overide nix packages.  It
 must be a function that takes pkgs as an argument and return modified
 set of packages.