wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 17:31:47 +02:00
Code Activity

doc/manual: Fix some broken fragments

Browse source 
(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
Download patch file Download diff file Expand all files Collapse all files

4
doc/manual/src/language/derivations.md
View file

@ -113,7 +113,7 @@ It outputs an attribute set, and produces a [store derivation] as a side effect
### 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: `[ ]`
@ -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" ]`

7
doc/manual/src/language/operators.md
View file

@ -32,8 +32,13 @@
[string]: ./types.md#type-string
[path]: ./types.md#type-path
[number]: ./types.md#type-float
<<<<<<< HEAD
[list]: ./types.md#list
[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 -->
@ -59,7 +64,7 @@ The result is a [Boolean] value.
See also: [`builtins.hasAttr`](@docroot@/language/builtins.md#builtins-hasAttr)
[Boolean]: ./types.md#type-boolean
[Boolean]: ./types.md#type-bool
[Has attribute]: #has-attribute