From 30ddfbb7c66dcbe56969b2bf516b90acbe957976 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 1 Jul 2025 14:45:55 +0200 Subject: [PATCH 1/4] workflows/periodic-merge: remove 24.11 24.11 is deprecated now. --- .github/workflows/periodic-merge-24h.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index a76b2310492d..63e3dfd13887 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -31,10 +31,6 @@ jobs: max-parallel: 1 matrix: pairs: - - from: release-24.11 - into: staging-next-24.11 - - from: staging-next-24.11 - into: staging-24.11 - from: release-25.05 into: staging-next-25.05 - from: staging-next-25.05 From 23454de4554d675d144a5cbeaf0be391a43e5f7f Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 1 Jul 2025 15:06:00 +0200 Subject: [PATCH 2/4] .github/PULL_RQUEST_TEMPLATE: remove 24.11 references 24.11 is unmaintained now. --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1ed8ae285d89..db78d5188521 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -25,9 +25,9 @@ For new packages please briefly describe the package or provide a link to its ho - made sure NixOS tests are [linked](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#linking-nixos-module-tests-to-a-package) to the relevant packages - [ ] 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) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) -- [Nixpkgs 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/doc/release-notes/rl-2511.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/doc/manual/release-notes/rl-2505.section.md) Nixpkgs Release notes) +- [Nixpkgs 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/doc/release-notes/rl-2511.section.md) (or backporting [25.05](https://github.com/NixOS/nixpkgs/blob/master/doc/manual/release-notes/rl-2505.section.md) Nixpkgs Release notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking -- [NixOS 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2511.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) NixOS Release notes) +- [NixOS 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2511.section.md) (or backporting [25.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) NixOS Release notes) - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md), [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md), [maintainers/README.md](https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md) and other contributing documentation in corresponding paths. From e83d9fbf169c90bfd9d784f11c8fcc303181e388 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 1 Jul 2025 15:07:12 +0200 Subject: [PATCH 3/4] .github/labeler: remove "backport release-24.11" auto label 24.11 is unmaintained. --- .github/labeler-no-sync.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml index cb7e413fb5c4..850b11837ef0 100644 --- a/.github/labeler-no-sync.yml +++ b/.github/labeler-no-sync.yml @@ -22,13 +22,6 @@ - doc/**/* - nixos/doc/**/* -"backport release-24.11": - - any: - - changed-files: - - any-glob-to-any-file: - - .github/workflows/* - - ci/**/*.* - "backport release-25.05": - any: - changed-files: From 7a31ddea37d998b8f0d5813e71abda0a6a6e75c0 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 1 Jul 2025 15:10:01 +0200 Subject: [PATCH 4/4] .github/ISSUE_TEMPLATE: remove 24.11 references 24.11 is unmaintained now --- .github/ISSUE_TEMPLATE/01_bug_report.yml | 1 - .github/ISSUE_TEMPLATE/02_bug_report_darwin.yml | 1 - .github/ISSUE_TEMPLATE/03_bug_report_nixos.yml | 1 - .github/ISSUE_TEMPLATE/04_build_failure.yml | 1 - .github/ISSUE_TEMPLATE/05_update_request.yml | 1 - .github/ISSUE_TEMPLATE/06_module_request.yml | 1 - 6 files changed, 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml index e0ec7544c83b..8deac1129874 100644 --- a/.github/ISSUE_TEMPLATE/01_bug_report.yml +++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml @@ -37,7 +37,6 @@ body: - "Please select a version." - "- Unstable (25.11)" - "- Stable (25.05)" - - "- Previous Stable (24.11)" default: 0 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml index 980c7dd2bb2c..48ed14747bdb 100644 --- a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml +++ b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml @@ -37,7 +37,6 @@ body: - "Please select a version." - "- Unstable (25.11)" - "- Stable (25.05)" - - "- Previous Stable (24.11)" default: 0 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml index 9a6834cf9810..de8ac36e467f 100644 --- a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml +++ b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml @@ -37,7 +37,6 @@ body: - "Please select a version." - "- Unstable (25.11)" - "- Stable (25.05)" - - "- Previous Stable (24.11)" default: 0 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml index 4060900452a7..df44b8a985c0 100644 --- a/.github/ISSUE_TEMPLATE/04_build_failure.yml +++ b/.github/ISSUE_TEMPLATE/04_build_failure.yml @@ -39,7 +39,6 @@ body: - "Please select a version." - "- Unstable (25.11)" - "- Stable (25.05)" - - "- Previous Stable (24.11)" default: 0 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/05_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml index a0f076973d7b..695921a70263 100644 --- a/.github/ISSUE_TEMPLATE/05_update_request.yml +++ b/.github/ISSUE_TEMPLATE/05_update_request.yml @@ -39,7 +39,6 @@ body: - "Please select a version." - "- Unstable (25.11)" - "- Stable (25.05)" - - "- Previous Stable (24.11)" default: 0 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/06_module_request.yml b/.github/ISSUE_TEMPLATE/06_module_request.yml index cdd7908041a5..f1c7e3cc8f7e 100644 --- a/.github/ISSUE_TEMPLATE/06_module_request.yml +++ b/.github/ISSUE_TEMPLATE/06_module_request.yml @@ -37,7 +37,6 @@ body: - "Please select a version." - "- Unstable (25.11)" - "- Stable (25.05)" - - "- Previous Stable (24.11)" default: 0 validations: required: true