summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2017-02-14 22:58:11 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2017-02-15 07:25:33 +0100
commitb1bfe9d3db71de1aa9524ec76b188cfe4cd7dd3e (patch)
tree46cdb0e128a47c0f2e4b0a53cda727297e898bd1 /nixos
parent34c1b74421f2c158dfb9f54c2855fd7b74ba1bc7 (diff)
downloadnixlib-b1bfe9d3db71de1aa9524ec76b188cfe4cd7dd3e.tar
nixlib-b1bfe9d3db71de1aa9524ec76b188cfe4cd7dd3e.tar.gz
nixlib-b1bfe9d3db71de1aa9524ec76b188cfe4cd7dd3e.tar.bz2
nixlib-b1bfe9d3db71de1aa9524ec76b188cfe4cd7dd3e.tar.lz
nixlib-b1bfe9d3db71de1aa9524ec76b188cfe4cd7dd3e.tar.xz
nixlib-b1bfe9d3db71de1aa9524ec76b188cfe4cd7dd3e.tar.zst
nixlib-b1bfe9d3db71de1aa9524ec76b188cfe4cd7dd3e.zip
nixos: hint about security.setuidOwners/Programs -> security.wrappers
Let users know about the option rename / change during nixos-rebuild
with a useful message instead of an error (with no way forward).
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/rename.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index e419474b3e32..ee68f8bff81a 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -32,6 +32,9 @@ with lib;
 
     (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ])
 
+    (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead")
+    (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead")
+
     # Old Grub-related options.
     (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])
     (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ])