about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-12-10 06:00:56 +0000
committerGitHub <noreply@github.com>2023-12-10 06:00:56 +0000
commit39d4e1cb18bdb43229e53d4fd950c3ce77210a02 (patch)
treef0496c617a774c94297f66b53780f7a2934ac484 /nixos
parentb5ff56aec743b9c83609fc0e26a6c439ee27f0df (diff)
parent584463c7449a116f095eb456116f728c2b31497b (diff)
downloadnixlib-39d4e1cb18bdb43229e53d4fd950c3ce77210a02.tar
nixlib-39d4e1cb18bdb43229e53d4fd950c3ce77210a02.tar.gz
nixlib-39d4e1cb18bdb43229e53d4fd950c3ce77210a02.tar.bz2
nixlib-39d4e1cb18bdb43229e53d4fd950c3ce77210a02.tar.lz
nixlib-39d4e1cb18bdb43229e53d4fd950c3ce77210a02.tar.xz
nixlib-39d4e1cb18bdb43229e53d4fd950c3ce77210a02.tar.zst
nixlib-39d4e1cb18bdb43229e53d4fd950c3ce77210a02.zip
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/development/option-types.section.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md
index 2ad3d6c4f949..f9c7ac80018e 100644
--- a/nixos/doc/manual/development/option-types.section.md
+++ b/nixos/doc/manual/development/option-types.section.md
@@ -13,6 +13,13 @@ merging is handled.
 `types.bool`
 
 :   A boolean, its values can be `true` or `false`.
+    All definitions must have the same value, after priorities. An error is thrown in case of a conflict.
+
+`types.boolByOr`
+
+:   A boolean, its values can be `true` or `false`.
+    The result is `true` if _any_ of multiple definitions is `true`.
+    In other words, definitions are merged with the logical _OR_ operator.
 
 `types.path`