diff options
author | Robin Gloster <mail@glob.in> | 2016-02-27 00:08:08 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-02-27 00:08:08 +0000 |
commit | 3477e662e60ba80a777f9126ba65ca6e9e0fcdf8 (patch) | |
tree | 26aa99e97f980701131668a00a24fcb85c5cd8a8 /doc | |
parent | b4dadff5429d0bf47bcdafff14dd3d0032039699 (diff) | |
parent | 766ad682f146a755b460dd87006912a96d915bcd (diff) |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'doc')
-rw-r--r-- | doc/default.nix | 5 | ||||
-rw-r--r-- | doc/languages-frameworks/index.xml | 1 | ||||
-rw-r--r-- | doc/meta.xml | 33 |
3 files changed, 26 insertions, 13 deletions
diff --git a/doc/default.nix b/doc/default.nix index 65e12254f78d1..196b9e445390e 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -56,8 +56,11 @@ stdenv.mkDerivation { inputFile = ./../pkgs/development/idris-modules/README.md; outputFile = "languages-frameworks/idris.xml"; } + + toDocbook { + inputFile = ./../pkgs/development/r-modules/README.md; + outputFile = "languages-frameworks/r.xml"; + } + '' - cat languages-frameworks/idris.xml echo ${nixpkgsVersion} > .version xmllint --noout --nonet --xinclude --noxincludenode \ diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 743a1b70be7ca..e63ff3ab14072 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -21,6 +21,7 @@ such as Perl or Haskell. These are described in this chapter.</para> <xi:include href="lua.xml" /> <xi:include href="coq.xml" /> <xi:include href="idris.xml" /> <!-- generated from ../../pkgs/development/idris-modules/README.md --> +<xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md --> <xi:include href="qt.xml" /> diff --git a/doc/meta.xml b/doc/meta.xml index 5266d83aea68f..b1ffd0502b2b5 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -258,45 +258,54 @@ a value from <varname>stdenv.lib.licenses</varname> defined in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix"> <filename>nixpkgs/lib/licenses.nix</filename></link>, or in-place license description of the same format if the license is -unlikely to be useful in another expression. +unlikely to be useful in another expression.</para> + +<para>Although it's typically better to indicate the specific license, +a few generic options are available: -A few generic options are available, although it's typically better -to indicate the specific license: <variablelist> <varlistentry> - <term><varname>free</varname></term> + <term><varname>stdenv.lib.licenses.free</varname>, + <varname>"free"</varname></term> + <listitem><para>Catch-all for free software licenses not listed above.</para></listitem> </varlistentry> <varlistentry> - <term><varname>unfree-redistributable</varname></term> + <term><varname>stdenv.lib.licenses.unfreeRedistributable</varname>, + <varname>"unfree-redistributable"</varname></term> + <listitem><para>Unfree package that can be redistributed in binary - form. That is, it’s legal to redistribute the + form. That is, it’s legal to redistribute the <emphasis>output</emphasis> of the derivation. This means that the package can be included in the Nixpkgs channel.</para> <para>Sometimes proprietary software can only be redistributed - unmodified. Make sure the builder doesn’t actually modify the + unmodified. Make sure the builder doesn’t actually modify the original binaries; otherwise we’re breaking the license. For instance, the NVIDIA X11 drivers can be redistributed unmodified, but our builder applies <command>patchelf</command> to make them - work. Thus, its license is <varname>unfree</varname> and it + work. Thus, its license is <varname>"unfree"</varname> and it cannot be included in the Nixpkgs channel.</para></listitem> </varlistentry> <varlistentry> - <term><varname>unfree</varname></term> - <listitem><para>Unfree package that cannot be redistributed. You + <term><varname>stdenv.lib.licenses.unfree</varname>, + <varname>"unfree"</varname></term> + + <listitem><para>Unfree package that cannot be redistributed. You can build it yourself, but you cannot redistribute the output of - the derivation. Thus it cannot be included in the Nixpkgs + the derivation. Thus it cannot be included in the Nixpkgs channel.</para></listitem> </varlistentry> <varlistentry> - <term><varname>unfree-redistributable-firmware</varname></term> + <term><varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>, + <varname>"unfree-redistributable-firmware"</varname></term> + <listitem><para>This package supplies unfree, redistributable firmware. This is a separate value from <varname>unfree-redistributable</varname> because not everybody |