From 42e4eef749515a35f632b2273ac34151b49fbc27 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 22 Apr 2020 23:58:00 +0200 Subject: [PATCH] Update documentation for release 20.03 --- README.md | 8 ++++---- doc/installation.xml | 12 ++++++------ doc/release-notes/rl-2003.adoc | 5 ++--- home-manager/install.nix | 2 +- modules/misc/version.nix | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 901da8c9..ee412908 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ will write to your dconf store and cannot tell whether a configuration that it is about to be overwrite was from a previous Home Manager generation or from manual configuration. -Home Manager targets [NixOS][] unstable and NixOS version 19.09 (the +Home Manager targets [NixOS][] unstable and NixOS version 20.03 (the current stable version), it may or may not work on other Linux distributions and NixOS versions. @@ -75,11 +75,11 @@ Currently the easiest way to install Home Manager is as follows: if you are following Nixpkgs master or an unstable channel and ```console - $ nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager + $ nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager $ nix-channel --update ``` - if you follow a Nixpkgs version 19.09 channel. + if you follow a Nixpkgs version 20.03 channel. On NixOS you may need to log out and back in for the channel to become available. On non-NixOS you may have to add @@ -310,7 +310,7 @@ Home Manager is developed against `nixpkgs-unstable` branch, which often causes it to contain tweaks for changes/packages not yet released in stable NixOS. To avoid breaking users' configurations, Home Manager is released in branches corresponding to NixOS releases -(e.g. `release-19.09`). These branches get fixes, but usually not new +(e.g. `release-20.03`). These branches get fixes, but usually not new modules. If you need a module to be backported, then feel free to open an issue. diff --git a/doc/installation.xml b/doc/installation.xml index 9c5d24b3..c46c7cd5 100644 --- a/doc/installation.xml +++ b/doc/installation.xml @@ -79,11 +79,11 @@ if you are following Nixpkgs master or an unstable channel and -$ nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager +$ nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager $ nix-channel --update - if you follow a Nixpkgs version 19.09 channel. + if you follow a Nixpkgs version 20.03 channel. On NixOS you may need to log out and back in for the channel to become @@ -169,12 +169,12 @@ $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh -# nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager +# nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager # nix-channel --update - if you follow a Nixpkgs version 19.09 channel. + if you follow a Nixpkgs version 20.03 channel. @@ -268,12 +268,12 @@ home-manager.useGlobalPkgs = true; -# nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager +# nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager # nix-channel --update - if you follow a Nixpkgs version 19.09 channel. + if you follow a Nixpkgs version 20.03 channel. diff --git a/doc/release-notes/rl-2003.adoc b/doc/release-notes/rl-2003.adoc index 02014bc2..5832e2e5 100644 --- a/doc/release-notes/rl-2003.adoc +++ b/doc/release-notes/rl-2003.adoc @@ -1,8 +1,7 @@ [[sec-release-20.03]] -== Release 20.03 (unreleased) +== Release 20.03 -This is the current unstable branch and the information in this -section is therefore not final. +The 20.03 release branch became the stable branch in April, 2020. [[sec-release-20.03-highlights]] === Highlights diff --git a/home-manager/install.nix b/home-manager/install.nix index 87aae504..92de17bd 100644 --- a/home-manager/install.nix +++ b/home-manager/install.nix @@ -28,7 +28,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 = "19.09"; + home.stateVersion = "20.03"; } EOF fi diff --git a/modules/misc/version.nix b/modules/misc/version.nix index 1352aadc..fbeb3ec5 100644 --- a/modules/misc/version.nix +++ b/modules/misc/version.nix @@ -5,7 +5,7 @@ with lib; { options = { home.stateVersion = mkOption { - type = types.enum [ "18.09" "19.03" "19.09" "20.03" ]; + type = types.enum [ "18.09" "19.03" "19.09" "20.03" "20.09" ]; default = "18.09"; description = '' It is occasionally necessary for Home Manager to change