From a0559c7b2bf243978a759fdaceb8507d9a04e657 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 28 Nov 2024 12:19:08 -0800 Subject: [PATCH] Release 24.11 --- CONTRIBUTING.md | 2 +- .../doc/manual/installation/upgrading.chapter.md | 16 ++++++++-------- .../doc/manual/release-notes/rl-2411.section.md | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f7e159cfef3e..655e57df2829 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-24.11`): The NixOS release branches, used for the stable channels such as `nixos-24.11`, `nixos-24.11-small` and `nixpkgs-24.11-darwin`. +- `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`. 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/nixos/doc/manual/installation/upgrading.chapter.md b/nixos/doc/manual/installation/upgrading.chapter.md index 1a3fc10ec800..86567c7a3d26 100644 --- a/nixos/doc/manual/installation/upgrading.chapter.md +++ b/nixos/doc/manual/installation/upgrading.chapter.md @@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated automatically from NixOS's Git repository after certain tests have passed and all packages have been built. These channels are: -- *Stable channels*, such as [`nixos-24.05`](https://channels.nixos.org/nixos-24.05). +- *Stable channels*, such as [`nixos-24.11`](https://channels.nixos.org/nixos-24.11). These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not @@ -19,7 +19,7 @@ passed and all packages have been built. These channels are: radical changes between channel updates. It's not recommended for production systems. -- *Small channels*, such as [`nixos-24.05-small`](https://channels.nixos.org/nixos-24.05-small) +- *Small channels*, such as [`nixos-24.11-small`](https://channels.nixos.org/nixos-24.11-small) or [`nixos-unstable-small`](https://channels.nixos.org/nixos-unstable-small). These are identical to the stable and unstable channels described above, except that they contain fewer binary packages. This means they get updated @@ -38,8 +38,8 @@ supported stable release. When you first install NixOS, you're automatically subscribed to the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 24.05 ISO, you will be subscribed to -the `nixos-24.05` channel. To see which NixOS channel you're subscribed +instance, if you installed from a 24.11 ISO, you will be subscribed to +the `nixos-24.11` channel. To see which NixOS channel you're subscribed to, run the following as root: ```ShellSession @@ -54,16 +54,16 @@ To switch to a different NixOS channel, do ``` (Be sure to include the `nixos` parameter at the end.) For instance, to -use the NixOS 24.05 stable channel: +use the NixOS 24.11 stable channel: ```ShellSession -# nix-channel --add https://channels.nixos.org/nixos-24.05 nixos +# nix-channel --add https://channels.nixos.org/nixos-24.11 nixos ``` If you have a server, you may want to use the "small" channel instead: ```ShellSession -# nix-channel --add https://channels.nixos.org/nixos-24.05-small nixos +# nix-channel --add https://channels.nixos.org/nixos-24.11-small nixos ``` And if you want to live on the bleeding edge: @@ -117,6 +117,6 @@ modules. You can also specify a channel explicitly, e.g. ```nix { - system.autoUpgrade.channel = "https://channels.nixos.org/nixos-24.05"; + system.autoUpgrade.channel = "https://channels.nixos.org/nixos-24.11"; } ``` diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 4f2420579ec5..91b6d65604ce 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -1,4 +1,4 @@ -# Release 24.11 (“Vicuña”, 2024.11/??) {#sec-release-24.11} +# Release 24.11 (“Vicuña”, 2024.11/28) {#sec-release-24.11}