From 96190535e526bc1f7b8975d9f6f2f6493060203f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 25 Jul 2018 23:22:54 +0300 Subject: Revert "nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1" This reverts commit 095fe5b43def40279a243e663c662b02caac5318. Pointless renames considered harmful. All they do is force people to spend extra work updating their configs for no benefit, and hindering the ability to switch between unstable and stable versions of NixOS. Like, what was the value of having the "nixos." there? I mean, by definition anything in a NixOS module has something to do with NixOS... --- nixos/doc/manual/development/releases.xml | 2 +- nixos/doc/manual/release-notes/rl-1509.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nixos/doc/manual') diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index 863110a1c7c..d4e5ff3f431 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -70,7 +70,7 @@ - Bump the system.nixos.defaultChannel attribute in + Bump the system.defaultChannel attribute in nixos/modules/misc/version.nix diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 2465f370cf1..4eb2f9aa0a9 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -433,9 +433,9 @@ system.autoUpgrade.enable = true; default. If you have existing systems with such host keys and want to continue to use them, please set -system.nixos.stateVersion = "14.12"; +system.stateVersion = "14.12"; - The new option ensures that + The new option ensures that certain configuration changes that could break existing systems (such as the sshd host key setting) will maintain compatibility with the specified NixOS release. NixOps sets the state version of -- cgit 1.4.1