diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-10-28 12:01:32 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-28 12:01:32 +0000 |
commit | ea4da560fff51fb70b6cc7a37fb1275264d904b5 (patch) | |
tree | f63285ea0515149fa05bd6b3bc6bddfe22f32fef /doc | |
parent | 783f3c33e5c903ba86cc384ca5bfc8d0906432cd (diff) | |
parent | 837ebb5ac9fce1c8315dcf540877b243f84080ba (diff) | |
download | nixlib-ea4da560fff51fb70b6cc7a37fb1275264d904b5.tar nixlib-ea4da560fff51fb70b6cc7a37fb1275264d904b5.tar.gz nixlib-ea4da560fff51fb70b6cc7a37fb1275264d904b5.tar.bz2 nixlib-ea4da560fff51fb70b6cc7a37fb1275264d904b5.tar.lz nixlib-ea4da560fff51fb70b6cc7a37fb1275264d904b5.tar.xz nixlib-ea4da560fff51fb70b6cc7a37fb1275264d904b5.tar.zst nixlib-ea4da560fff51fb70b6cc7a37fb1275264d904b5.zip |
Merge master into staging-next
Diffstat (limited to 'doc')
-rw-r--r-- | doc/contributing/coding-conventions.chapter.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 7a8e7741a330..79d90c23a40f 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -181,7 +181,7 @@ rev = "${version}"; ``` -- Filling lists condionally _should_ be done with `lib.optional(s)` instead of using `if cond then [ ... ] else null` or `if cond then [ ... ] else [ ]`. +- Building lists conditionally _should_ be done with `lib.optional(s)` instead of using `if cond then [ ... ] else null` or `if cond then [ ... ] else [ ]`. ```nix buildInputs = lib.optional stdenv.isDarwin iconv; |