diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 16481ee4c513..27635498f54d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -25,8 +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/`) -- [25.05 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.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) Release notes) +- [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) - [ ] (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) - [ ] (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). diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 7461992ec594..689e55f6c6e6 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -31,7 +31,7 @@ jobs: into: staging-next-24.11 - from: staging-next-24.11 into: staging-24.11 - - from: master + - from: release-25.05 into: staging-next-25.05 - from: staging-next-25.05 into: staging-25.05 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d4a573f5bb3c..ca89ca3854a2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -345,7 +345,7 @@ See [Nix Channel Status](https://status.nixos.org/) for the current channels and Here's a brief overview of the main Git branches and what channels they're used for: - `master`: The main branch, used for the unstable channels such as `nixpkgs-unstable`, `nixos-unstable` and `nixos-unstable-small`. -- `release-YY.MM` (e.g. `release-25.05`): The NixOS release branches, used for the stable channels such as `nixos-25.05`, `nixos-25.05-small` and `nixpkgs-25.05-darwin`. +- `release-YY.MM` (e.g. `release-25.11`): The NixOS release branches, used for the stable channels such as `nixos-25.11`, `nixos-25.11-small` and `nixpkgs-25.11-darwin`. When a channel is updated, a corresponding Git branch is also updated to point to the corresponding commit. So e.g. the [`nixpkgs-unstable` branch](https://github.com/nixos/nixpkgs/tree/nixpkgs-unstable) corresponds to the Git commit from the [`nixpkgs-unstable` channel](https://channels.nixos.org/nixpkgs-unstable). diff --git a/doc/release-notes/release-notes.md b/doc/release-notes/release-notes.md index 454ea7c50a9e..0f4df3086f43 100644 --- a/doc/release-notes/release-notes.md +++ b/doc/release-notes/release-notes.md @@ -3,5 +3,6 @@ This section lists the release notes for each stable version of Nixpkgs and current unstable revision. ```{=include=} sections +rl-2511.section.md rl-2505.section.md ``` diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 95a1b1712f6b..fc523bcae14b 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -1,4 +1,4 @@ -# Nixpkgs 25.11 (2025.11/??) {#sec-nixpkgs-release-25.11} +# Nixpkgs 25.11 ("Xantusia", 2025.11/??) {#sec-nixpkgs-release-25.11} ## Highlights {#sec-nixpkgs-release-25.11-highlights} diff --git a/lib/.version b/lib/.version index 5d540763cfb4..d0df6340623e 100644 --- a/lib/.version +++ b/lib/.version @@ -1 +1 @@ -25.05 \ No newline at end of file +25.11 diff --git a/lib/trivial.nix b/lib/trivial.nix index eba6dd69b12e..2364002668a9 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -439,7 +439,7 @@ in On each release the first letter is bumped and a new animal is chosen starting with that new letter. */ - codeName = "Warbler"; + codeName = "Xantusia"; /** Returns the current nixpkgs version suffix as string. diff --git a/nixos/doc/manual/release-notes/release-notes.md b/nixos/doc/manual/release-notes/release-notes.md index 7110603c44bc..3889f4890f66 100644 --- a/nixos/doc/manual/release-notes/release-notes.md +++ b/nixos/doc/manual/release-notes/release-notes.md @@ -3,6 +3,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. ```{=include=} sections +rl-2511.section.md rl-2505.section.md rl-2411.section.md rl-2405.section.md diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 1f710ccebb7f..e3e7bce9160a 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -1,4 +1,4 @@ -# Release 25.11 (2025.11/??) {#sec-release-25.11} +# Release 25.11 ("Xantusia", 2025.11/??) {#sec-release-25.11} ## Highlights {#sec-release-25.11-highlights}