diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-25 18:01:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 18:01:14 +0000 |
| commit | c6dd9fd65dfdf3f6cc23b3a11c845b197ba2680f (patch) | |
| tree | 4a961e34f9834d5b3d3ea18dbbd0618c336145ae /doc | |
| parent | d246548329138746e1d2f193ae0bf8192026da4e (diff) | |
| parent | f33719eda108fea4611a95d7d54a0dfb91c9ebc5 (diff) | |
| download | nixpkgs-c6dd9fd65dfdf3f6cc23b3a11c845b197ba2680f.tar nixpkgs-c6dd9fd65dfdf3f6cc23b3a11c845b197ba2680f.tar.gz nixpkgs-c6dd9fd65dfdf3f6cc23b3a11c845b197ba2680f.tar.bz2 nixpkgs-c6dd9fd65dfdf3f6cc23b3a11c845b197ba2680f.tar.lz nixpkgs-c6dd9fd65dfdf3f6cc23b3a11c845b197ba2680f.tar.xz nixpkgs-c6dd9fd65dfdf3f6cc23b3a11c845b197ba2680f.tar.zst nixpkgs-c6dd9fd65dfdf3f6cc23b3a11c845b197ba2680f.zip | |
Merge master into staging-next
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/contributing/coding-conventions.chapter.md | 5 | ||||
| -rw-r--r-- | doc/contributing/reviewing-contributions.chapter.md | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index cfe8582e514..dac6d828ac0 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -540,10 +540,11 @@ If you do need to do create this sort of patch file, one way to do so is with gi If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`: +- `relative`: Similar to using `git-diff`'s `--relative` flag, only keep changes inside the specified directory, making paths relative to it. - `stripLen`: Remove the first `stripLen` components of pathnames in the patch. - `extraPrefix`: Prefix pathnames by this string. -- `excludes`: Exclude files matching this pattern. -- `includes`: Include only files matching this pattern. +- `excludes`: Exclude files matching these patterns (applies after the above arguments). +- `includes`: Include only files matching these patterns (applies after the above arguments). - `revert`: Revert the patch. Note that because the checksum is computed after applying these effects, using or modifying these arguments will have no effect unless the `sha256` argument is changed as well. diff --git a/doc/contributing/reviewing-contributions.chapter.md b/doc/contributing/reviewing-contributions.chapter.md index 7a13a3f3b40..3417854730e 100644 --- a/doc/contributing/reviewing-contributions.chapter.md +++ b/doc/contributing/reviewing-contributions.chapter.md @@ -122,7 +122,7 @@ Reviewing process: - [CODEOWNERS](https://help.github.com/articles/about-codeowners/) will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers. - Ensure that the module tests, if any, are succeeding. - Ensure that the introduced options are correct. - - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated). + - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated). - Description, default and example should be provided. - Ensure that option changes are backward compatible. - `mkRenamedOptionModuleWith` provides a way to make option changes backward compatible. @@ -157,7 +157,7 @@ Reviewing process: - Ensure that the module tests, if any, are succeeding. - Ensure that the introduced options are correct. - - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated). + - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated). - Description, default and example should be provided. - Ensure that module `meta` field is present - Maintainers should be declared in `meta.maintainers`. |