From edbaea39b7c7ca0dfa2e0a19e456bd63aad7ab25 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Thu, 1 Dec 2022 22:08:54 +0100 Subject: [PATCH] modules/version: remove default stateVersion value The state version is a sensible value that should explicitly set in the users config. Following home-manager: https://github.com/nix-community/home-manager/pull/3043. --- CHANGELOG.md | 3 +++ modules/version.nix | 1 - pkgs/default.nix | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 806195f..8948ce5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,9 @@ name * Add html and man pages with all available options, see and `nix build github:t184256/nix-on-droid#manPages` +* The option `system.stateVersion` does not have a default value anymore. + Previously, its default was `"19.09"` the release the state version was + introduced. ## Release 22.05 diff --git a/modules/version.nix b/modules/version.nix index 15430fa..5b570d6 100644 --- a/modules/version.nix +++ b/modules/version.nix @@ -12,7 +12,6 @@ with lib; system.stateVersion = mkOption { type = types.enum [ "19.09" "20.03" "20.09" "21.05" "21.11" "22.05" ]; - default = "19.09"; description = '' It is occasionally necessary for Nix-on-Droid to change configuration defaults in a way that is incompatible with diff --git a/pkgs/default.nix b/pkgs/default.nix index 92d5c7c..70a28be 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -35,6 +35,8 @@ let pkgs = pkgs.lib.mkForce pkgs; # to override ./modules/nixpkgs/config.nix }; + system.stateVersion = "22.05"; + # Fix invoking bash after initial build. user.shell = "${initialPackageInfo.bash}/bin/bash";