Skip to content

Commit

Permalink
Release NixOS 24.05
Browse files Browse the repository at this point in the history
  • Loading branch information
wegank committed May 31, 2024
1 parent d4a08c1 commit 63dacb4
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration
system, [Hydra](https://hydra.nixos.org/).

* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for the NixOS 23.11 release](https://hydra.nixos.org/jobset/nixos/release-23.11)
* [Continuous package builds for the NixOS 24.05 release](https://hydra.nixos.org/jobset/nixos/release-24.05)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for the NixOS 23.11 release](https://hydra.nixos.org/job/nixos/release-23.11/tested#tabs-constituents)
* [Tests for the NixOS 24.05 release](https://hydra.nixos.org/job/nixos/release-24.05/tested#tabs-constituents)

Artifacts successfully built with Hydra are published to cache at
https://cache.nixos.org/. When successful build and test criteria are
Expand Down
2 changes: 1 addition & 1 deletion nixos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Reviewing process:
- Description, default and example should be provided.
- Ensure that option changes are backward compatible.
- `mkRenamedOptionModuleWith` provides a way to make renamed option backward compatible.
- Use `lib.versionAtLeast config.system.stateVersion "23.11"` on backward incompatible changes which may corrupt, change or update the state stored on existing setups.
- Use `lib.versionAtLeast config.system.stateVersion "24.05"` on backward incompatible changes which may corrupt, change or update the state stored on existing setups.
- Ensure that removed options are declared with `mkRemovedOptionModule`.
- Ensure that changes that are not backward compatible are mentioned in release notes.
- Ensure that documentations affected by the change is updated.
Expand Down
16 changes: 8 additions & 8 deletions nixos/doc/manual/installation/upgrading.chapter.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-23.11`](https://channels.nixos.org/nixos-23.11).
- *Stable channels*, such as [`nixos-24.05`](https://channels.nixos.org/nixos-24.05).
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
Expand All @@ -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-23.11-small`](https://channels.nixos.org/nixos-23.11-small)
- *Small channels*, such as [`nixos-24.05-small`](https://channels.nixos.org/nixos-24.05-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
Expand All @@ -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 23.11 ISO, you will be subscribed to
the `nixos-23.11` channel. To see which NixOS channel you're subscribed
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
to, run the following as root:

```ShellSession
Expand All @@ -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 23.11 stable channel:
use the NixOS 24.05 stable channel:

```ShellSession
# nix-channel --add https://channels.nixos.org/nixos-23.11 nixos
# nix-channel --add https://channels.nixos.org/nixos-24.05 nixos
```

If you have a server, you may want to use the "small" channel instead:

```ShellSession
# nix-channel --add https://channels.nixos.org/nixos-23.11-small nixos
# nix-channel --add https://channels.nixos.org/nixos-24.05-small nixos
```

And if you want to live on the bleeding edge:
Expand Down Expand Up @@ -117,6 +117,6 @@ modules. You can also specify a channel explicitly, e.g.

```nix
{
system.autoUpgrade.channel = "https://channels.nixos.org/nixos-23.11";
system.autoUpgrade.channel = "https://channels.nixos.org/nixos-24.05";
}
```
2 changes: 1 addition & 1 deletion nixos/doc/manual/release-notes/rl-2405.section.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Release 24.05 (“Uakari”, 2024.05/??) {#sec-release-24.05}
# Release 24.05 (“Uakari”, 2024.05/31) {#sec-release-24.05}

Support is planned until the end of December 2024, handing over to 24.11.

Expand Down
2 changes: 1 addition & 1 deletion pkgs/test/check-by-name/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ In turn when running locally, we don't want to have to push commits to test them
and we can also rely on the local Git history to do the mergeability check.

Arguments:
- `BASE_BRANCH`: The base branch to use, e.g. master or release-23.11
- `BASE_BRANCH`: The base branch to use, e.g. master or release-24.05
- `REPOSITORY`: The repository to fetch the base branch from, defaults to https://github.com/NixOS/nixpkgs.git

## `./update-pinned-tool.sh`
Expand Down

0 comments on commit 63dacb4

Please sign in to comment.