aboutsummaryrefslogtreecommitdiff
path: root/doc/manual
diff options
context:
space:
mode:
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/generate-manpage.nix2
-rw-r--r--doc/manual/src/SUMMARY.md.in1
-rw-r--r--doc/manual/src/command-ref/nix-env/install.md2
-rw-r--r--doc/manual/src/command-ref/nix-store/query.md14
-rw-r--r--doc/manual/src/command-ref/nix-store/realise.md54
-rw-r--r--doc/manual/src/command-ref/opt-common.md415
-rw-r--r--doc/manual/src/glossary.md10
-rw-r--r--doc/manual/src/language/derivations.md2
-rw-r--r--doc/manual/src/protocols/derivation-aterm.md19
-rw-r--r--doc/manual/src/release-notes/rl-next.md4
10 files changed, 273 insertions, 250 deletions
diff --git a/doc/manual/generate-manpage.nix b/doc/manual/generate-manpage.nix
index 65eec42d0..bc4d2c5bc 100644
--- a/doc/manual/generate-manpage.nix
+++ b/doc/manual/generate-manpage.nix
@@ -98,7 +98,7 @@ let
(option ? labels)
(concatStringsSep " " (map (s: "*${s}*") option.labels));
in trim ''
- - `--${name}` ${shortName} ${labels}
+ - <span id="opt-${name}">[`--${name}`](#opt-${name})</span> ${shortName} ${labels}
${option.description}
'';
diff --git a/doc/manual/src/SUMMARY.md.in b/doc/manual/src/SUMMARY.md.in
index 6c599abcf..701a6ea69 100644
--- a/doc/manual/src/SUMMARY.md.in
+++ b/doc/manual/src/SUMMARY.md.in
@@ -100,6 +100,7 @@
- [File System Object](architecture/file-system-object.md)
- [Protocols](protocols/protocols.md)
- [Serving Tarball Flakes](protocols/tarball-fetcher.md)
+ - [Derivation "ATerm" file format](protocols/derivation-aterm.md)
- [Glossary](glossary.md)
- [Contributing](contributing/contributing.md)
- [Hacking](contributing/hacking.md)
diff --git a/doc/manual/src/command-ref/nix-env/install.md b/doc/manual/src/command-ref/nix-env/install.md
index ad179cbc7..5dc04c385 100644
--- a/doc/manual/src/command-ref/nix-env/install.md
+++ b/doc/manual/src/command-ref/nix-env/install.md
@@ -30,7 +30,7 @@ a number of possible ways:
derivation with the highest *priority* is used. A derivation can
define a priority by declaring the `meta.priority` attribute. This
attribute should be a number, with a higher value denoting a lower
- priority. The default priority is `0`.
+ priority. The default priority is `5`.
If there are multiple matching derivations with the same priority,
then the derivation with the highest version will be installed.
diff --git a/doc/manual/src/command-ref/nix-store/query.md b/doc/manual/src/command-ref/nix-store/query.md
index cd45a4932..a158c76aa 100644
--- a/doc/manual/src/command-ref/nix-store/query.md
+++ b/doc/manual/src/command-ref/nix-store/query.md
@@ -5,8 +5,8 @@
# Synopsis
`nix-store` {`--query` | `-q`}
- {`--outputs` | `--requisites` | `-R` | `--references` |
- `--referrers` | `--referrers-closure` | `--deriver` | `-d` |
+ {`--outputs` | `--requisites` | `-R` | `--references` | `--referrers` |
+ `--referrers-closure` | `--deriver` | `-d` | `--valid-derivers` |
`--graph` | `--tree` | `--binding` *name* | `-b` *name* | `--hash` |
`--size` | `--roots`}
[`--use-output`] [`-u`] [`--force-realise`] [`-f`]
@@ -82,13 +82,21 @@ symlink.
in the Nix store that are dependent on *paths*.
- `--deriver`; `-d`\
- Prints the [deriver] of the store paths *paths*. If
+ Prints the [deriver] that was used to build the store paths *paths*. If
the path has no deriver (e.g., if it is a source file), or if the
deriver is not known (e.g., in the case of a binary-only
deployment), the string `unknown-deriver` is printed.
+ The returned deriver is not guaranteed to exist in the local store, for
+ example when *paths* were substituted from a binary cache.
+ Use `--valid-derivers` instead to obtain valid paths only.
[deriver]: ../../glossary.md#gloss-deriver
+ - `--valid-derivers`\
+ Prints a set of derivation files (`.drv`) which are supposed produce
+ said paths when realized. Might print nothing, for example for source paths
+ or paths subsituted from a binary cache.
+
- `--graph`\
Prints the references graph of the store paths *paths* in the format
of the `dot` tool of AT\&T's [Graphviz
diff --git a/doc/manual/src/command-ref/nix-store/realise.md b/doc/manual/src/command-ref/nix-store/realise.md
index c19aea75e..a421a4220 100644
--- a/doc/manual/src/command-ref/nix-store/realise.md
+++ b/doc/manual/src/command-ref/nix-store/realise.md
@@ -1,6 +1,6 @@
# Name
-`nix-store --realise` - realise specified store paths
+`nix-store --realise` - build or fetch store objects
# Synopsis
@@ -8,33 +8,35 @@
# Description
-The operation `--realise` essentially “builds” the specified store
-paths. Realisation is a somewhat overloaded term:
-
- - If the store path is a *derivation*, realisation ensures that the
- output paths of the derivation are [valid] (i.e.,
- the output path and its closure exist in the file system). This
- can be done in several ways. First, it is possible that the
- outputs are already valid, in which case we are done
- immediately. Otherwise, there may be [substitutes]
- that produce the outputs (e.g., by downloading them). Finally, the
- outputs can be produced by running the build task described
- by the derivation.
-
- - If the store path is not a derivation, realisation ensures that the
- specified path is valid (i.e., it and its closure exist in the file
- system). If the path is already valid, we are done immediately.
- Otherwise, the path and any missing paths in its closure may be
- produced through substitutes. If there are no (successful)
- substitutes, realisation fails.
+Each of *paths* is processed as follows:
+
+- If the path leads to a [store derivation]:
+ 1. If it is not [valid], substitute the store derivation file itself.
+ 2. Realise its [output paths]:
+ - Try to fetch from [substituters] the [store objects] associated with the output paths in the store derivation's [closure].
+ - With [content-addressed derivations] (experimental): Determine the output paths to realise by querying content-addressed realisation entries in the [Nix database].
+ - For any store paths that cannot be substituted, produce the required store objects. This involves first realising all outputs of the derivation's dependencies and then running the derivation's [`builder`](@docroot@/language/derivations.md#attr-builder) executable. <!-- TODO: Link to build process page #8888 -->
+- Otherwise, and if the path is not already valid: Try to fetch the associated [store objects] in the path's [closure] from [substituters].
+
+If no substitutes are available and no store derivation is given, realisation fails.
+
+[store paths]: @docroot@/glossary.md#gloss-store-path
[valid]: @docroot@/glossary.md#gloss-validity
-[substitutes]: @docroot@/glossary.md#gloss-substitute
+[store derivation]: @docroot@/glossary.md#gloss-store-derivation
+[output paths]: @docroot@/glossary.md#gloss-output-path
+[store objects]: @docroot@/glossary.md#gloss-store-object
+[closure]: @docroot@/glossary.md#gloss-closure
+[substituters]: @docroot@/command-ref/conf-file.md#conf-substituters
+[content-addressed derivations]: @docroot@/contributing/experimental-features.md#xp-feature-ca-derivations
+[Nix database]: @docroot@/glossary.md#gloss-nix-database
+
+The resulting paths are printed on standard output.
+For non-derivation arguments, the argument itself is printed.
-The output path of each derivation is printed on standard output. (For
-non-derivations argument, the argument itself is printed.)
+{{#include ../status-build-failure.md}}
-The following flags are available:
+# Options
- `--dry-run`\
Print on standard error a description of what packages would be
@@ -54,8 +56,6 @@ The following flags are available:
previous build, the new output path is left in
`/nix/store/name.check.`
-{{#include ../status-build-failure.md}}
-
{{#include ./opt-common.md}}
{{#include ../opt-common.md}}
@@ -67,8 +67,6 @@ The following flags are available:
This operation is typically used to build [store derivation]s produced by
[`nix-instantiate`](@docroot@/command-ref/nix-instantiate.md):
-[store derivation]: @docroot@/glossary.md#gloss-store-derivation
-
```console
$ nix-store --realise $(nix-instantiate ./test.nix)
/nix/store/31axcgrlbfsxzmfff1gyj1bf62hvkby2-aterm-2.3.1
diff --git a/doc/manual/src/command-ref/opt-common.md b/doc/manual/src/command-ref/opt-common.md
index 54c0a1d0d..0647228c2 100644
--- a/doc/manual/src/command-ref/opt-common.md
+++ b/doc/manual/src/command-ref/opt-common.md
@@ -2,217 +2,204 @@
Most Nix commands accept the following command-line options:
- - <span id="opt-help">[`--help`](#opt-help)</span>\
- Prints out a summary of the command syntax and exits.
-
- - <span id="opt-version">[`--version`](#opt-version)</span>\
- Prints out the Nix version number on standard output and exits.
-
- - <span id="opt-verbose">[`--verbose`](#opt-verbose)</span> / `-v`\
- Increases the level of verbosity of diagnostic messages printed on
- standard error. For each Nix operation, the information printed on
- standard output is well-defined; any diagnostic information is
- printed on standard error, never on standard output.
-
- This option may be specified repeatedly. Currently, the following
- verbosity levels exist:
-
- - 0\
- “Errors only”: only print messages explaining why the Nix
- invocation failed.
-
- - 1\
- “Informational”: print *useful* messages about what Nix is
- doing. This is the default.
-
- - 2\
- “Talkative”: print more informational messages.
-
- - 3\
- “Chatty”: print even more informational messages.
-
- - 4\
- “Debug”: print debug information.
-
- - 5\
- “Vomit”: print vast amounts of debug information.
-
- - <span id="opt-quiet">[`--quiet`](#opt-quiet)</span>\
- Decreases the level of verbosity of diagnostic messages printed on
- standard error. This is the inverse option to `-v` / `--verbose`.
-
- This option may be specified repeatedly. See the previous verbosity
- levels list.
-
- - <span id="opt-log-format">[`--log-format`](#opt-log-format)</span> *format*\
- This option can be used to change the output of the log format, with
- *format* being one of:
-
- - raw\
- This is the raw format, as outputted by nix-build.
-
- - internal-json\
- Outputs the logs in a structured manner.
-
- > **Warning**
- >
- > While the schema itself is relatively stable, the format of
- > the error-messages (namely of the `msg`-field) can change
- > between releases.
-
- - bar\
- Only display a progress bar during the builds.
-
- - bar-with-logs\
- Display the raw logs, with the progress bar at the bottom.
-
- - <span id="opt-no-build-output">[`--no-build-output`](#opt-no-build-output)</span> / `-Q`\
- By default, output written by builders to standard output and
- standard error is echoed to the Nix command's standard error. This
- option suppresses this behaviour. Note that the builder's standard
- output and error are always written to a log file in
- `prefix/nix/var/log/nix`.
-
- - <span id="opt-max-jobs">[`--max-jobs`](#opt-max-jobs)</span> / `-j` *number*\
- Sets the maximum number of build jobs that Nix will perform in
- parallel to the specified number. Specify `auto` to use the number
- of CPUs in the system. The default is specified by the `max-jobs`
- configuration setting, which itself defaults to `1`. A higher
- value is useful on SMP systems or to exploit I/O latency.
-
- Setting it to `0` disallows building on the local machine, which is
- useful when you want builds to happen only on remote builders.
-
- - <span id="opt-cores">[`--cores`](#opt-cores)</span>\
- Sets the value of the `NIX_BUILD_CORES` environment variable in
- the invocation of builders. Builders can use this variable at
- their discretion to control the maximum amount of parallelism. For
- instance, in Nixpkgs, if the derivation attribute
- `enableParallelBuilding` is set to `true`, the builder passes the
- `-jN` flag to GNU Make. It defaults to the value of the `cores`
- configuration setting, if set, or `1` otherwise. The value `0`
- means that the builder should use all available CPU cores in the
- system.
-
- - <span id="opt-max-silent-time">[`--max-silent-time`](#opt-max-silent-time)</span>\
- Sets the maximum number of seconds that a builder can go without
- producing any data on standard output or standard error. The
- default is specified by the `max-silent-time` configuration
- setting. `0` means no time-out.
-
- - <span id="opt-timeout">[`--timeout`](#opt-timeout)</span>\
- Sets the maximum number of seconds that a builder can run. The
- default is specified by the `timeout` configuration setting. `0`
- means no timeout.
-
- - <span id="opt-keep-going">[`--keep-going`](#opt-keep-going)</span> / `-k`\
- Keep going in case of failed builds, to the greatest extent
- possible. That is, if building an input of some derivation fails,
- Nix will still build the other inputs, but not the derivation
- itself. Without this option, Nix stops if any build fails (except
- for builds of substitutes), possibly killing builds in progress (in
- case of parallel or distributed builds).
-
- - <span id="opt-keep-failed">[`--keep-failed`](#opt-keep-failed)</span> / `-K`\
- Specifies that in case of a build failure, the temporary directory
- (usually in `/tmp`) in which the build takes place should not be
- deleted. The path of the build directory is printed as an
- informational message.
-
- - <span id="opt-fallback">[`--fallback`](#opt-fallback)</span>\
- Whenever Nix attempts to build a derivation for which substitutes
- are known for each output path, but realising the output paths
- through the substitutes fails, fall back on building the derivation.
-
- The most common scenario in which this is useful is when we have
- registered substitutes in order to perform binary distribution from,
- say, a network repository. If the repository is down, the
- realisation of the derivation will fail. When this option is
- specified, Nix will build the derivation instead. Thus, installation
- from binaries falls back on installation from source. This option is
- not the default since it is generally not desirable for a transient
- failure in obtaining the substitutes to lead to a full build from
- source (with the related consumption of resources).
-
- - <span id="opt-readonly-mode">[`--readonly-mode`](#opt-readonly-mode)</span>\
- When this option is used, no attempt is made to open the Nix
- database. Most Nix operations do need database access, so those
- operations will fail.
-
- - <span id="opt-arg">[`--arg`](#opt-arg)</span> *name* *value*\
- This option is accepted by `nix-env`, `nix-instantiate`,
- `nix-shell` and `nix-build`. When evaluating Nix expressions, the
- expression evaluator will automatically try to call functions that
- it encounters. It can automatically call functions for which every
- argument has a [default
- value](@docroot@/language/constructs.md#functions) (e.g.,
- `{ argName ? defaultValue }: ...`). With `--arg`, you can also
- call functions that have arguments without a default value (or
- override a default value). That is, if the evaluator encounters a
- function with an argument named *name*, it will call it with value
- *value*.
-
- For instance, the top-level `default.nix` in Nixpkgs is actually a
- function:
-
- ```nix
- { # The system (e.g., `i686-linux') for which to build the packages.
- system ? builtins.currentSystem
- ...
- }: ...
- ```
-
- So if you call this Nix expression (e.g., when you do `nix-env --install --attr
- pkgname`), the function will be called automatically using the
- value [`builtins.currentSystem`](@docroot@/language/builtins.md) for
- the `system` argument. You can override this using `--arg`, e.g.,
- `nix-env --install --attr pkgname --arg system \"i686-freebsd\"`. (Note that
- since the argument is a Nix string literal, you have to escape the
- quotes.)
-
- - <span id="opt-argstr">[`--argstr`](#opt-argstr)</span> *name* *value*\
- This option is like `--arg`, only the value is not a Nix
- expression but a string. So instead of `--arg system
- \"i686-linux\"` (the outer quotes are to keep the shell happy) you
- can say `--argstr system i686-linux`.
-
- - <span id="opt-attr">[`--attr`](#opt-attr)</span> / `-A` *attrPath*\
- Select an attribute from the top-level Nix expression being
- evaluated. (`nix-env`, `nix-instantiate`, `nix-build` and
- `nix-shell` only.) The *attribute path* *attrPath* is a sequence
- of attribute names separated by dots. For instance, given a
- top-level Nix expression *e*, the attribute path `xorg.xorgserver`
- would cause the expression `e.xorg.xorgserver` to be used. See
- [`nix-env --install`](@docroot@/command-ref/nix-env/install.md) for some
- concrete examples.
-
- In addition to attribute names, you can also specify array indices.
- For instance, the attribute path `foo.3.bar` selects the `bar`
- attribute of the fourth element of the array in the `foo` attribute
- of the top-level expression.
-
- - <span id="opt-expr">[`--expr`](#opt-expr)</span> / `-E`\
- Interpret the command line arguments as a list of Nix expressions to
- be parsed and evaluated, rather than as a list of file names of Nix
- expressions. (`nix-instantiate`, `nix-build` and `nix-shell` only.)
-
- For `nix-shell`, this option is commonly used to give you a shell in
- which you can build the packages returned by the expression. If you
- want to get a shell which contain the *built* packages ready for
- use, give your expression to the `nix-shell --packages ` convenience flag
- instead.
-
- - <span id="opt-I">[`-I`](#opt-I)</span> *path*\
- Add an entry to the [Nix expression search path](@docroot@/command-ref/conf-file.md#conf-nix-path).
- This option may be given multiple times.
- Paths added through `-I` take precedence over [`NIX_PATH`](@docroot@/command-ref/env-common.md#env-NIX_PATH).
-
- - <span id="opt-option">[`--option`](#opt-option)</span> *name* *value*\
- Set the Nix configuration option *name* to *value*. This overrides
- settings in the Nix configuration file (see nix.conf5).
-
- - <span id="opt-repair">[`--repair`](#opt-repair)</span>\
- Fix corrupted or missing store paths by redownloading or rebuilding
- them. Note that this is slow because it requires computing a
- cryptographic hash of the contents of every path in the closure of
- the build. Also note the warning under `nix-store --repair-path`.
+- <span id="opt-help">[`--help`](#opt-help)</span>
+
+ Prints out a summary of the command syntax and exits.
+
+- <span id="opt-version">[`--version`](#opt-version)</span>
+
+ Prints out the Nix version number on standard output and exits.
+
+- <span id="opt-verbose">[`--verbose`](#opt-verbose)</span> / `-v`
+
+ Increases the level of verbosity of diagnostic messages printed on standard error.
+ For each Nix operation, the information printed on standard output is well-defined;
+ any diagnostic information is printed on standard error, never on standard output.
+
+ This option may be specified repeatedly.
+ Currently, the following verbosity levels exist:
+
+ - `0` “Errors only”
+
+ Only print messages explaining why the Nix invocation failed.
+
+ - `1` “Informational”
+
+ Print *useful* messages about what Nix is doing.
+ This is the default.
+
+ - `2` “Talkative”
+
+ Print more informational messages.
+
+ - `3` “Chatty”
+
+ Print even more informational messages.
+
+ - `4` “Debug”
+
+ Print debug information.
+
+ - `5` “Vomit”
+
+ Print vast amounts of debug information.
+
+- <span id="opt-quiet">[`--quiet`](#opt-quiet)</span>
+
+ Decreases the level of verbosity of diagnostic messages printed on standard error.
+ This is the inverse option to `-v` / `--verbose`.
+
+ This option may be specified repeatedly.
+ See the previous verbosity levels list.
+
+- <span id="opt-log-format">[`--log-format`](#opt-log-format)</span> *format*
+
+ This option can be used to change the output of the log format, with *format* being one of:
+
+ - `raw`
+
+ This is the raw format, as outputted by nix-build.
+
+ - `internal-json`
+
+ Outputs the logs in a structured manner.
+
+ > **Warning**
+ >
+ > While the schema itself is relatively stable, the format of
+ > the error-messages (namely of the `msg`-field) can change
+ > between releases.
+
+ - `bar`
+
+ Only display a progress bar during the builds.
+
+ - `bar-with-logs`
+
+ Display the raw logs, with the progress bar at the bottom.
+
+- <span id="opt-no-build-output">[`--no-build-output`](#opt-no-build-output)</span> / `-Q`
+
+ By default, output written by builders to standard output and standard error is echoed to the Nix command's standard error.
+ This option suppresses this behaviour.
+ Note that the builder's standard output and error are always written to a log file in `prefix/nix/var/log/nix`.
+
+- <span id="opt-max-jobs">[`--max-jobs`](#opt-max-jobs)</span> / `-j` *number*
+
+ Sets the maximum number of build jobs that Nix will perform in parallel to the specified number.
+ Specify `auto` to use the number of CPUs in the system.
+ The default is specified by the `max-jobs` configuration setting, which itself defaults to `1`.
+ A higher value is useful on SMP systems or to exploit I/O latency.
+
+ Setting it to `0` disallows building on the local machine, which is useful when you want builds to happen only on remote builders.
+
+- <span id="opt-cores">[`--cores`](#opt-cores)</span>
+
+ Sets the value of the `NIX_BUILD_CORES` environment variable in the invocation of builders.
+ Builders can use this variable at their discretion to control the maximum amount of parallelism.
+ For instance, in Nixpkgs, if the derivation attribute `enableParallelBuilding` is set to `true`, the builder passes the `-jN` flag to GNU Make.
+ It defaults to the value of the `cores` configuration setting, if set, or `1` otherwise.
+ The value `0` means that the builder should use all available CPU cores in the system.
+
+- <span id="opt-max-silent-time">[`--max-silent-time`](#opt-max-silent-time)</span>
+
+ Sets the maximum number of seconds that a builder can go without producing any data on standard output or standard error.
+ The default is specified by the `max-silent-time` configuration setting.
+ `0` means no time-out.
+
+- <span id="opt-timeout">[`--timeout`](#opt-timeout)</span>
+
+ Sets the maximum number of seconds that a builder can run.
+ The default is specified by the `timeout` configuration setting.
+ `0` means no timeout.
+
+- <span id="opt-keep-going">[`--keep-going`](#opt-keep-going)</span> / `-k`
+
+ Keep going in case of failed builds, to the greatest extent possible.
+ That is, if building an input of some derivation fails, Nix will still build the other inputs, but not the derivation itself.
+ Without this option, Nix stops if any build fails (except for builds of substitutes), possibly killing builds in progress (in case of parallel or distributed builds).
+
+- <span id="opt-keep-failed">[`--keep-failed`](#opt-keep-failed)</span> / `-K`
+
+ Specifies that in case of a build failure, the temporary directory (usually in `/tmp`) in which the build takes place should not be deleted.
+ The path of the build directory is printed as an informational message.
+
+- <span id="opt-fallback">[`--fallback`](#opt-fallback)</span>
+
+ Whenever Nix attempts to build a derivation for which substitutes are known for each output path, but realising the output paths through the substitutes fails, fall back on building the derivation.
+
+ The most common scenario in which this is useful is when we have registered substitutes in order to perform binary distribution from, say, a network repository.
+ If the repository is down, the realisation of the derivation will fail.
+ When this option is specified, Nix will build the derivation instead.
+ Thus, installation from binaries falls back on installation from source.
+ This option is not the default since it is generally not desirable for a transient failure in obtaining the substitutes to lead to a full build from source (with the related consumption of resources).
+
+- <span id="opt-readonly-mode">[`--readonly-mode`](#opt-readonly-mode)</span>
+
+ When this option is used, no attempt is made to open the Nix database.
+ Most Nix operations do need database access, so those operations will fail.
+
+- <span id="opt-arg">[`--arg`](#opt-arg)</span> *name* *value*
+
+ This option is accepted by `nix-env`, `nix-instantiate`, `nix-shell` and `nix-build`.
+ When evaluating Nix expressions, the expression evaluator will automatically try to call functions that it encounters.
+ It can automatically call functions for which every argument has a [default value](@docroot@/language/constructs.md#functions) (e.g., `{ argName ? defaultValue }: ...`).
+
+ With `--arg`, you can also call functions that have arguments without a default value (or override a default value).
+ That is, if the evaluator encounters a function with an argument named *name*, it will call it with value *value*.
+
+ For instance, the top-level `default.nix` in Nixpkgs is actually a function:
+
+ ```nix
+ { # The system (e.g., `i686-linux') for which to build the packages.
+ system ? builtins.currentSystem
+ ...
+ }: ...
+ ```
+
+ So if you call this Nix expression (e.g., when you do `nix-env --install --attr pkgname`), the function will be called automatically using the value [`builtins.currentSystem`](@docroot@/language/builtins.md) for the `system` argument.
+ You can override this using `--arg`, e.g., `nix-env --install --attr pkgname --arg system \"i686-freebsd\"`.
+ (Note that since the argument is a Nix string literal, you have to escape the quotes.)
+
+- <span id="opt-argstr">[`--argstr`](#opt-argstr)</span> *name* *value*
+
+ This option is like `--arg`, only the value is not a Nix expression but a string.
+ So instead of `--arg system \"i686-linux\"` (the outer quotes are to keep the shell happy) you can say `--argstr system i686-linux`.
+
+- <span id="opt-attr">[`--attr`](#opt-attr)</span> / `-A` *attrPath*
+
+ Select an attribute from the top-level Nix expression being evaluated.
+ (`nix-env`, `nix-instantiate`, `nix-build` and `nix-shell` only.)
+ The *attribute path* *attrPath* is a sequence of attribute names separated by dots.
+ For instance, given a top-level Nix expression *e*, the attribute path `xorg.xorgserver` would cause the expression `e.xorg.xorgserver` to be used.
+ See [`nix-env --install`](@docroot@/command-ref/nix-env/install.md) for some concrete examples.
+
+ In addition to attribute names, you can also specify array indices.
+ For instance, the attribute path `foo.3.bar` selects the `bar`
+ attribute of the fourth element of the array in the `foo` attribute
+ of the top-level expression.
+
+- <span id="opt-expr">[`--expr`](#opt-expr)</span> / `-E`
+
+ Interpret the command line arguments as a list of Nix expressions to be parsed and evaluated, rather than as a list of file names of Nix expressions.
+ (`nix-instantiate`, `nix-build` and `nix-shell` only.)
+
+ For `nix-shell`, this option is commonly used to give you a shell in which you can build the packages returned by the expression.
+ If you want to get a shell which contain the *built* packages ready for use, give your expression to the `nix-shell --packages ` convenience flag instead.
+
+- <span id="opt-I">[`-I`](#opt-I)</span> *path*
+
+ Add an entry to the [Nix expression search path](@docroot@/command-ref/conf-file.md#conf-nix-path).
+ This option may be given multiple times.
+ Paths added through `-I` take precedence over [`NIX_PATH`](@docroot@/command-ref/env-common.md#env-NIX_PATH).
+
+- <span id="opt-option">[`--option`](#opt-option)</span> *name* *value*
+
+ Set the Nix configuration option *name* to *value*.
+ This overrides settings in the Nix configuration file (see nix.conf5).
+
+- <span id="opt-repair">[`--repair`](#opt-repair)</span>
+
+ Fix corrupted or missing store paths by redownloading or rebuilding them.
+ Note that this is slow because it requires computing a cryptographic hash of the contents of every path in the closure of the build.
+ Also note the warning under `nix-store --repair-path`.
diff --git a/doc/manual/src/glossary.md b/doc/manual/src/glossary.md
index d950a4ca8..b7c340d36 100644
--- a/doc/manual/src/glossary.md
+++ b/doc/manual/src/glossary.md
@@ -33,7 +33,7 @@
Ensure a [store path] is [valid][validity].
- This means either running the `builder` executable as specified in the corresponding [derivation] or fetching a pre-built [store object] from a [substituter].
+ This means either running the [`builder`](@docroot@/language/derivations.md#attr-builder) executable as specified in the corresponding [derivation], or fetching a pre-built [store object] from a [substituter], or delegating to a [remote builder](@docroot@/advanced-topics/distributed-builds.html) and retrieving the outputs. <!-- TODO: link [running] to build process page, #8888 -->
See [`nix-build`](./command-ref/nix-build.md) and [`nix-store --realise`](@docroot@/command-ref/nix-store/realise.md).
@@ -197,9 +197,15 @@
[closure]: #gloss-closure
+- [output]{#gloss-output}
+
+ A [store object] produced by a [derivation].
+
+ [output]: #gloss-output
+
- [output path]{#gloss-output-path}
- A [store path] produced by a [derivation].
+ The [store path] to the [output] of a [derivation].
[output path]: #gloss-output-path
diff --git a/doc/manual/src/language/derivations.md b/doc/manual/src/language/derivations.md
index 043a38191..79a09122a 100644
--- a/doc/manual/src/language/derivations.md
+++ b/doc/manual/src/language/derivations.md
@@ -17,7 +17,7 @@ the attributes of which specify the inputs of the build.
string. This is used as a symbolic name for the package by
`nix-env`, and it is appended to the output paths of the derivation.
- - There must be an attribute named `builder` that identifies the
+ - There must be an attribute named [`builder`]{#attr-builder} that identifies the
program that is executed to perform the build. It can be either a
derivation or a source (a local file reference, e.g.,
`./builder.sh`).
diff --git a/doc/manual/src/protocols/derivation-aterm.md b/doc/manual/src/protocols/derivation-aterm.md
new file mode 100644
index 000000000..e58b602a3
--- /dev/null
+++ b/doc/manual/src/protocols/derivation-aterm.md
@@ -0,0 +1,19 @@
+# Derivation "ATerm" file format
+
+For historical reasons, [derivations](@docroot@/glossary.md#gloss-store-derivation) are stored on-disk in [ATerm](https://homepages.cwi.nl/~daybuild/daily-books/technology/aterm-guide/aterm-guide.html) format.
+
+Derivations are serialised in one of the following formats:
+
+- ```
+ Derive(...)
+ ```
+
+ For all stable derivations.
+
+- ```
+ DrvWithVersion(<version-string>, ...)
+ ```
+
+ The only `version-string`s that are in use today are for [experimental features](@docroot@/contributing/experimental-features.md):
+
+ - `"xp-dyn-drv"` for the [`dynamic-derivations`](@docroot@/contributing/experimental-features.md#xp-feature-dynamic-derivations) experimental feature.
diff --git a/doc/manual/src/release-notes/rl-next.md b/doc/manual/src/release-notes/rl-next.md
index 5a870f1ab..02ad0a661 100644
--- a/doc/manual/src/release-notes/rl-next.md
+++ b/doc/manual/src/release-notes/rl-next.md
@@ -24,3 +24,7 @@
It is part of the [`dynamic-derivations`](@docroot@/contributing/experimental-features.md#xp-feature-dynamic-derivations) experimental feature.
- Flake follow paths at depths greater than 2 are now handled correctly, preventing "follows a non-existent input" errors.
+
+- [`nix-store --query`](@docroot@/command-ref/nix-store/query.md) gained a new type of query: `--valid-derivers`. It returns all `.drv` files in the local store that *can be* used to build the output passed in argument.
+This is in contrast to `--deriver`, which returns the single `.drv` file that *was actually* used to build the output passed in argument. In case the output was substituted from a binary cache,
+this `.drv` file may only exist on said binary cache and not locally.