summary refs log tree commit diff
path: root/nixos/modules/rename.nix
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2018-08-23 23:41:27 +0200
committerBas van Dijk <v.dijk.bas@gmail.com>2018-08-23 23:41:27 +0200
commit551fec44673ea023c303335e762f880d3c28646e (patch)
tree4d726dc291badc45899c225e36f5315ef7f938ee /nixos/modules/rename.nix
parent3f889f30bee92c3f2d5eaf53e56aef68f61efc4a (diff)
parent291de70ed6b736285ae4de6e3e556c0fc86c2348 (diff)
downloadnixlib-551fec44673ea023c303335e762f880d3c28646e.tar
nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.gz
nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.bz2
nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.lz
nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.xz
nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.zst
nixlib-551fec44673ea023c303335e762f880d3c28646e.zip
Merge branch 'master' into es6
Diffstat (limited to 'nixos/modules/rename.nix')
-rw-r--r--nixos/modules/rename.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index fe395c4256bd..b51dcd2976f4 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -9,7 +9,6 @@ with lib;
     (mkRenamedOptionModule [ "system" "nixos" "stateVersion" ] [ "system" "stateVersion" ])
     (mkRenamedOptionModule [ "system" "nixos" "defaultChannel" ] [ "system" "defaultChannel" ])
 
-    (mkRenamedOptionModule [ "dysnomia" ] [ "services" "dysnomia" ])
     (mkRenamedOptionModule [ "environment" "x11Packages" ] [ "environment" "systemPackages" ])
     (mkRenamedOptionModule [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ])
     (mkRenamedOptionModule [ "environment" "nix" ] [ "nix" "package" ])
@@ -258,6 +257,7 @@ with lib;
     (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
     (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.")
     (mkRemovedOptionModule [ "services" "logstash" "enableWeb" ] "The web interface was removed from logstash")
+    (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.")
 
     # ZSH
     (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])