From 07de9b62cce851d0dbb707c082957d00a202f47e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 6 Jul 2023 19:48:22 +0200 Subject: [PATCH] nixos/*nix*: Add imports as inherently necessary Albeit not technically necessary because of nixos//module-list.nix --- nixos/modules/config/nix-remote-build.nix | 4 ++++ nixos/modules/services/system/nix-daemon.nix | 2 ++ 2 files changed, 6 insertions(+) diff --git a/nixos/modules/config/nix-remote-build.nix b/nixos/modules/config/nix-remote-build.nix index 2a30bbdc746d..c5ffcc8cf0aa 100644 --- a/nixos/modules/config/nix-remote-build.nix +++ b/nixos/modules/config/nix-remote-build.nix @@ -43,6 +43,10 @@ let in { + imports = [ + ./nix.nix + ]; + options = { nix = { buildMachines = mkOption { diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix index 51b87bf585c4..72e177dd1775 100644 --- a/nixos/modules/services/system/nix-daemon.nix +++ b/nixos/modules/services/system/nix-daemon.nix @@ -33,6 +33,8 @@ in { imports = [ + ../../config/nix.nix + (mkRenamedOptionModuleWith { sinceRelease = 2205; from = [ "nix" "daemonIONiceLevel" ]; to = [ "nix" "daemonIOSchedPriority" ]; }) (mkRenamedOptionModuleWith { sinceRelease = 2211; from = [ "nix" "readOnlyStore" ]; to = [ "boot" "readOnlyNixStore" ]; }) (mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.")