CONTRIBUTING.md: patch conventions #317314
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 tasks
raboof
force-pushed
the
contributing-patch-conventions
branch
from
ccede5b
to
ca25afe
Compare
| Patches available online should be retrieved using `fetchpatch`. | ||
| Sometimes, changes are needed to the source to allow building a derivation in nixpkgs, or to get earlier access to an upstream fix or improvement. When using the `patches` parameter to `mkDerivation`, make sure the patch name clearly describes the reason for the patch, or add a comment. | ||
|
|
||
| Patches already merged upstream or published elsewhere should be retrieved using `fetchpatch`. |
There was a problem hiding this comment.
Suggested change
| Patches already merged upstream or published elsewhere should be retrieved using `fetchpatch`. | |
| Patches already merged upstream, reviewed or published elsewhere should be retrieved using `fetchpatch`. |
There was a problem hiding this comment.
Thanks for your suggestions! I have merged the others but not this one, as I don't think it makes sense to fetchpatch patches that have been reviewed but not merged: they might still get rebased/squashed and thus disappear.
As discussed in the NixOS Security Discussion Matrix room at https://matrix.to/#/!NBBFPbiuttRgTqbrcY:nixos.org/$kRB7R9ksae-78H4GQOO7NjMurKh7hSHimYSGMVE3w8k?via=nixos.org&via=matrix.org&via=nixos.dev and NixOS#317169 Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
raboof
force-pushed
the
contributing-patch-conventions
branch
from
7e64be9
to
cbfd7ee
Compare
13 tasks
infinisil
approved these changes
Jun 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
As discussed in the NixOS Security Discussion Matrix room at https://matrix.to/#/!NBBFPbiuttRgTqbrcY:nixos.org/$kRB7R9ksae-78H4GQOO7NjMurKh7hSHimYSGMVE3w8k?via=nixos.org&via=matrix.org&via=nixos.dev and #317169
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.