From 88d7aa56e14ea80d6005f3d1646bf6dad13f8673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 7 Jul 2023 10:57:51 +0200 Subject: [PATCH] nixos/nix*: remove not necessary imports We do not really declare module dependencies anywhere else and it would a nousance to move any file if many other referenced it without being necessary. Also most higher level modules depend on most of the lower level ones. So removing this because it can only potentially cause weird issues. --- nixos/modules/config/nix-remote-build.nix | 4 ---- nixos/modules/services/system/nix-daemon.nix | 2 -- 2 files changed, 6 deletions(-) diff --git a/nixos/modules/config/nix-remote-build.nix b/nixos/modules/config/nix-remote-build.nix index 6bc39f3c7527..98c8fc06d2ee 100644 --- a/nixos/modules/config/nix-remote-build.nix +++ b/nixos/modules/config/nix-remote-build.nix @@ -50,10 +50,6 @@ 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 7e7ebd7adf84..ad86a567b7af 100644 --- a/nixos/modules/services/system/nix-daemon.nix +++ b/nixos/modules/services/system/nix-daemon.nix @@ -40,8 +40,6 @@ 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.")