diff options
Diffstat (limited to 'nixpkgs/doc/using')
-rw-r--r-- | nixpkgs/doc/using/configuration.xml | 3 | ||||
-rw-r--r-- | nixpkgs/doc/using/overlays.xml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/nixpkgs/doc/using/configuration.xml b/nixpkgs/doc/using/configuration.xml index 3e21b0e22843..336bdf5b2656 100644 --- a/nixpkgs/doc/using/configuration.xml +++ b/nixpkgs/doc/using/configuration.xml @@ -169,6 +169,9 @@ } </programlisting> </para> + <para> + Note that <literal>whitelistedLicenses</literal> only applies to unfree licenses unless <literal>allowUnfree</literal> is enabled. It is not a generic whitelist for all types of licenses. <literal>blacklistedLicenses</literal> applies to all licenses. + </para> </listitem> </itemizedlist> diff --git a/nixpkgs/doc/using/overlays.xml b/nixpkgs/doc/using/overlays.xml index 4937e9508857..caacb0a04622 100644 --- a/nixpkgs/doc/using/overlays.xml +++ b/nixpkgs/doc/using/overlays.xml @@ -28,6 +28,7 @@ </para> <para> + NOTE: DO NOT USE THIS in nixpkgs. Further overlays can be added by calling the <literal>pkgs.extend</literal> or <literal>pkgs.appendOverlays</literal>, although it is often preferable to avoid these functions, because they recompute the Nixpkgs fixpoint, which is somewhat expensive to do. </para> </section> |