diff options
Diffstat (limited to 'nixpkgs/.github')
| -rw-r--r-- | nixpkgs/.github/CODEOWNERS | 8 | ||||
| -rw-r--r-- | nixpkgs/.github/CONTRIBUTING.md | 9 | ||||
| -rw-r--r-- | nixpkgs/.github/PULL_REQUEST_TEMPLATE.md | 13 |
3 files changed, 19 insertions, 11 deletions
diff --git a/nixpkgs/.github/CODEOWNERS b/nixpkgs/.github/CODEOWNERS index c9abac5851b5..7c39ce48a3fe 100644 --- a/nixpkgs/.github/CODEOWNERS +++ b/nixpkgs/.github/CODEOWNERS @@ -55,9 +55,6 @@ # NixOS integration test driver /nixos/lib/test-driver @tfc -# New NixOS modules -/nixos/modules/module-list.nix @Infinisil - # Python-related code and docs /maintainers/scripts/update-python-libraries @FRidh /pkgs/top-level/python-packages.nix @FRidh @jonringer @@ -67,7 +64,7 @@ # Haskell /pkgs/development/compilers/ghc @cdepillabout -/pkgs/development/haskell-modules @cdepillabout @infinisil +/pkgs/development/haskell-modules @cdepillabout /pkgs/development/haskell-modules/default.nix @cdepillabout /pkgs/development/haskell-modules/generic-builder.nix @cdepillabout /pkgs/development/haskell-modules/hoogle.nix @cdepillabout @@ -179,6 +176,7 @@ # PHP /doc/languages-frameworks/php.section.md @etu +/nixos/tests/php @etu +/pkgs/build-support/build-pecl.nix @etu /pkgs/development/interpreters/php @etu /pkgs/top-level/php-packages.nix @etu -/pkgs/build-support/build-pecl.nix @etu diff --git a/nixpkgs/.github/CONTRIBUTING.md b/nixpkgs/.github/CONTRIBUTING.md index ae4f68dddc19..cb0264b0167f 100644 --- a/nixpkgs/.github/CONTRIBUTING.md +++ b/nixpkgs/.github/CONTRIBUTING.md @@ -50,12 +50,13 @@ For package version upgrades and such a one-line commit message is usually suffi ## Backporting changes -To [backport a change into a release branch](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches): +Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches). -1. Take note of the commit in which the change was introduced into `master`. +1. Take note of the commits in which the change was introduced into `master` branch. 2. Check out the target _release branch_, e.g. `release-20.03`. Do not use a _channel branch_ like `nixos-20.03` or `nixpkgs-20.03`. -3. Use `git cherry-pick -x <original commit>`. -4. Open your backport PR. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the PR, and link to the PR in which the original change was made to `master`. +3. Create a branch for your change, e.g. `git checkout -b backport`. +4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. +5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.03]`. ## Reviewing contributions diff --git a/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md b/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md index 8b12c5f1aacf..48b84f8c36ce 100644 --- a/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md +++ b/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,13 @@ -<!-- Nixpkgs has a lot of new incoming Pull Requests, but not enough people to review this constant stream. Even if you aren't a committer, we would appreciate reviews of other PRs, especially simple ones like package updates. Just testing the relevant package/service and leaving a comment saying what you tested, how you tested it and whether it worked would be great. List of open PRs: <https://github.com/NixOS/nixpkgs/pulls>, for more about reviewing contributions: <https://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download/1/nixpkgs/manual.html#chap-reviewing-contributions>. Reviewing isn't mandatory, but it would help out a lot and reduce the average time-to-merge for all of us. Thanks a lot if you do! --> +<!-- +To help with the large amounts of pull requests, we would appreciate your +reviews of other pull requests, especially simple package updates. Just leave a +comment describing what you have tested in the relevant package/service. +Reviewing helps to reduce the average time-to-merge for everyone. +Thanks a lot if you do! +List of open PRs: https://github.com/NixOS/nixpkgs/pulls +Reviewing guidelines: https://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download/1/nixpkgs/manual.html#chap-reviewing-contributions +--> + ###### Motivation for this change @@ -6,7 +15,7 @@ <!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. --> -- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) +- [ ] Tested using sandboxing ([nix.useSandbox](https://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](https://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) - Built on platform(s) - [ ] NixOS - [ ] macOS |