diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-02-03 09:26:35 +0100 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-02-03 09:26:35 +0100 |
| commit | 899a451e08f7d6d2c8214d119c2a0316849a0ed4 (patch) | |
| tree | 5e72a7288b7d2b33fead36fbfe91a02a48ff7fef /nixpkgs/.github | |
| parent | 5962418b6543dfb3ca34965c0fa16dd77543801b (diff) | |
| parent | a21c2fa3ea2b88e698db6fc151d9c7259ae14d96 (diff) | |
Merge commit 'a21c2fa3ea2b88e698db6fc151d9c7259ae14d96'
Diffstat (limited to 'nixpkgs/.github')
| -rw-r--r-- | nixpkgs/.github/CODEOWNERS | 4 | ||||
| -rw-r--r-- | nixpkgs/.github/CONTRIBUTING.md | 9 | ||||
| -rw-r--r-- | nixpkgs/.github/PULL_REQUEST_TEMPLATE.md | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/nixpkgs/.github/CODEOWNERS b/nixpkgs/.github/CODEOWNERS index 0c06c59f378..3392fa5dab9 100644 --- a/nixpkgs/.github/CODEOWNERS +++ b/nixpkgs/.github/CODEOWNERS @@ -14,7 +14,9 @@ /lib @edolstra @nbp @infinisil /lib/systems @nbp @ericson2314 @matthewbauer /lib/generators.nix @edolstra @nbp @Profpatsch +/lib/cli.nix @edolstra @nbp @Profpatsch /lib/debug.nix @edolstra @nbp @Profpatsch +/lib/asserts.nix @edolstra @nbp @Profpatsch # Nixpkgs Internals /default.nix @nbp @@ -162,7 +164,7 @@ /pkgs/top-level/emacs-packages.nix @adisbladis # VimPlugins -/pkgs/misc/vim-plugins @jonringer +/pkgs/misc/vim-plugins @jonringer @softinio # VsCode Extensions /pkgs/misc/vscode-extensions @jonringer diff --git a/nixpkgs/.github/CONTRIBUTING.md b/nixpkgs/.github/CONTRIBUTING.md index 706952b208d..a50a8a507de 100644 --- a/nixpkgs/.github/CONTRIBUTING.md +++ b/nixpkgs/.github/CONTRIBUTING.md @@ -48,6 +48,15 @@ In addition to writing properly formatted commit messages, it's important to inc For package version upgrades and such a one-line commit message is usually sufficient. +## Backporting changes + +To [backport a change into a release branch](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches): + +1. Take note of the commit in which the change was introduced into `master`. +2. Check out the target _release branch_, e.g. `release-19.09`. Do not use a _channel branch_ like `nixos-19.09` or `nixpkgs-19.09`. +3. Use `git cherry-pick -x <original commit>`. +4. Open your backport PR. Make sure to select the release branch (e.g. `release-19.09`) as the target branch of the PR, and link to the PR in which the original change was made to `master`. + ## Reviewing contributions See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#chap-reviewing-contributions). diff --git a/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md b/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md index b923902cf92..8b12c5f1aac 100644 --- a/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md +++ b/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md @@ -17,7 +17,3 @@ - [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after) - [ ] Ensured that relevant documentation is up to date - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). - -###### Notify maintainers - -cc @ |