about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2023-07-07 10:57:51 +0200
committerSandro Jäckel <sandro.jaeckel@gmail.com>2023-07-07 11:01:12 +0200
commit88d7aa56e14ea80d6005f3d1646bf6dad13f8673 (patch)
treedec86f31557fa9b1de8fa30819bc7250a340f945
parent7e9437ceac3036e82ccd22481592c7adeed911e7 (diff)
downloadnixlib-88d7aa56e14ea80d6005f3d1646bf6dad13f8673.tar
nixlib-88d7aa56e14ea80d6005f3d1646bf6dad13f8673.tar.gz
nixlib-88d7aa56e14ea80d6005f3d1646bf6dad13f8673.tar.bz2
nixlib-88d7aa56e14ea80d6005f3d1646bf6dad13f8673.tar.lz
nixlib-88d7aa56e14ea80d6005f3d1646bf6dad13f8673.tar.xz
nixlib-88d7aa56e14ea80d6005f3d1646bf6dad13f8673.tar.zst
nixlib-88d7aa56e14ea80d6005f3d1646bf6dad13f8673.zip
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.
-rw-r--r--nixos/modules/config/nix-remote-build.nix4
-rw-r--r--nixos/modules/services/system/nix-daemon.nix2
2 files changed, 0 insertions, 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.")