Skip to content

Commit

Permalink
Update documentation for release 20.03
Browse files Browse the repository at this point in the history
  • Loading branch information
rycee committed Apr 22, 2020
1 parent 7613fd1 commit 42e4eef
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.

Expand Down
12 changes: 6 additions & 6 deletions doc/installation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@
if you are following Nixpkgs master or an unstable channel and
</para>
<screen>
<prompt>$</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager</userinput>
<prompt>$</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager</userinput>
<prompt>$</prompt> <userinput>nix-channel --update</userinput>
</screen>
<para>
if you follow a Nixpkgs version 19.09 channel.
if you follow a Nixpkgs version 20.03 channel.
</para>
<para>
On NixOS you may need to log out and back in for the channel to become
Expand Down Expand Up @@ -169,12 +169,12 @@ $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
</para>

<screen>
<prompt>#</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager</userinput>
<prompt>#</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager</userinput>
<prompt>#</prompt> <userinput>nix-channel --update</userinput>
</screen>

<para>
if you follow a Nixpkgs version 19.09 channel.
if you follow a Nixpkgs version 20.03 channel.
</para>

<para>
Expand Down Expand Up @@ -268,12 +268,12 @@ home-manager.useGlobalPkgs = true;
</para>

<screen>
<prompt>#</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager</userinput>
<prompt>#</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager</userinput>
<prompt>#</prompt> <userinput>nix-channel --update</userinput>
</screen>

<para>
if you follow a Nixpkgs version 19.09 channel.
if you follow a Nixpkgs version 20.03 channel.
</para>

<para>
Expand Down
5 changes: 2 additions & 3 deletions doc/release-notes/rl-2003.adoc
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion home-manager/install.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/misc/version.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 42e4eef

Please sign in to comment.