diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-04-17 09:03:05 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-04-17 09:05:20 +0000 |
| commit | 4018d44641afb0312348c0a6c846331ec5224943 (patch) | |
| tree | 8011b6353bc036c2a6c9bdc39d9e9ee2a44e6d41 /nixos/modules | |
| parent | e0c9a255882e7a9da4604aeb561f28c72046fece (diff) | |
| download | nixlib-4018d44641afb0312348c0a6c846331ec5224943.tar nixlib-4018d44641afb0312348c0a6c846331ec5224943.tar.gz nixlib-4018d44641afb0312348c0a6c846331ec5224943.tar.bz2 nixlib-4018d44641afb0312348c0a6c846331ec5224943.tar.lz nixlib-4018d44641afb0312348c0a6c846331ec5224943.tar.xz nixlib-4018d44641afb0312348c0a6c846331ec5224943.tar.zst nixlib-4018d44641afb0312348c0a6c846331ec5224943.zip | |
Revert "nixos/version: fix nixops pre 1.6 compatibility"
This reverts commit 70c6f6572dda0f2516bad812857ef814ec710a12.
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/misc/version.nix | 15 | ||||
| -rw-r--r-- | nixos/modules/rename.nix | 4 |
2 files changed, 2 insertions, 17 deletions
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 7519d9176982..b8f0a223c910 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -16,21 +16,6 @@ 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 0c3ac054292d..ff90547b8a31 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -197,9 +197,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" ]) |