Merge pull request #39048 from oxij/nixos/fix-rename-bugs

nixos: fix rename.nix bugs
2018-04-22 17:46:09 +00:00
parent a3a2ae65d7 b57a6e9a5f
commit f442bfc02a
2 changed files with 9 additions and 26 deletions
@@ -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;