diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-07-05 17:51:30 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-07-05 17:51:30 +0200 |
| commit | 13b5ae55cdab62aac087d4a2885634983eb79b06 (patch) | |
| tree | b8021cef9b286502314f576bbaf0df219c02924c /doc | |
| parent | fbf553ea2b02cef3962480ed1929573de4429b56 (diff) | |
| download | nixpkgs-13b5ae55cdab62aac087d4a2885634983eb79b06.tar nixpkgs-13b5ae55cdab62aac087d4a2885634983eb79b06.tar.gz nixpkgs-13b5ae55cdab62aac087d4a2885634983eb79b06.tar.bz2 nixpkgs-13b5ae55cdab62aac087d4a2885634983eb79b06.tar.lz nixpkgs-13b5ae55cdab62aac087d4a2885634983eb79b06.tar.xz nixpkgs-13b5ae55cdab62aac087d4a2885634983eb79b06.tar.zst nixpkgs-13b5ae55cdab62aac087d4a2885634983eb79b06.zip | |
licenses: Make single-version-only GPL explicit
I commonly see people use the former when they should use the latter. Would be also in line with the SPDX change https://www.gnu.org/licenses/identify-licenses-clearly.html
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/stdenv/meta.xml | 6 | ||||
| -rw-r--r-- | doc/using/configuration.xml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/stdenv/meta.xml b/doc/stdenv/meta.xml index 45f7834eb2c..9cef9360002 100644 --- a/doc/stdenv/meta.xml +++ b/doc/stdenv/meta.xml @@ -155,17 +155,17 @@ hello-2.3 A program that produces a familiar, friendly greeting <itemizedlist> <listitem> <para> - Single license referenced by attribute (preferred) <literal>stdenv.lib.licenses.gpl3</literal>. + Single license referenced by attribute (preferred) <literal>stdenv.lib.licenses.gpl3Only</literal>. </para> </listitem> <listitem> <para> - Single license referenced by its attribute shortName (frowned upon) <literal>"gpl3"</literal>. + Single license referenced by its attribute shortName (frowned upon) <literal>"gpl3Only"</literal>. </para> </listitem> <listitem> <para> - Single license referenced by its attribute spdxId (frowned upon) <literal>"GPL-3.0"</literal>. + Single license referenced by its attribute spdxId (frowned upon) <literal>"GPL-3.0-only"</literal>. </para> </listitem> <listitem> diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml index 690bb3d34a1..b670f78f28b 100644 --- a/doc/using/configuration.xml +++ b/doc/using/configuration.xml @@ -162,10 +162,10 @@ </programlisting> </para> <para> - The following example configuration blacklists the <literal>gpl3</literal> and <literal>agpl3</literal> licenses: + The following example configuration blacklists the <literal>gpl3Only</literal> and <literal>agpl3Only</literal> licenses: <programlisting> { - blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ]; + blacklistedLicenses = with stdenv.lib.licenses; [ agpl3Only gpl3Only ]; } </programlisting> </para> |