From f46891fc0adbbd443e3b094203c7cec31cf7cda9 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 22 Nov 2024 10:22:28 +0100 Subject: [PATCH] home-manager: prepare 24.11 release (cherry picked from commit 4964f3c6fc17ae4578e762d3dc86b10fe890860e) --- README.md | 4 ++-- docs/manual/installation/nix-darwin.md | 6 +++--- docs/manual/installation/nixos.md | 6 +++--- docs/manual/installation/standalone.md | 4 ++-- docs/manual/nix-flakes/standalone.md | 6 +++--- docs/manual/usage/configuration.md | 4 ++-- docs/release-notes/rl-2411.md | 5 ++--- home-manager/home-manager | 4 ++-- modules/misc/uninstall.nix | 2 +- tests/integration/nixos/basics.nix | 2 +- tests/integration/standalone/alice-home-init.nix | 2 +- tests/integration/standalone/alice-home-next.nix | 2 +- tests/integration/standalone/kitty-theme-bad-home.nix | 2 +- tests/integration/standalone/kitty-theme-good-home.nix | 2 +- 14 files changed, 25 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 075ccaae8..d90efb9e6 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Releases 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-24.05`). These branches get +corresponding to NixOS releases (e.g. `release-24.11`). These branches get fixes, but usually not new modules. If you need a module to be backported, then feel free to open an issue. @@ -49,7 +49,7 @@ dconf store and cannot tell whether a configuration that it is about to be overwritten was from a previous Home Manager generation or from manual configuration. -Home Manager targets [NixOS][] unstable and NixOS version 24.05 (the current +Home Manager targets [NixOS][] unstable and NixOS version 24.11 (the current stable version), it may or may not work on other Linux distributions and NixOS versions. diff --git a/docs/manual/installation/nix-darwin.md b/docs/manual/installation/nix-darwin.md index f10253064..97ff95dab 100644 --- a/docs/manual/installation/nix-darwin.md +++ b/docs/manual/installation/nix-darwin.md @@ -15,10 +15,10 @@ $ nix-channel --add https://github.com/nix-community/home-manager/archive/master $ nix-channel --update ``` -and if you follow a Nixpkgs version 24.05 channel, you can run +and if you follow a Nixpkgs version 24.11 channel, you can run ``` shell -$ nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager +$ nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager $ nix-channel --update ``` @@ -45,7 +45,7 @@ home-manager.users.eve = { pkgs, ... }: { # The state version is required and should stay at the version you # originally installed. - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; }; ``` diff --git a/docs/manual/installation/nixos.md b/docs/manual/installation/nixos.md index d432a54be..6c9807ee8 100644 --- a/docs/manual/installation/nixos.md +++ b/docs/manual/installation/nixos.md @@ -17,10 +17,10 @@ $ sudo nix-channel --add https://github.com/nix-community/home-manager/archive/m $ sudo nix-channel --update ``` -and if you follow a Nixpkgs version 24.05 channel, you can run +and if you follow a Nixpkgs version 24.11 channel, you can run ``` shell -$ sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager +$ sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager $ sudo nix-channel --update ``` @@ -44,7 +44,7 @@ home-manager.users.eve = { pkgs, ... }: { # The state version is required and should stay at the version you # originally installed. - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; }; ``` diff --git a/docs/manual/installation/standalone.md b/docs/manual/installation/standalone.md index 4afb7f347..4d430af9d 100644 --- a/docs/manual/installation/standalone.md +++ b/docs/manual/installation/standalone.md @@ -19,10 +19,10 @@ $ nix-channel --update ``` - and if you follow a Nixpkgs version 24.05 channel you can run + and if you follow a Nixpkgs version 24.11 channel you can run ``` shell - $ nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager + $ nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager $ nix-channel --update ``` diff --git a/docs/manual/nix-flakes/standalone.md b/docs/manual/nix-flakes/standalone.md index fc967f460..4cfac424c 100644 --- a/docs/manual/nix-flakes/standalone.md +++ b/docs/manual/nix-flakes/standalone.md @@ -11,10 +11,10 @@ then to generate and activate a basic configuration run the command $ nix run home-manager/master -- init --switch ``` -For Nixpkgs or NixOS version 24.05 run +For Nixpkgs or NixOS version 24.11 run ``` shell -$ nix run home-manager/release-24.05 -- init --switch +$ nix run home-manager/release-24.11 -- init --switch ``` This will generate a `flake.nix` and a `home.nix` file in @@ -30,7 +30,7 @@ $ # Edit files in ~/.config/home-manager $ nix run home-manager/$branch -- init --switch ``` -Where `$branch` is one of `master` or `release-24.05`. +Where `$branch` is one of `master` or `release-24.11`. After the initial activation has completed successfully then building and activating your flake-based configuration is as simple as diff --git a/docs/manual/usage/configuration.md b/docs/manual/usage/configuration.md index deb046a6b..868b93521 100644 --- a/docs/manual/usage/configuration.md +++ b/docs/manual/usage/configuration.md @@ -20,7 +20,7 @@ A fresh install of Home Manager will generate a minimal # 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 = "24.05"; + home.stateVersion = "24.11"; # Let Home Manager install and manage itself. programs.home-manager.enable = true; @@ -65,7 +65,7 @@ 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 = "24.05"; + home.stateVersion = "24.11"; # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/docs/release-notes/rl-2411.md b/docs/release-notes/rl-2411.md index 626624640..c03394c54 100644 --- a/docs/release-notes/rl-2411.md +++ b/docs/release-notes/rl-2411.md @@ -1,7 +1,6 @@ # Release 24.11 {#sec-release-24.11} -This is the current unstable branch and the information in this section -is therefore not final. +The 24.05 release branch became stable in November, 2024. ## Highlights {#sec-release-24.11-highlights} @@ -29,4 +28,4 @@ The state version in this release includes the changes below. These changes are only active if the `home.stateVersion` option is set to \"24.11\" or later. -- No changes. +- There was no state version change in this release. diff --git a/home-manager/home-manager b/home-manager/home-manager index ea2f1c91d..7e7f2625f 100644 --- a/home-manager/home-manager +++ b/home-manager/home-manager @@ -359,7 +359,7 @@ $xdgVars # You should not change this value, even if you update Home Manager. If you do # want to update the value, then make sure to first check the Home Manager # release notes. - home.stateVersion = "24.05"; # Please read the comment before changing. + home.stateVersion = "24.11"; # Please read the comment before changing. # The home.packages option allows you to install Nix packages into your # environment. @@ -857,7 +857,7 @@ function doUninstall() { uninstall = true; home.username = "$USER"; home.homeDirectory = "$HOME"; - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; } EOF # shellcheck disable=2064 diff --git a/modules/misc/uninstall.nix b/modules/misc/uninstall.nix index b34732b0b..3086d21b8 100644 --- a/modules/misc/uninstall.nix +++ b/modules/misc/uninstall.nix @@ -21,7 +21,7 @@ in { config = mkIf config.uninstall { home.packages = lib.mkForce [ ]; home.file = lib.mkForce { }; - home.stateVersion = lib.mkForce "24.05"; + home.stateVersion = lib.mkForce "24.11"; home.enableNixpkgsReleaseCheck = lib.mkForce false; manual.manpages.enable = lib.mkForce false; news.display = lib.mkForce "silent"; diff --git a/tests/integration/nixos/basics.nix b/tests/integration/nixos/basics.nix index 41bddefea..61c6b3e49 100644 --- a/tests/integration/nixos/basics.nix +++ b/tests/integration/nixos/basics.nix @@ -17,7 +17,7 @@ }; home-manager.users.alice = { ... }: { - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; home.file.test.text = "testfile"; # Enable a light-weight systemd service. services.pueue.enable = true; diff --git a/tests/integration/standalone/alice-home-init.nix b/tests/integration/standalone/alice-home-init.nix index ab9786f80..e09fad68b 100644 --- a/tests/integration/standalone/alice-home-init.nix +++ b/tests/integration/standalone/alice-home-init.nix @@ -13,7 +13,7 @@ # You should not change this value, even if you update Home Manager. If you do # want to update the value, then make sure to first check the Home Manager # release notes. - home.stateVersion = "24.05"; # Please read the comment before changing. + home.stateVersion = "24.11"; # Please read the comment before changing. # The home.packages option allows you to install Nix packages into your # environment. diff --git a/tests/integration/standalone/alice-home-next.nix b/tests/integration/standalone/alice-home-next.nix index 6f948b0b4..577214a4f 100644 --- a/tests/integration/standalone/alice-home-next.nix +++ b/tests/integration/standalone/alice-home-next.nix @@ -3,7 +3,7 @@ { home.username = "alice"; home.homeDirectory = "/home/alice"; - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; home.packages = [ pkgs.hello ]; home.file.test.text = "test"; home.sessionVariables.EDITOR = "emacs"; diff --git a/tests/integration/standalone/kitty-theme-bad-home.nix b/tests/integration/standalone/kitty-theme-bad-home.nix index e4851701b..4c4594173 100644 --- a/tests/integration/standalone/kitty-theme-bad-home.nix +++ b/tests/integration/standalone/kitty-theme-bad-home.nix @@ -1,7 +1,7 @@ { ... }: { home.username = "alice"; home.homeDirectory = "/home/alice"; - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/tests/integration/standalone/kitty-theme-good-home.nix b/tests/integration/standalone/kitty-theme-good-home.nix index f6085b1e1..606724bab 100644 --- a/tests/integration/standalone/kitty-theme-good-home.nix +++ b/tests/integration/standalone/kitty-theme-good-home.nix @@ -2,7 +2,7 @@ home.username = "alice"; home.homeDirectory = "/home/alice"; - home.stateVersion = "24.05"; # Please read the comment before changing. + home.stateVersion = "24.11"; # Please read the comment before changing. # Let Home Manager install and manage itself. programs.home-manager.enable = true;