From f02d8c95ac8ed75afc93ac8ae502df4e1ac46587 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Jun 2024 12:20:42 +0200 Subject: [PATCH] misc: prepare 24.05 release --- README.md | 6 +++--- docs/user-guide/faq.md | 2 +- docs/user-guide/install.md | 4 ++-- tests/modules/nixos.nix | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index cead99d6..1396a543 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,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 `nixos-unstable`. > -> If you want to use NixVim with nixpkgs 23.11 you should use the `nixos-23.11` branch. +> If you want to use NixVim with nixpkgs 24.05 you should use the `nixos-24.05` branch. For more detail, see the [Installation](https://nix-community.github.io/nixvim/install.html#installation) section of our documentation. @@ -104,7 +104,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-23.11"; + # ref = "nixos-24.05"; }); in { @@ -149,7 +149,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-23.11"; + # url = "github:nix-community/nixvim/nixos-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/docs/user-guide/faq.md b/docs/user-guide/faq.md index 41e90ad4..46a38ed4 100644 --- a/docs/user-guide/faq.md +++ b/docs/user-guide/faq.md @@ -43,7 +43,7 @@ When using NixVim it is possible to encounter an error of the type `attribute 'n ``` This usually means one of two things: -- The nixpkgs version is not in line with NixVim (for example nixpkgs nixos-23.11 is used with NixVim master) +- The nixpkgs version is not in line with NixVim (for example nixpkgs nixos-24.05 is used with NixVim master) - The nixpkgs unstable version used with NixVim is not recent enough. ## How do I create multiple aliases for a single keymap diff --git a/docs/user-guide/install.md b/docs/user-guide/install.md index d4aa6f61..681404c6 100644 --- a/docs/user-guide/install.md +++ b/docs/user-guide/install.md @@ -5,7 +5,7 @@ You must use a `nixpkgs` version compatible with the nixvim version you choose. The `master` 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-23.11` when using NixOS 23.11. +When using a `stable` version you must use the corresponding nixvim branch, for example `nixos-23.05` when using NixOS 23.05. Failure to use the correct branch, or an old revision of nixpkgs will likely result in errors of the form `vimPlugins. attribute not found`. @@ -21,7 +21,7 @@ NixVim is also available for nix flakes, or directly through an import. For a direct import you can add nixvim to your configuration as follows: ```nix -let +let nixvim = import (builtins.fetchGit { url = "https://github.com/nix-community/nixvim"; # When using a different channel you can use `ref = "nixos-"` to set it here diff --git a/tests/modules/nixos.nix b/tests/modules/nixos.nix index 12c0be2c..849dfc8a 100644 --- a/tests/modules/nixos.nix +++ b/tests/modules/nixos.nix @@ -8,7 +8,7 @@ nixpkgs.lib.nixosSystem { modules = [ { - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; boot.loader.systemd-boot.enable = true; fileSystems."/" = { device = "/non/existent/device";