summary refs log tree commit diff
path: root/doc/using
diff options
context:
space:
mode:
authorWORLDofPEACE <worldofpeace@protonmail.ch>2021-02-23 10:25:18 -0500
committerGitHub <noreply@github.com>2021-02-23 10:25:18 -0500
commit4b10920ed1d3f386e969260fafe6c01766c5d195 (patch)
tree15aa2eb80b3e994b571d040985009548c211452b /doc/using
parentbe63b7221044be01665d505e55785552fdf2609b (diff)
downloadnixpkgs-4b10920ed1d3f386e969260fafe6c01766c5d195.tar
nixpkgs-4b10920ed1d3f386e969260fafe6c01766c5d195.tar.gz
nixpkgs-4b10920ed1d3f386e969260fafe6c01766c5d195.tar.bz2
nixpkgs-4b10920ed1d3f386e969260fafe6c01766c5d195.tar.lz
nixpkgs-4b10920ed1d3f386e969260fafe6c01766c5d195.tar.xz
nixpkgs-4b10920ed1d3f386e969260fafe6c01766c5d195.tar.zst
nixpkgs-4b10920ed1d3f386e969260fafe6c01766c5d195.zip
stdenv/check-meta: change to allowlist and blocklist (#114127)
* stdenv/check-meta: change to allowlist and blocklist

* Update pkgs/stdenv/generic/check-meta.nix

Co-authored-by: Graham Christensen <graham@grahamc.com>
Diffstat (limited to 'doc/using')
-rw-r--r--doc/using/configuration.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml
index 2cd2615f54a..8e63e0072c8 100644
--- a/doc/using/configuration.xml
+++ b/doc/using/configuration.xml
@@ -151,26 +151,26 @@
    </listitem>
    <listitem>
     <para>
-     It is also possible to whitelist and blacklist licenses that are specifically acceptable or not acceptable, using <literal>whitelistedLicenses</literal> and <literal>blacklistedLicenses</literal>, respectively.
+     It is also possible to allow and block licenses that are specifically acceptable or not acceptable, using <literal>allowlistedLicenses</literal> and <literal>blocklistedLicenses</literal>, respectively.
     </para>
     <para>
-     The following example configuration whitelists the licenses <literal>amd</literal> and <literal>wtfpl</literal>:
+     The following example configuration allowlists the licenses <literal>amd</literal> and <literal>wtfpl</literal>:
 <programlisting>
 {
-  whitelistedLicenses = with lib.licenses; [ amd wtfpl ];
+  allowlistedLicenses = with lib.licenses; [ amd wtfpl ];
 }
 </programlisting>
     </para>
     <para>
-     The following example configuration blacklists the <literal>gpl3Only</literal> and <literal>agpl3Only</literal> licenses:
+     The following example configuration blocklists the <literal>gpl3Only</literal> and <literal>agpl3Only</literal> licenses:
 <programlisting>
 {
-  blacklistedLicenses = with lib.licenses; [ agpl3Only gpl3Only ];
+  blocklistedLicenses = with lib.licenses; [ agpl3Only gpl3Only ];
 }
 </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.
+      Note that <literal>allowlistedLicenses</literal> only applies to unfree licenses unless <literal>allowUnfree</literal> is enabled. It is not a generic allowlist for all types of licenses. <literal>blocklistedLicenses</literal> applies to all licenses.
     </para>
    </listitem>
   </itemizedlist>