1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00

doc/manual: Fix some broken fragments

(cherry picked from commit 071ddbed57)

# Conflicts:
#	doc/manual/src/language/operators.md
This commit is contained in:
Robert Hensing 2024-10-03 01:17:33 +02:00 committed by Mergify
parent e0c8b0fc4f
commit 9ee4a85a99
6 changed files with 12 additions and 7 deletions

View file

@ -62,7 +62,7 @@ These pages can be viewed offline:
Several operations, such as [`nix-env --query`](./nix-env/query.md) and [`nix-env --install`](./nix-env/install.md), take a list of *arguments* that specify the packages on which to operate. Several operations, such as [`nix-env --query`](./nix-env/query.md) and [`nix-env --install`](./nix-env/install.md), take a list of *arguments* that specify the packages on which to operate.
Packages are identified based on a `name` part and a `version` part of a [symbolic derivation name](@docroot@/language/derivations.md#attr-names): Packages are identified based on a `name` part and a `version` part of a [symbolic derivation name](@docroot@/language/derivations.md#attr-name):
- `name`: Everything up to but not including the first dash (`-`) that is *not* followed by a letter. - `name`: Everything up to but not including the first dash (`-`) that is *not* followed by a letter.
- `version`: The rest, excluding the separating dash. - `version`: The rest, excluding the separating dash.

View file

@ -113,7 +113,7 @@ It outputs an attribute set, and produces a [store derivation] as a side effect
### Optional ### Optional
- [`args`]{#attr-args} ([List](@docroot@/language/types.md#list) of [String](@docroot@/language/types.md#type-string)) - [`args`]{#attr-args} ([List](@docroot@/language/types.md#type-list) of [String](@docroot@/language/types.md#type-string))
Default: `[ ]` Default: `[ ]`
@ -132,7 +132,7 @@ It outputs an attribute set, and produces a [store derivation] as a side effect
> }; > };
> ``` > ```
- [`outputs`]{#attr-outputs} ([List](@docroot@/language/types.md#list) of [String](@docroot@/language/types.md#type-string)) - [`outputs`]{#attr-outputs} ([List](@docroot@/language/types.md#type-list) of [String](@docroot@/language/types.md#type-string))
Default: `[ "out" ]` Default: `[ "out" ]`

View file

@ -32,8 +32,13 @@
[string]: ./types.md#type-string [string]: ./types.md#type-string
[path]: ./types.md#type-path [path]: ./types.md#type-path
[number]: ./types.md#type-float [number]: ./types.md#type-float
<<<<<<< HEAD
[list]: ./types.md#list [list]: ./types.md#list
[attribute set]: ./types.md#attribute-set [attribute set]: ./types.md#attribute-set
=======
[list]: ./types.md#type-list
[attribute set]: ./types.md#type-attrs
>>>>>>> 071ddbed5 (doc/manual: Fix some broken fragments)
<!-- TODO(@rhendric, #10970): ^ rationalize number -> int/float --> <!-- TODO(@rhendric, #10970): ^ rationalize number -> int/float -->
@ -59,7 +64,7 @@ The result is a [Boolean] value.
See also: [`builtins.hasAttr`](@docroot@/language/builtins.md#builtins-hasAttr) See also: [`builtins.hasAttr`](@docroot@/language/builtins.md#builtins-hasAttr)
[Boolean]: ./types.md#type-boolean [Boolean]: ./types.md#type-bool
[Has attribute]: #has-attribute [Has attribute]: #has-attribute

View file

@ -96,7 +96,7 @@
Nix can now warn when evaluation of a Nix expression causes a large Nix can now warn when evaluation of a Nix expression causes a large
path to be copied to the Nix store. The threshold for this warning can path to be copied to the Nix store. The threshold for this warning can
be configured using [the `warn-large-path-threshold` be configured using [the `warn-large-path-threshold`
setting](@docroot@/command-ref/conf-file.md#warn-large-path-threshold), setting](@docroot@/command-ref/conf-file.md#conf-warn-large-path-threshold),
e.g. `--warn-large-path-threshold 100M` will warn about paths larger e.g. `--warn-large-path-threshold 100M` will warn about paths larger
than 100 MiB. than 100 MiB.

View file

@ -86,7 +86,7 @@ MixFlakeOptions::MixFlakeOptions()
> **DEPRECATED** > **DEPRECATED**
> >
> Use [`--no-use-registries`](#opt-no-use-registries) instead. > Use [`--no-use-registries`](@docroot@/command-ref/conf-file.md#conf-use-registries) instead.
)", )",
.category = category, .category = category,
.handler = {[&]() { .handler = {[&]() {

View file

@ -48,7 +48,7 @@ R""(
# Description # Description
`nix shell` runs a command in an environment in which the `$PATH` variable `nix shell` runs a command in an environment in which the `$PATH` variable
provides the specified [*installables*](./nix.md#installable). If no command is specified, it starts the provides the specified [*installables*](./nix.md#installables). If no command is specified, it starts the
default shell of your user account specified by `$SHELL`. default shell of your user account specified by `$SHELL`.
# Use as a `#!`-interpreter # Use as a `#!`-interpreter