mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 19:15:39 +00:00
doc: ran make format
With visual inspection that nothing got worse.
This commit is contained in:
Samuel Dionne-Riel
parent
bc0421c4cf
commit
a45edd9024
|
|
@ -312,11 +312,15 @@ args.stdenv.mkDerivation (args // {
|
|||
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>If it’s used to support <emphasis>software development</emphasis>:</term>
|
||||
<term>
|
||||
If it’s used to support <emphasis>software development</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>library</emphasis> used by other packages:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>library</emphasis> used by other packages:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>development/libraries</filename> (e.g.
|
||||
|
|
@ -325,7 +329,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>compiler</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>compiler</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>development/compilers</filename> (e.g.
|
||||
|
|
@ -334,7 +340,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s an <emphasis>interpreter</emphasis>:</term>
|
||||
<term>
|
||||
If it’s an <emphasis>interpreter</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>development/interpreters</filename> (e.g.
|
||||
|
|
@ -343,11 +351,15 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a (set of) development <emphasis>tool(s)</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a (set of) development <emphasis>tool(s)</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>parser generator</emphasis> (including lexers):</term>
|
||||
<term>
|
||||
If it’s a <emphasis>parser generator</emphasis> (including lexers):
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>development/tools/parsing</filename> (e.g.
|
||||
|
|
@ -356,7 +368,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>build manager</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>build manager</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>development/tools/build-managers</filename> (e.g.
|
||||
|
|
@ -365,7 +379,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>Else:</term>
|
||||
<term>
|
||||
Else:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>development/tools/misc</filename> (e.g.
|
||||
|
|
@ -377,7 +393,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>Else:</term>
|
||||
<term>
|
||||
Else:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>development/misc</filename>
|
||||
|
|
@ -388,7 +406,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a (set of) <emphasis>tool(s)</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a (set of) <emphasis>tool(s)</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
(A tool is a relatively small program, especially one intended to be
|
||||
|
|
@ -396,7 +416,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</para>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>If it’s for <emphasis>networking</emphasis>:</term>
|
||||
<term>
|
||||
If it’s for <emphasis>networking</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>tools/networking</filename> (e.g.
|
||||
|
|
@ -405,7 +427,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s for <emphasis>text processing</emphasis>:</term>
|
||||
<term>
|
||||
If it’s for <emphasis>text processing</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>tools/text</filename> (e.g. <filename>diffutils</filename>)
|
||||
|
|
@ -413,9 +437,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>system utility</emphasis>, i.e.,
|
||||
something related or essential to the operation of a
|
||||
system:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>system utility</emphasis>, i.e., something related or essential to the operation of a system:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>tools/system</filename> (e.g. <filename>cron</filename>)
|
||||
|
|
@ -423,8 +447,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s an <emphasis>archiver</emphasis> (which may
|
||||
include a compression function):</term>
|
||||
<term>
|
||||
If it’s an <emphasis>archiver</emphasis> (which may include a compression function):
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>tools/archivers</filename> (e.g. <filename>zip</filename>,
|
||||
|
|
@ -433,7 +458,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>compression</emphasis> program:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>compression</emphasis> program:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>tools/compression</filename> (e.g.
|
||||
|
|
@ -442,7 +469,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>security</emphasis>-related program:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>security</emphasis>-related program:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>tools/security</filename> (e.g. <filename>nmap</filename>,
|
||||
|
|
@ -451,7 +480,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>Else:</term>
|
||||
<term>
|
||||
Else:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>tools/misc</filename>
|
||||
|
|
@ -462,7 +493,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>shell</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>shell</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>shells</filename> (e.g. <filename>bash</filename>)
|
||||
|
|
@ -470,11 +503,15 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>server</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>server</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>If it’s a web server:</term>
|
||||
<term>
|
||||
If it’s a web server:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>servers/http</filename> (e.g.
|
||||
|
|
@ -483,7 +520,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s an implementation of the X Windowing System:</term>
|
||||
<term>
|
||||
If it’s an implementation of the X Windowing System:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>servers/x11</filename> (e.g. <filename>xorg</filename> —
|
||||
|
|
@ -492,7 +531,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>Else:</term>
|
||||
<term>
|
||||
Else:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>servers/misc</filename>
|
||||
|
|
@ -503,7 +544,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>desktop environment</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>desktop environment</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>desktops</filename> (e.g. <filename>kde</filename>,
|
||||
|
|
@ -512,7 +555,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>window manager</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>window manager</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>applications/window-managers</filename> (e.g.
|
||||
|
|
@ -521,7 +566,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s an <emphasis>application</emphasis>:</term>
|
||||
<term>
|
||||
If it’s an <emphasis>application</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
A (typically large) program with a distinct user interface, primarily
|
||||
|
|
@ -529,7 +576,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</para>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>version management system</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>version management system</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>applications/version-management</filename> (e.g.
|
||||
|
|
@ -538,7 +587,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s for <emphasis>video playback / editing</emphasis>:</term>
|
||||
<term>
|
||||
If it’s for <emphasis>video playback / editing</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>applications/video</filename> (e.g.
|
||||
|
|
@ -547,7 +598,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s for <emphasis>graphics viewing / editing</emphasis>:</term>
|
||||
<term>
|
||||
If it’s for <emphasis>graphics viewing / editing</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>applications/graphics</filename> (e.g.
|
||||
|
|
@ -556,11 +609,15 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s for <emphasis>networking</emphasis>:</term>
|
||||
<term>
|
||||
If it’s for <emphasis>networking</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>mailreader</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>mailreader</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>applications/networking/mailreaders</filename> (e.g.
|
||||
|
|
@ -569,7 +626,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>newsreader</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>newsreader</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>applications/networking/newsreaders</filename> (e.g.
|
||||
|
|
@ -578,7 +637,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>web browser</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>web browser</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>applications/networking/browsers</filename> (e.g.
|
||||
|
|
@ -587,7 +648,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>Else:</term>
|
||||
<term>
|
||||
Else:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>applications/networking/misc</filename>
|
||||
|
|
@ -598,7 +661,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>Else:</term>
|
||||
<term>
|
||||
Else:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>applications/misc</filename>
|
||||
|
|
@ -609,12 +674,15 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s <emphasis>data</emphasis> (i.e., does not have a
|
||||
straight-forward executable semantics):</term>
|
||||
<term>
|
||||
If it’s <emphasis>data</emphasis> (i.e., does not have a straight-forward executable semantics):
|
||||
</term>
|
||||
<listitem>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>font</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>font</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>data/fonts</filename>
|
||||
|
|
@ -622,11 +690,15 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s related to <emphasis>SGML/XML processing</emphasis>:</term>
|
||||
<term>
|
||||
If it’s related to <emphasis>SGML/XML processing</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>If it’s an <emphasis>XML DTD</emphasis>:</term>
|
||||
<term>
|
||||
If it’s an <emphasis>XML DTD</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>data/sgml+xml/schemas/xml-dtd</filename> (e.g.
|
||||
|
|
@ -635,7 +707,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s an <emphasis>XSLT stylesheet</emphasis>:</term>
|
||||
<term>
|
||||
If it’s an <emphasis>XSLT stylesheet</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
(Okay, these are executable...)
|
||||
|
|
@ -653,7 +727,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>If it’s a <emphasis>game</emphasis>:</term>
|
||||
<term>
|
||||
If it’s a <emphasis>game</emphasis>:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>games</filename>
|
||||
|
|
@ -661,7 +737,9 @@ args.stdenv.mkDerivation (args // {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>Else:</term>
|
||||
<term>
|
||||
Else:
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
<filename>misc</filename>
|
||||
|
|
|
|||
|
|
@ -60,7 +60,8 @@
|
|||
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><varname>buildPlatform</varname>
|
||||
<term>
|
||||
<varname>buildPlatform</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -71,7 +72,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>hostPlatform</varname>
|
||||
<term>
|
||||
<varname>hostPlatform</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -82,7 +84,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>targetPlatform</varname>
|
||||
<term>
|
||||
<varname>targetPlatform</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -128,7 +131,8 @@
|
|||
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><varname>system</varname>
|
||||
<term>
|
||||
<varname>system</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -141,7 +145,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>config</varname>
|
||||
<term>
|
||||
<varname>config</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -157,7 +162,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>parsed</varname>
|
||||
<term>
|
||||
<varname>parsed</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -171,7 +177,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>libc</varname>
|
||||
<term>
|
||||
<varname>libc</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -183,7 +190,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>is*</varname>
|
||||
<term>
|
||||
<varname>is*</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -195,7 +203,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>platform</varname>
|
||||
<term>
|
||||
<varname>platform</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
|
|||
|
|
@ -321,7 +321,8 @@ merge:"diff3"
|
|||
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><literal>name</literal>
|
||||
<term>
|
||||
<literal>name</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -330,7 +331,8 @@ merge:"diff3"
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><literal>targetPkgs</literal>
|
||||
<term>
|
||||
<literal>targetPkgs</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -340,7 +342,8 @@ merge:"diff3"
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><literal>multiPkgs</literal>
|
||||
<term>
|
||||
<literal>multiPkgs</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -351,7 +354,8 @@ merge:"diff3"
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><literal>extraBuildCommands</literal>
|
||||
<term>
|
||||
<literal>extraBuildCommands</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -361,7 +365,8 @@ merge:"diff3"
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><literal>extraBuildCommandsMulti</literal>
|
||||
<term>
|
||||
<literal>extraBuildCommandsMulti</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -371,7 +376,8 @@ merge:"diff3"
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><literal>extraOutputsToInstall</literal>
|
||||
<term>
|
||||
<literal>extraOutputsToInstall</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -381,7 +387,8 @@ merge:"diff3"
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><literal>extraInstallCommands</literal>
|
||||
<term>
|
||||
<literal>extraInstallCommands</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -391,7 +398,8 @@ merge:"diff3"
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><literal>runScript</literal>
|
||||
<term>
|
||||
<literal>runScript</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -624,9 +632,9 @@ merge:"diff3"
|
|||
|
||||
<para>
|
||||
This function is analogous to the <command>docker pull</command> command,
|
||||
in that can be used to pull a Docker image from a Docker registry.
|
||||
By default <link xlink:href="https://hub.docker.com/">Docker Hub</link>
|
||||
is used to pull images.
|
||||
in that can be used to pull a Docker image from a Docker registry. By
|
||||
default <link xlink:href="https://hub.docker.com/">Docker Hub</link> is
|
||||
used to pull images.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
|
|
@ -648,15 +656,15 @@ merge:"diff3"
|
|||
<calloutlist>
|
||||
<callout arearefs='ex-dockerTools-pullImage-1'>
|
||||
<para>
|
||||
<varname>imageName</varname> specifies the name of the image to be downloaded,
|
||||
which can also include the registry namespace (e.g. <literal>nixos</literal>).
|
||||
This argument is required.
|
||||
<varname>imageName</varname> specifies the name of the image to be
|
||||
downloaded, which can also include the registry namespace (e.g.
|
||||
<literal>nixos</literal>). This argument is required.
|
||||
</para>
|
||||
</callout>
|
||||
<callout arearefs='ex-dockerTools-pullImage-2'>
|
||||
<para>
|
||||
<varname>imageDigest</varname> specifies the digest of the image
|
||||
to be downloaded. Skopeo can be used to get the digest of an image
|
||||
<varname>imageDigest</varname> specifies the digest of the image to be
|
||||
downloaded. Skopeo can be used to get the digest of an image
|
||||
<programlisting>
|
||||
$ skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'
|
||||
sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
|
||||
|
|
@ -666,10 +674,10 @@ merge:"diff3"
|
|||
</callout>
|
||||
<callout arearefs='ex-dockerTools-pullImage-3'>
|
||||
<para>
|
||||
<varname>finalImageTag</varname>, if specified, this is the tag of
|
||||
the image to be created. Note it is never used to fetch the image
|
||||
since we prefer to rely on the immutable digest ID. By default
|
||||
it's <literal>latest</literal>.
|
||||
<varname>finalImageTag</varname>, if specified, this is the tag of the
|
||||
image to be created. Note it is never used to fetch the image since we
|
||||
prefer to rely on the immutable digest ID. By default it's
|
||||
<literal>latest</literal>.
|
||||
</para>
|
||||
</callout>
|
||||
<callout arearefs='ex-dockerTools-pullImage-4'>
|
||||
|
|
|
|||
|
|
@ -205,8 +205,8 @@ pkgs.stdenv.mkDerivation {
|
|||
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><literal>ENOCACHE</literal> errors from
|
||||
<varname>buildBowerComponents</varname>
|
||||
<term>
|
||||
<literal>ENOCACHE</literal> errors from <varname>buildBowerComponents</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
|
|||
52
doc/meta.xml
52
doc/meta.xml
|
|
@ -83,7 +83,8 @@ hello-2.3 A program that produces a familiar, friendly greeting
|
|||
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><varname>description</varname>
|
||||
<term>
|
||||
<varname>description</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -106,7 +107,8 @@ hello-2.3 A program that produces a familiar, friendly greeting
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>longDescription</varname>
|
||||
<term>
|
||||
<varname>longDescription</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -115,7 +117,8 @@ hello-2.3 A program that produces a familiar, friendly greeting
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>branch</varname>
|
||||
<term>
|
||||
<varname>branch</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -126,7 +129,8 @@ hello-2.3 A program that produces a familiar, friendly greeting
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>homepage</varname>
|
||||
<term>
|
||||
<varname>homepage</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -136,7 +140,8 @@ hello-2.3 A program that produces a familiar, friendly greeting
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>downloadPage</varname>
|
||||
<term>
|
||||
<varname>downloadPage</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -146,7 +151,8 @@ hello-2.3 A program that produces a familiar, friendly greeting
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>license</varname>
|
||||
<term>
|
||||
<varname>license</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -198,7 +204,8 @@ hello-2.3 A program that produces a familiar, friendly greeting
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>maintainers</varname>
|
||||
<term>
|
||||
<varname>maintainers</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -213,7 +220,8 @@ hello-2.3 A program that produces a familiar, friendly greeting
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>priority</varname>
|
||||
<term>
|
||||
<varname>priority</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -225,7 +233,8 @@ hello-2.3 A program that produces a familiar, friendly greeting
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>platforms</varname>
|
||||
<term>
|
||||
<varname>platforms</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -242,7 +251,8 @@ meta.platforms = stdenv.lib.platforms.linux;
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>hydraPlatforms</varname>
|
||||
<term>
|
||||
<varname>hydraPlatforms</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -261,7 +271,8 @@ meta.hydraPlatforms = [];
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>broken</varname>
|
||||
<term>
|
||||
<varname>broken</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -273,7 +284,8 @@ meta.hydraPlatforms = [];
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>updateWalker</varname>
|
||||
<term>
|
||||
<varname>updateWalker</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -305,8 +317,8 @@ meta.hydraPlatforms = [];
|
|||
generic options are available:
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><varname>stdenv.lib.licenses.free</varname>,
|
||||
<varname>"free"</varname>
|
||||
<term>
|
||||
<varname>stdenv.lib.licenses.free</varname>, <varname>"free"</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -315,8 +327,8 @@ meta.hydraPlatforms = [];
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>stdenv.lib.licenses.unfreeRedistributable</varname>,
|
||||
<varname>"unfree-redistributable"</varname>
|
||||
<term>
|
||||
<varname>stdenv.lib.licenses.unfreeRedistributable</varname>, <varname>"unfree-redistributable"</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -336,8 +348,8 @@ meta.hydraPlatforms = [];
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>stdenv.lib.licenses.unfree</varname>,
|
||||
<varname>"unfree"</varname>
|
||||
<term>
|
||||
<varname>stdenv.lib.licenses.unfree</varname>, <varname>"unfree"</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -348,8 +360,8 @@ meta.hydraPlatforms = [];
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>,
|
||||
<varname>"unfree-redistributable-firmware"</varname>
|
||||
<term>
|
||||
<varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>, <varname>"unfree-redistributable-firmware"</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
|
|||
|
|
@ -188,8 +188,8 @@
|
|||
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><varname>
|
||||
$outputDev</varname>
|
||||
<term>
|
||||
<varname> $outputDev</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -200,8 +200,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>
|
||||
$outputBin</varname>
|
||||
<term>
|
||||
<varname> $outputBin</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -211,8 +211,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>
|
||||
$outputLib</varname>
|
||||
<term>
|
||||
<varname> $outputLib</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -223,8 +223,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>
|
||||
$outputDoc</varname>
|
||||
<term>
|
||||
<varname> $outputDoc</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -235,8 +235,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>
|
||||
$outputDevdoc</varname>
|
||||
<term>
|
||||
<varname> $outputDevdoc</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -248,8 +248,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>
|
||||
$outputMan</varname>
|
||||
<term>
|
||||
<varname> $outputMan</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -259,8 +259,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>
|
||||
$outputDevman</varname>
|
||||
<term>
|
||||
<varname> $outputDevman</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
@ -270,8 +270,8 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>
|
||||
$outputInfo</varname>
|
||||
<term>
|
||||
<varname> $outputInfo</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
|
|
|
|||
|
|
@ -428,7 +428,9 @@ packageOverrides = pkgs: {
|
|||
<para>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>Steam fails to start. What do I do?</term>
|
||||
<term>
|
||||
Steam fails to start. What do I do?
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Try to run
|
||||
|
|
@ -438,7 +440,9 @@ packageOverrides = pkgs: {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>Using the FOSS Radeon or nouveau (nvidia) drivers</term>
|
||||
<term>
|
||||
Using the FOSS Radeon or nouveau (nvidia) drivers
|
||||
</term>
|
||||
<listitem>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
|
|
@ -462,7 +466,9 @@ packageOverrides = pkgs: {
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>Java</term>
|
||||
<term>
|
||||
Java
|
||||
</term>
|
||||
<listitem>
|
||||
<orderedlist>
|
||||
<listitem>
|
||||
|
|
|
|||
426
doc/stdenv.xml
426
doc/stdenv.xml
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue