diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-07-25 23:22:54 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-07-28 00:12:55 +0300 |
commit | 96190535e526bc1f7b8975d9f6f2f6493060203f (patch) | |
tree | 035be138fdceaef8294f7136a88b496ddf101050 /nixos/modules/virtualisation | |
parent | 28e11a0b6ba740aedcc8be27ff8ef334d187bd37 (diff) | |
download | nixlib-96190535e526bc1f7b8975d9f6f2f6493060203f.tar nixlib-96190535e526bc1f7b8975d9f6f2f6493060203f.tar.gz nixlib-96190535e526bc1f7b8975d9f6f2f6493060203f.tar.bz2 nixlib-96190535e526bc1f7b8975d9f6f2f6493060203f.tar.lz nixlib-96190535e526bc1f7b8975d9f6f2f6493060203f.tar.xz nixlib-96190535e526bc1f7b8975d9f6f2f6493060203f.tar.zst nixlib-96190535e526bc1f7b8975d9f6f2f6493060203f.zip |
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...
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/amazon-options.nix | 2 | ||||
-rw-r--r-- | nixos/modules/virtualisation/containers.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 1a45c3093b78..15de8638bbab 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -3,7 +3,7 @@ options = { ec2 = { hvm = lib.mkOption { - default = lib.versionAtLeast config.system.nixos.stateVersion "17.03"; + default = lib.versionAtLeast config.system.stateVersion "17.03"; internal = true; description = '' Whether the EC2 instance is a HVM instance. diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 31f5f6fe7807..b91165ce3b82 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -607,7 +607,7 @@ in { services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql96; - system.nixos.stateVersion = "17.03"; + system.stateVersion = "17.03"; }; }; } |