Skip to content

Commit e56e0be

Browse files
committed
25.11 is Xantusia
1 parent f575a97 commit e56e0be

File tree

9 files changed

+10
-7
lines changed

9 files changed

+10
-7
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ For new packages please briefly describe the package or provide a link to its ho
2525
- 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
2626
- [ ] 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)
2727
- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
28-
- [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)
28+
- [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)
2929
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
30+
- [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)
3031
- [ ] (Module updates) Added a release notes entry if the change is significant
3132
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module
3233
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).

.github/workflows/periodic-merge-24h.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
into: staging-next-24.11
3232
- from: staging-next-24.11
3333
into: staging-24.11
34-
- from: master
34+
- from: release-25.05
3535
into: staging-next-25.05
3636
- from: staging-next-25.05
3737
into: staging-25.05

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ See [Nix Channel Status](https://status.nixos.org/) for the current channels and
345345
Here's a brief overview of the main Git branches and what channels they're used for:
346346

347347
- `master`: The main branch, used for the unstable channels such as `nixpkgs-unstable`, `nixos-unstable` and `nixos-unstable-small`.
348-
- `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`.
348+
- `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`.
349349

350350
When a channel is updated, a corresponding Git branch is also updated to point to the corresponding commit.
351351
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).

doc/release-notes/release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
This section lists the release notes for each stable version of Nixpkgs and current unstable revision.
44

55
```{=include=} sections
6+
rl-2511.section.md
67
rl-2505.section.md
78
```

doc/release-notes/rl-2511.section.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Nixpkgs 25.11 (2025.11/??) {#sec-nixpkgs-release-25.11}
1+
# Nixpkgs 25.11 ("Xantusia", 2025.11/??) {#sec-nixpkgs-release-25.11}
22

33
## Highlights {#sec-nixpkgs-release-25.11-highlights}
44
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

lib/.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
25.05
1+
25.11

lib/trivial.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ in
439439
On each release the first letter is bumped and a new animal is chosen
440440
starting with that new letter.
441441
*/
442-
codeName = "Warbler";
442+
codeName = "Xantusia";
443443

444444
/**
445445
Returns the current nixpkgs version suffix as string.

nixos/doc/manual/release-notes/release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
This section lists the release notes for each stable version of NixOS and current unstable revision.
44

55
```{=include=} sections
6+
rl-2511.section.md
67
rl-2505.section.md
78
rl-2411.section.md
89
rl-2405.section.md

nixos/doc/manual/release-notes/rl-2511.section.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Release 25.11 (2025.11/??) {#sec-release-25.11}
1+
# Release 25.11 ("Xantusia", 2025.11/??) {#sec-release-25.11}
22

33
## Highlights {#sec-release-25.11-highlights}
44

0 commit comments

Comments
 (0)