diff --git a/LICENSE b/LICENSE index 122b9b4a..2db3938b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017-2020 Robert Helgesson and Home Manager contributors +Copyright (c) 2017-2020 Home Manager contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 0868f1ff..a47f26bc 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,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 20.03 (the +Home Manager targets [NixOS][] unstable and NixOS version 20.09 (the current stable version), it may or may not work on other Linux distributions and NixOS versions. @@ -73,11 +73,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/nix-community/home-manager/archive/release-20.03.tar.gz home-manager + $ nix-channel --add https://github.com/nix-community/home-manager/archive/release-20.09.tar.gz home-manager $ nix-channel --update ``` - if you follow a Nixpkgs version 20.03 channel. + if you follow a Nixpkgs version 20.09 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 @@ -349,7 +349,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-20.03`). These branches get fixes, but usually not new +(e.g. `release-20.09`). 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 bd8d0185..aff05a63 100644 --- a/doc/installation.xml +++ b/doc/installation.xml @@ -69,11 +69,11 @@ if you are following Nixpkgs master or an unstable channel and -$ nix-channel --add https://github.com/nix-community/home-manager/archive/release-20.03.tar.gz home-manager +$ nix-channel --add https://github.com/nix-community/home-manager/archive/release-20.09.tar.gz home-manager $ nix-channel --update - if you follow a Nixpkgs version 20.03 channel. + if you follow a Nixpkgs version 20.09 channel. On NixOS you may need to log out and back in for the channel to become @@ -159,12 +159,12 @@ $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh -# nix-channel --add https://github.com/nix-community/home-manager/archive/release-20.03.tar.gz home-manager +# nix-channel --add https://github.com/nix-community/home-manager/archive/release-20.09.tar.gz home-manager # nix-channel --update - if you follow a Nixpkgs version 20.03 channel. + if you follow a Nixpkgs version 20.09 channel. @@ -258,12 +258,12 @@ home-manager.useGlobalPkgs = true; -# nix-channel --add https://github.com/nix-community/home-manager/archive/release-20.03.tar.gz home-manager +# nix-channel --add https://github.com/nix-community/home-manager/archive/release-20.09.tar.gz home-manager # nix-channel --update - if you follow a Nixpkgs version 20.03 channel. + if you follow a Nixpkgs version 20.09 channel. diff --git a/doc/release-notes/release-notes.adoc b/doc/release-notes/release-notes.adoc index 9a98e385..e89e588f 100644 --- a/doc/release-notes/release-notes.adoc +++ b/doc/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-2103.adoc[] + include::rl-2009.adoc[] include::rl-2003.adoc[] diff --git a/doc/release-notes/rl-2009.adoc b/doc/release-notes/rl-2009.adoc index c1939ab5..bfdef8e9 100644 --- a/doc/release-notes/rl-2009.adoc +++ b/doc/release-notes/rl-2009.adoc @@ -1,8 +1,7 @@ [[sec-release-20.09]] -== Release 20.09 (unreleased) +== Release 20.09 -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 late September, 2020. [[sec-release-20.09-highlights]] === Highlights diff --git a/doc/release-notes/rl-2103.adoc b/doc/release-notes/rl-2103.adoc new file mode 100644 index 00000000..212fa58b --- /dev/null +++ b/doc/release-notes/rl-2103.adoc @@ -0,0 +1,21 @@ +[[sec-release-21.03]] +== Release 21.03 + +This is the current unstable branch and the information in this +section is therefore not final. + +[[sec-release-21.03-highlights]] +=== Highlights + +This release has the following notable changes: + +* Nothing has happened. + +[[sec-release-21.03-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 +"21.03" or later. + +* Nothing has happened. diff --git a/home-manager/install.nix b/home-manager/install.nix index 50b5ea16..01697eb7 100644 --- a/home-manager/install.nix +++ b/home-manager/install.nix @@ -45,7 +45,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 = "20.09"; + home.stateVersion = "21.03"; } EOF fi diff --git a/modules/misc/version.nix b/modules/misc/version.nix index fbeb3ec5..9c742f48 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" "20.09" ]; + type = types.enum [ "18.09" "19.03" "19.09" "20.03" "20.09" "21.03" ]; default = "18.09"; description = '' It is occasionally necessary for Home Manager to change