diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-10-28 16:07:38 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-10-28 16:07:38 +0000 |
commit | 3f01b576af96454d1302fe4312420776f3ed0755 (patch) | |
tree | cd8d374073386b81fa7daa8faf0eb799d26b2611 /doc | |
parent | 4e9d848b56d5b9a06634f3b8b9837aed561f285a (diff) | |
parent | ea4da560fff51fb70b6cc7a37fb1275264d904b5 (diff) | |
download | nixlib-3f01b576af96454d1302fe4312420776f3ed0755.tar nixlib-3f01b576af96454d1302fe4312420776f3ed0755.tar.gz nixlib-3f01b576af96454d1302fe4312420776f3ed0755.tar.bz2 nixlib-3f01b576af96454d1302fe4312420776f3ed0755.tar.lz nixlib-3f01b576af96454d1302fe4312420776f3ed0755.tar.xz nixlib-3f01b576af96454d1302fe4312420776f3ed0755.tar.zst nixlib-3f01b576af96454d1302fe4312420776f3ed0755.zip |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: nixos/doc/manual/from_md/release-notes/rl-2111.section.xml nixos/doc/manual/release-notes/rl-2111.section.md
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; |