From 4ee3e8b21dfeaf236b86a0c109953dd809a77e64 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 10 Dec 2019 02:51:19 +0100 Subject: nixos/treewide: Move rename.nix imports to their respective modules A centralized list for these renames is not good because: - It breaks disabledModules for modules that have a rename defined - Adding/removing renames for a module means having to find them in the central file - Merge conflicts due to multiple people editing the central file --- nixos/modules/services/misc/nix-daemon.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nixos/modules/services/misc/nix-daemon.nix') diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index dcec4d4fc6c..24780446d50 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -68,6 +68,10 @@ let in { + imports = [ + (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ]) + (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ]) + ]; ###### interface -- cgit 1.4.1