summary refs log tree commit diff
path: root/nixos/modules/system/boot/loader/loader.nix
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2019-12-10 02:51:19 +0100
committerSilvan Mosberger <contact@infinisil.com>2019-12-10 02:51:19 +0100
commit4ee3e8b21dfeaf236b86a0c109953dd809a77e64 (patch)
tree79bf61d3635aa336cd88d215470be66f489cc267 /nixos/modules/system/boot/loader/loader.nix
parentcd9ace689274fedd7e95dabdc99041d4c799c3dc (diff)
downloadnixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.gz
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.bz2
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.lz
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.xz
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.zst
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.zip
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
Diffstat (limited to 'nixos/modules/system/boot/loader/loader.nix')
-rw-r--r--nixos/modules/system/boot/loader/loader.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/loader/loader.nix b/nixos/modules/system/boot/loader/loader.nix
index 7fbda9ef0f5..01475f79b9c 100644
--- a/nixos/modules/system/boot/loader/loader.nix
+++ b/nixos/modules/system/boot/loader/loader.nix
@@ -3,6 +3,11 @@
 with lib;
 
 {
+  imports = [
+    (mkRenamedOptionModule [ "boot" "loader" "grub" "timeout" ] [ "boot" "loader" "timeout" ])
+    (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "timeout" ] [ "boot" "loader" "timeout" ])
+  ];
+
     options = {
         boot.loader.timeout =  mkOption {
             default = 5;
@@ -12,4 +17,4 @@ with lib;
             '';
         };
     };
-}
\ No newline at end of file
+}