diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-07-18 06:48:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 06:48:41 +0200 |
| commit | fb7507d068a96c1a98bb8468da0c60e66a38bf1f (patch) | |
| tree | dd7989a39f0a811acd4df2e004e7b5d64e8474d7 /doc | |
| parent | 0ae51edb29dc6aa5f86c1e3686047032818af089 (diff) | |
| parent | 13b5ae55cdab62aac087d4a2885634983eb79b06 (diff) | |
| download | nixpkgs-fb7507d068a96c1a98bb8468da0c60e66a38bf1f.tar nixpkgs-fb7507d068a96c1a98bb8468da0c60e66a38bf1f.tar.gz nixpkgs-fb7507d068a96c1a98bb8468da0c60e66a38bf1f.tar.bz2 nixpkgs-fb7507d068a96c1a98bb8468da0c60e66a38bf1f.tar.lz nixpkgs-fb7507d068a96c1a98bb8468da0c60e66a38bf1f.tar.xz nixpkgs-fb7507d068a96c1a98bb8468da0c60e66a38bf1f.tar.zst nixpkgs-fb7507d068a96c1a98bb8468da0c60e66a38bf1f.zip | |
Merge pull request #92348 from jtojnar/explicit-only-gpl
licenses: Make single-version-only GPL explicit
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> |