diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-03-21 13:04:37 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-03-21 13:04:37 +0100 |
| commit | 94eb74eaade1f98361187b3c90738e41b184584e (patch) | |
| tree | 694db9fcfca62827cc85dbf6867144e1ae037fa0 /nixos/modules/rename.nix | |
| parent | 3760c8c7fde6e8b15d19b063579d05018fc2d8b3 (diff) | |
| parent | 4263c53f668058e0f1a16ddc3703c2e3c72805fc (diff) | |
| download | nixlib-94eb74eaade1f98361187b3c90738e41b184584e.tar nixlib-94eb74eaade1f98361187b3c90738e41b184584e.tar.gz nixlib-94eb74eaade1f98361187b3c90738e41b184584e.tar.bz2 nixlib-94eb74eaade1f98361187b3c90738e41b184584e.tar.lz nixlib-94eb74eaade1f98361187b3c90738e41b184584e.tar.xz nixlib-94eb74eaade1f98361187b3c90738e41b184584e.tar.zst nixlib-94eb74eaade1f98361187b3c90738e41b184584e.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'nixos/modules/rename.nix')
| -rw-r--r-- | nixos/modules/rename.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 3e66679d6fa0..84c874c17f67 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -35,6 +35,9 @@ with lib; (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead") (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead") + (mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead") + (mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead") + # Old Grub-related options. (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]) (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]) |