From 2c28f1de7cdc10be556d2106108411dd2482794b Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 22 May 2023 21:14:06 +0200 Subject: [PATCH] 23.11 is Tapir --- .github/workflows/periodic-merge-24h.yml | 4 ++++ .version | 2 +- lib/trivial.nix | 2 +- nixos/doc/manual/release-notes/release-notes.md | 1 + nixos/doc/manual/release-notes/rl-2311.section.md | 12 ++++++++++++ 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 nixos/doc/manual/release-notes/rl-2311.section.md diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index ae39d6cfefe2..dd0c1a233300 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -38,6 +38,10 @@ jobs: into: staging-next-22.11 - from: staging-next-22.11 into: staging-22.11 + - from: release-23.05 + into: staging-next-23.05 + - from: staging-next-23.05 + into: staging-23.05 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - uses: actions/checkout@v3 diff --git a/.version b/.version index f8c860969712..38549cd85683 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -23.05 +23.11 diff --git a/lib/trivial.nix b/lib/trivial.nix index 17e83d58b7d7..26e4b32400f2 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -195,7 +195,7 @@ rec { On each release the first letter is bumped and a new animal is chosen starting with that new letter. */ - codeName = "Stoat"; + codeName = "Tapir"; /* Returns the current nixpkgs version suffix as string. */ versionSuffix = diff --git a/nixos/doc/manual/release-notes/release-notes.md b/nixos/doc/manual/release-notes/release-notes.md index ac61de3793e8..3f926fb21a5c 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-2311.section.md rl-2305.section.md rl-2211.section.md rl-2205.section.md diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md new file mode 100644 index 000000000000..b5531584db39 --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -0,0 +1,12 @@ +# Release 23.11 (“Tapir”, 2023.11/??) {#sec-release-23.11} + +## Highlights {#sec-release-23.11-highlights} + +## New Services {#sec-release-23.11-new-services} + + + +## Backward Incompatibilities {#sec-release-23.11-incompatibilities} + +## Other Notable Changes {#sec-release-23.11-notable-changes} +