Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Release NixOS 23.05

(cherry picked from commit 2c6ae7132ca558f1052da0eececed3cad191b883)

Changed files
+9 -9
.github
+1 -1
.github/PULL_REQUEST_TEMPLATE.md
··· 22 22 - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages 23 23 - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) 24 24 - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) 25 - - [23.05 Release Notes (or backporting 22.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2305-release-notes) 25 + - [23.11 Release Notes (or backporting 23.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2305-release-notes) 26 26 - [ ] (Package updates) Added a release notes entry if the change is major or breaking 27 27 - [ ] (Module updates) Added a release notes entry if the change is significant 28 28 - [ ] (Module addition) Added a release notes entry if adding a new NixOS module
+8 -8
CONTRIBUTING.md
··· 106 106 107 107 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). 108 108 109 - You can add a label such as `backport release-22.11` to a PR, so that merging it will 109 + You can add a label such as `backport release-23.05` to a PR, so that merging it will 110 110 automatically create a backport (via [a GitHub Action](.github/workflows/backport.yml)). 111 - This also works for PR's that have already been merged, and might take a couple of minutes to trigger. 111 + This also works for pull requests that have already been merged, and might take a couple of minutes to trigger. 112 112 113 113 You can also create the backport manually: 114 114 115 115 1. Take note of the commits in which the change was introduced into `master` branch. 116 - 2. Check out the target _release branch_, e.g. `release-22.11`. Do not use a _channel branch_ like `nixos-22.11` or `nixpkgs-22.11-darwin`. 116 + 2. Check out the target _release branch_, e.g. `release-23.05`. Do not use a _channel branch_ like `nixos-23.05` or `nixpkgs-23.05-darwin`. 117 117 3. Create a branch for your change, e.g. `git checkout -b backport`. 118 118 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. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. 119 - 5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.11`) as the target branch of the pull request, and link to the pull request in which the original change was committed to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.11]`. 119 + 5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-23.05`) as the target branch of the pull request, and link to the pull request in which the original change was committed to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[23.05]`. 120 120 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. 121 121 122 122 ## Criteria for Backporting changes ··· 128 128 - Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`) 129 129 - Security critical applications (E.g. `firefox`) 130 130 131 - ## Generating 23.05 Release Notes 131 + ## Generating 23.11 Release Notes 132 132 <!-- 133 133 note: title unchanged even though we don't need regeneration because extant 134 134 PRs will link here. definitely change the title for 23.11 though. ··· 136 136 137 137 Documentation in nixpkgs is transitioning to a markdown-centric workflow. In the past release notes required a translation step to convert from markdown to a compatible docbook document, but this is no longer necessary. 138 138 139 - Steps for updating 23.05 Release notes: 139 + Steps for updating 23.11 Release notes: 140 140 141 - 1. Edit `nixos/doc/manual/release-notes/rl-2305.section.md` with the desired changes 142 - 2. Commit changes to `rl-2305.section.md`. 141 + 1. Edit `nixos/doc/manual/release-notes/rl-2311.section.md` with the desired changes 142 + 2. Commit changes to `rl-2311.section.md`. 143 143 144 144 ## Reviewing contributions 145 145