diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-26 10:31:55 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-26 10:32:59 +0100 |
commit | a50222b1a33360c693be5ff558757bc06f339c0d (patch) | |
tree | 280e17212db6db8fd8474479f5bc385f56e0a46a /doc | |
parent | 78d3a11384185bcaeaae195cf8bc757d9ac0a130 (diff) |
doc/configuration: tidy up text around #23130 changes
Diffstat (limited to 'doc')
-rw-r--r-- | doc/configuration.xml | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/doc/configuration.xml b/doc/configuration.xml index 064c72a76301..56950e07ab5c 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -10,7 +10,7 @@ will prevent installation if any of the following criteria are true:</para> <itemizedlist> - <listitem><para>The packages is thought to be broken, and has had + <listitem><para>The package is thought to be broken, and has had its <literal>meta.broken</literal> set to <literal>true</literal>.</para></listitem> @@ -23,7 +23,14 @@ true:</para> <literal>meta.knownVulnerabilities</literal>.</para></listitem> </itemizedlist> -<para>Each of these criteria can be altering the nixpkgs +<para>Note that all this is checked during evaluation already, +and the check includes any package that is evaluated. +In particular, all build-time dependencies are checked. +<literal>nix-env -qa</literal> will (attempt to) hide any packages +that would be refused. +</para> + +<para>Each of these criteria can be altered in the nixpkgs configuration.</para> <para>The nixpkgs configuration for a NixOS system is set in the @@ -68,10 +75,11 @@ configuration file located at add <literal>allowBroken = true;</literal> to your user's configuration file, like this: - <programlisting> +<programlisting> { allowBroken = true; -}</programlisting> +} +</programlisting> </para></listitem> </itemizedlist> </section> @@ -156,7 +164,7 @@ configuration file located at </title> <para>There are several ways to tweak how Nix handles a package - which has been marked as unfree.</para> + which has been marked as insecure.</para> <itemizedlist> <listitem><para> |