diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-03-29 14:44:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 14:44:27 +0000 |
| commit | e0ae89007bad6e6b9c9fbf1fee1a5304be18f277 (patch) | |
| tree | a4f12392db362d23567deecf0d373acc2c9285cb /nixos | |
| parent | 974386dfba4714e0f4b4b5df092f8ed32ba581a6 (diff) | |
| parent | 70c6f6572dda0f2516bad812857ef814ec710a12 (diff) | |
| download | nixpkgs-e0ae89007bad6e6b9c9fbf1fee1a5304be18f277.tar nixpkgs-e0ae89007bad6e6b9c9fbf1fee1a5304be18f277.tar.gz nixpkgs-e0ae89007bad6e6b9c9fbf1fee1a5304be18f277.tar.bz2 nixpkgs-e0ae89007bad6e6b9c9fbf1fee1a5304be18f277.tar.lz nixpkgs-e0ae89007bad6e6b9c9fbf1fee1a5304be18f277.tar.xz nixpkgs-e0ae89007bad6e6b9c9fbf1fee1a5304be18f277.tar.zst nixpkgs-e0ae89007bad6e6b9c9fbf1fee1a5304be18f277.zip | |
Merge pull request #37955 from mayflower/fix/nixops-pre-1.6-eval
nixos/version: fix nixops pre 1.6 compatibility
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/misc/version.nix | 15 | ||||
| -rw-r--r-- | nixos/modules/rename.nix | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index b8f0a223c91..7519d917698 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -16,6 +16,21 @@ in 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 { internal = true; type = types.str; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index b0ca274b939..28863434375 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -196,9 +196,9 @@ with lib; (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ]) # 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" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ]) + #(mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ]) (mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ]) (mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ]) (mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ]) |