diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 5501dc0c0caf..96d97f6df803 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -35,7 +35,7 @@ jobs: into: staging-next-25.05 - from: staging-next-25.05 into: staging-25.05 - - from: master + - from: release-25.11 into: staging-next-25.11 - from: staging-next-25.11 into: staging-25.11 diff --git a/doc/redirects.json b/doc/redirects.json index 2570eec68018..890d5db0f321 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -298,6 +298,30 @@ "chap-overlays": [ "index.html#chap-overlays" ], + "sec-nixpkgs-release-26.05": [ + "release-notes.html#sec-nixpkgs-release-26.05" + ], + "sec-nixpkgs-release-26.05-highlights": [ + "release-notes.html#sec-nixpkgs-release-26.05-highlights" + ], + "sec-nixpkgs-release-26.05-incompatibilities": [ + "release-notes.html#sec-nixpkgs-release-26.05-incompatibilities" + ], + "sec-nixpkgs-release-26.05-lib": [ + "release-notes.html#sec-nixpkgs-release-26.05-lib" + ], + "sec-nixpkgs-release-26.05-lib-breaking": [ + "release-notes.html#sec-nixpkgs-release-26.05-lib-breaking" + ], + "sec-nixpkgs-release-26.05-lib-deprecations": [ + "release-notes.html#sec-nixpkgs-release-26.05-lib-deprecations" + ], + "sec-nixpkgs-release-26.05-lib-additions-improvements": [ + "release-notes.html#sec-nixpkgs-release-26.05-lib-additions-improvements" + ], + "sec-nixpkgs-release-26.05-notable-changes": [ + "release-notes.html#sec-nixpkgs-release-26.05-notable-changes" + ], "sec-nixpkgs-release-25.11": [ "release-notes.html#sec-nixpkgs-release-25.11" ], diff --git a/doc/release-notes/release-notes.md b/doc/release-notes/release-notes.md index d22faf3a5cfb..dcd7e62d2869 100644 --- a/doc/release-notes/release-notes.md +++ b/doc/release-notes/release-notes.md @@ -3,6 +3,7 @@ This section lists the release notes for each stable version of Nixpkgs and the current unstable revision. ```{=include=} sections +rl-2605.section.md rl-2511.section.md rl-2505.section.md ``` diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index af5fde898449..2f228659cd19 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -1,4 +1,4 @@ -# Nixpkgs 26.05 (2026.05/??) {#sec-nixpkgs-release-26.05} +# Nixpkgs 26.05 ("Yarara", 2026.05/??) {#sec-nixpkgs-release-26.05} ## Highlights {#sec-nixpkgs-release-26.05-highlights} diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index e7a60706ecfe..5c4a6e4bc28c 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -2137,6 +2137,21 @@ "ch-release-notes": [ "release-notes.html#ch-release-notes" ], + "sec-release-26.05": [ + "release-notes.html#sec-release-26.05" + ], + "sec-release-26.05-highlights": [ + "release-notes.html#sec-release-26.05-highlights" + ], + "sec-release-26.05-new-modules": [ + "release-notes.html#sec-release-26.05-new-modules" + ], + "sec-release-26.05-incompatibilities": [ + "release-notes.html#sec-release-26.05-incompatibilities" + ], + "sec-release-26.05-notable-changes": [ + "release-notes.html#sec-release-26.05-notable-changes" + ], "sec-release-25.11": [ "release-notes.html#sec-release-25.11" ], diff --git a/nixos/doc/manual/release-notes/release-notes.md b/nixos/doc/manual/release-notes/release-notes.md index 3889f4890f66..3ed8d134c06d 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-2605.section.md rl-2511.section.md rl-2505.section.md rl-2411.section.md diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 645fd1e4771d..0f7e00d6cb11 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -1,4 +1,4 @@ -# Release 26.05 (2026.05/??) {#sec-release-26.05} +# Release 26.05 ("Yarara", 2026.05/??) {#sec-release-26.05} ## Highlights {#sec-release-26.05-highlights}