Merge pull request #37955 from mayflower/fix/nixops-pre-1.6-eval
nixos/version: fix nixops pre 1.6 compatibility
This commit is contained in:
commit
e0ae89007b
|
@ -16,6 +16,21 @@ in
|
||||||
|
|
||||||
options.system = {
|
options.system = {
|
||||||
|
|
||||||
|
# XXX: Reintroduce old options to make nixops before 1.6 able to evaluate configurations
|
||||||
|
# XXX: Remove after nixops has been bumped to a compatible version
|
||||||
|
nixosVersion = mkOption {
|
||||||
|
readOnly = true;
|
||||||
|
internal = true;
|
||||||
|
type = types.str;
|
||||||
|
default = config.system.nixos.version;
|
||||||
|
};
|
||||||
|
nixosVersionSuffix = mkOption {
|
||||||
|
readOnly = true;
|
||||||
|
internal = true;
|
||||||
|
type = types.str;
|
||||||
|
default = config.system.nixos.versionSuffix;
|
||||||
|
};
|
||||||
|
|
||||||
nixos.version = mkOption {
|
nixos.version = mkOption {
|
||||||
internal = true;
|
internal = true;
|
||||||
type = types.str;
|
type = types.str;
|
||||||
|
|
|
@ -196,9 +196,9 @@ with lib;
|
||||||
(mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ])
|
(mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ])
|
||||||
|
|
||||||
# misc/version.nix
|
# misc/version.nix
|
||||||
(mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ])
|
#(mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ])
|
||||||
(mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ])
|
(mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ])
|
||||||
(mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ])
|
#(mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ])
|
||||||
(mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ])
|
(mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ])
|
||||||
(mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ])
|
(mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ])
|
||||||
(mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ])
|
(mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ])
|
||||||
|
|
Loading…
Reference in a new issue