Skip to content

treewide: prepare nixos-25.05 release (backport #3372) #3373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/build_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ jobs:
"branch": "main",
"nixpkgsBranch": "nixos-unstable"
},
{
"branch": "nixos-25.05",
"nixpkgsBranch": "nixos-25.05",
"subPath": "25.05"
},
{
"branch": "nixos-24.11",
"nixpkgsBranch": "nixos-24.11",
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ If you have any question, please use the [discussions page](https://github.com/n
> NixVim needs to be installed with a compatible nixpkgs version.
> This means that the `main` branch of NixVim requires to be installed with `nixpkgs-unstable`.
>
> If you want to use NixVim with nixpkgs 24.11 you should use the `nixos-24.11` branch.
> If you want to use NixVim with nixpkgs 25.05 you should use the `nixos-25.05` branch.

For more detail, see the [Installation](https://nix-community.github.io/nixvim) section of our documentation.

Expand All @@ -108,7 +108,7 @@ let
nixvim = import (builtins.fetchGit {
url = "https://github.com/nix-community/nixvim";
# If you are not running an unstable channel of nixpkgs, select the corresponding branch of nixvim.
# ref = "nixos-24.11";
# ref = "nixos-25.05";
});
in
{
Expand Down Expand Up @@ -151,7 +151,7 @@ flakes, just add the nixvim input:
inputs.nixvim = {
url = "github:nix-community/nixvim";
# If you are not running an unstable channel of nixpkgs, select the corresponding branch of nixvim.
# url = "github:nix-community/nixvim/nixos-24.11";
# url = "github:nix-community/nixvim/nixos-25.05";

inputs.nixpkgs.follows = "nixpkgs";
};
Expand Down Expand Up @@ -286,7 +286,7 @@ in pkgs.mkShell {
Documentation is available on this project's GitHub Pages page:
[https://nix-community.github.io/nixvim](https://nix-community.github.io/nixvim)

The stable documentation is also available at [https://nix-community.github.io/nixvim/24.11](https://nix-community.github.io/nixvim/24.11).
The stable documentation is also available at [https://nix-community.github.io/nixvim/25.05](https://nix-community.github.io/nixvim/25.05).

If the option `enableMan` is set to `true` (by default it is), man pages will also
be installed containing the same information, they can be viewed with `man nixvim`.
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ When using Nixvim, it is possible to encounter errors about something not being
```

This usually means one of two things:
- The nixpkgs version is not in line with NixVim (for example nixpkgs nixos-24.11 is used with NixVim master)
- The nixpkgs version is not in line with NixVim (for example nixpkgs nixos-25.05 is used with NixVim master)
- The nixpkgs unstable version used with NixVim is not recent enough.

When building nixvim using flakes and our ["standalone mode"][standalone], we usually recommend _not_ declaring a "follows" for `inputs.nixvim`.
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ You must use a `nixpkgs` version compatible with the nixvim version you choose.
The `main` branch requires to use a _very recent_ version of nixpkgs unstable.
In order to guarantee the compatibility between nixvim & nixpkgs it is recommended to always update both at the same time.

When using a `stable` version you must use the corresponding nixvim branch, for example `nixos-24.11` when using NixOS 24.11.
When using a `stable` version you must use the corresponding nixvim branch, for example `nixos-25.05` when using NixOS 25.05.

Failure to use the correct branch, or an old revision of nixpkgs will likely result in errors of the form `vimPlugins.<name> attribute not found`.

Expand Down
2 changes: 1 addition & 1 deletion tests/platforms/hm-extra-files-byte-compiling.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let
home = {
username = "nixvim";
homeDirectory = "/invalid/dir";
stateVersion = "24.11";
stateVersion = "25.05";
};

programs.nixvim = {
Expand Down
2 changes: 1 addition & 1 deletion tests/platforms/hm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ self.inputs.home-manager.lib.homeManagerConfiguration {
home.username = "nixvim";
home.homeDirectory = "/invalid/dir";

home.stateVersion = "24.11";
home.stateVersion = "25.05";

programs.nixvim = {
enable = true;
Expand Down
2 changes: 1 addition & 1 deletion tests/platforms/nixos.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ self.inputs.nixpkgs.lib.nixosSystem {

modules = [
{
system.stateVersion = "24.11";
system.stateVersion = "25.05";
boot.loader.systemd-boot.enable = true;
fileSystems."/" = {
device = "/non/existent/device";
Expand Down