From 579f2e8bebb954a103a96b905c27b10f15ef38c7 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 25 Nov 2021 17:19:06 +0100 Subject: [PATCH] Switch to 22.05 as current development release --- .release | 2 +- docs/release-notes/release-notes.adoc | 2 ++ docs/release-notes/rl-2205.adoc | 19 +++++++++++++++++++ docs/usage.adoc | 4 ++-- home-manager/home-manager | 2 +- home-manager/install.nix | 2 +- modules/misc/version.nix | 1 + 7 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 docs/release-notes/rl-2205.adoc diff --git a/.release b/.release index a6cf7c3a7..a01c758c1 100644 --- a/.release +++ b/.release @@ -1 +1 @@ -21.11 +22.05 diff --git a/docs/release-notes/release-notes.adoc b/docs/release-notes/release-notes.adoc index 826b991d5..56bfa20b6 100644 --- a/docs/release-notes/release-notes.adoc +++ b/docs/release-notes/release-notes.adoc @@ -6,6 +6,8 @@ This section lists the release notes for stable versions of Home Manager and the :leveloffset: 1 +include::rl-2205.adoc[] + include::rl-2111.adoc[] include::rl-2105.adoc[] diff --git a/docs/release-notes/rl-2205.adoc b/docs/release-notes/rl-2205.adoc new file mode 100644 index 000000000..55420daa2 --- /dev/null +++ b/docs/release-notes/rl-2205.adoc @@ -0,0 +1,19 @@ +[[sec-release-22.05]] +== Release 22.05 + +This is the current unstable branch and the information in this section is therefore not final. + +[[sec-release-22.05-highlights]] +=== Highlights + +This release has the following notable changes: + +* Nothing has happened. + +[[sec-release-22.05-state-version-changes]] +=== State Version Changes + +The state version in this release includes the changes below. +These changes are only active if the `home.stateVersion` option is set to "22.05" or later. + +* Nothing has happened. diff --git a/docs/usage.adoc b/docs/usage.adoc index d41545c85..285835b29 100644 --- a/docs/usage.adoc +++ b/docs/usage.adoc @@ -51,7 +51,7 @@ A fresh install of Home Manager will generate a minimal `~/.config/nixpkgs/home. # You can update Home Manager without changing this value. See # the Home Manager release notes for a list of state version # changes in each release. - home.stateVersion = "21.11"; + home.stateVersion = "22.05"; # Let Home Manager install and manage itself. programs.home-manager.enable = true; @@ -91,7 +91,7 @@ To satisfy the above setup we should elaborate the `home.nix` file as follows: # You can update Home Manager without changing this value. See # the Home Manager release notes for a list of state version # changes in each release. - home.stateVersion = "21.11"; + home.stateVersion = "22.05"; # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/home-manager/home-manager b/home-manager/home-manager index 990e1e5e8..4128aa90a 100644 --- a/home-manager/home-manager +++ b/home-manager/home-manager @@ -634,7 +634,7 @@ while [[ $# -gt 0 ]]; do export VERBOSE=1 ;; --version) - echo 21.11 + echo 22.05 exit 0 ;; *) diff --git a/home-manager/install.nix b/home-manager/install.nix index 677035706..cf45f14dc 100644 --- a/home-manager/install.nix +++ b/home-manager/install.nix @@ -44,7 +44,7 @@ runCommand "home-manager-install" { # You can update Home Manager without changing this value. See # the Home Manager release notes for a list of state version # changes in each release. - home.stateVersion = "21.11"; + home.stateVersion = "22.05"; # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/modules/misc/version.nix b/modules/misc/version.nix index 270d3bc3d..9673c0ffa 100644 --- a/modules/misc/version.nix +++ b/modules/misc/version.nix @@ -14,6 +14,7 @@ with lib; "21.03" "21.05" "21.11" + "22.05" ]; default = "18.09"; description = ''