diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-03 11:47:38 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-03 11:47:38 +0100 |
commit | adab4cd58b06896be6436f93a76432811deb897e (patch) | |
tree | d4dec437b37d500a136f35ead5290ba15c338ee3 /doc | |
parent | 787c1add0ba40ba8094b0ed4001de10c7d05c033 (diff) | |
parent | 5b759293e09a062373d4b2843c5bad89d5a47165 (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'doc')
-rw-r--r-- | doc/configuration.xml | 6 | ||||
-rw-r--r-- | doc/functions.xml | 2 | ||||
-rw-r--r-- | doc/languages-frameworks/haskell.md | 8 | ||||
-rw-r--r-- | doc/languages-frameworks/python.md | 2 | ||||
-rw-r--r-- | doc/overlays.xml | 4 | ||||
-rw-r--r-- | doc/package-notes.xml | 2 |
6 files changed, 12 insertions, 12 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. diff --git a/doc/functions.xml b/doc/functions.xml index 6374c15ddf2b..5c654ffb9562 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -119,7 +119,7 @@ evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in - <filename>~/.nixpkgs/config.nix</filename>. + <filename>~/.config/nixpkgs/config.nix</filename>. </para> </warning> diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 34b53ded3791..6d8984821741 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -195,7 +195,7 @@ its normal core packages: mtl-2.2.1 This function allows users to define their own development environment by means -of an override. After adding the following snippet to `~/.nixpkgs/config.nix`, +of an override. After adding the following snippet to `~/.config/nixpkgs/config.nix`, { packageOverrides = super: let self = super.pkgs; in @@ -522,7 +522,7 @@ file with `cabal2nix`: $ cd ~/src/foo && cabal2nix . >default.nix $ cd ~/src/bar && cabal2nix . >default.nix -Then edit your `~/.nixpkgs/config.nix` file to register those builds in the +Then edit your `~/.config/nixpkgs/config.nix` file to register those builds in the default Haskell package set: { @@ -554,7 +554,7 @@ Every Haskell package set takes a function called `overrides` that you can use to manipulate the package as much as you please. One useful application of this feature is to replace the default `mkDerivation` function with one that enables library profiling for all packages. To accomplish that, add configure the -following snippet in your `~/.nixpkgs/config.nix` file: +following snippet in your `~/.config/nixpkgs/config.nix` file: { packageOverrides = super: let self = super.pkgs; in @@ -583,7 +583,7 @@ The first step is to generate Nix build instructions with `cabal2nix`: $ cabal2nix cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix -Then add the override in `~/.nixpkgs/config.nix`: +Then add the override in `~/.config/nixpkgs/config.nix`: { packageOverrides = super: let self = super.pkgs; in diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 3f5d500620bb..83d47b6f43a7 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -781,7 +781,7 @@ If you get the following error: could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc': Permission denied -This is a [known bug](https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix) in setuptools. +This is a [known bug](https://github.com/pypa/setuptools/issues/130) in setuptools. Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`. As workaround install it as an extra `preInstall` step: diff --git a/doc/overlays.xml b/doc/overlays.xml index cb54c33cf65f..540c83e0a39b 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -28,8 +28,8 @@ first one present is considered, and all the rest are ignored: <listitem> - <para>In the directory pointed by the environment variable - <varname>NIXPKGS_OVERLAYS</varname>.</para> + <para>In the directory pointed to by the Nix search path entry + <literal><nixpkgs-overlays></literal>.</para> </listitem> <listitem> diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 0ba7ec4c44d4..0f148f5c898a 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -278,7 +278,7 @@ packageOverrides = pkgs: { </screen> to your Nixpkgs configuration - (<filename>~/.nixpkgs/config.nix</filename>) and install it by + (<filename>~/.config/nixpkgs/config.nix</filename>) and install it by running <command>nix-env -f '<nixpkgs>' -iA myEclipse</command> and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation |