summary refs log tree commit diff
path: root/nixos/modules/misc
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2018-04-22 17:46:09 +0000
committerGitHub <noreply@github.com>2018-04-22 17:46:09 +0000
commitf442bfc02a2d428019db9cce57478b6ad9b83d5a (patch)
tree64f9e5ad13bda902a81a76f8e50f93a70d23f74d /nixos/modules/misc
parenta3a2ae65d7ee0ace9e316125b85422fd02937a3a (diff)
parentb57a6e9a5f5690a11e6e8013c764bd091ca2a8ca (diff)
downloadnixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.tar
nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.tar.gz
nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.tar.bz2
nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.tar.lz
nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.tar.xz
nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.tar.zst
nixlib-f442bfc02a2d428019db9cce57478b6ad9b83d5a.zip
Merge pull request #39048 from oxij/nixos/fix-rename-bugs
nixos: fix rename.nix bugs
Diffstat (limited to 'nixos/modules/misc')
-rw-r--r--nixos/modules/misc/version.nix15
1 files changed, 0 insertions, 15 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;