summary refs log tree commit diff
path: root/nixos/modules/services/misc/nix-daemon.nix
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2020-08-29 22:38:25 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2020-08-29 22:39:24 -0500
commitfc726e34948e35c47053514dab437b644fe9e047 (patch)
tree62be2f87d3c40fe9bb4a339a13f28473415bf56f /nixos/modules/services/misc/nix-daemon.nix
parent10ee14442dc94c1db1bb250fb8ca2ee9afa17201 (diff)
downloadnixpkgs-fc726e34948e35c47053514dab437b644fe9e047.tar
nixpkgs-fc726e34948e35c47053514dab437b644fe9e047.tar.gz
nixpkgs-fc726e34948e35c47053514dab437b644fe9e047.tar.bz2
nixpkgs-fc726e34948e35c47053514dab437b644fe9e047.tar.lz
nixpkgs-fc726e34948e35c47053514dab437b644fe9e047.tar.xz
nixpkgs-fc726e34948e35c47053514dab437b644fe9e047.tar.zst
nixpkgs-fc726e34948e35c47053514dab437b644fe9e047.zip
Revert "nixos/nix-daemon.nix: assert distributedBuilds and buildMachines!=[]"
This reverts commit 67b6e5639126ab6e8ec5d2b303aa9736a626b609.
This reverts commit 250885d0caed9ab910e801d7a3c21d6f83d4cdae.

Causes issues for some configs, see https://github.com/NixOS/nixpkgs/commit/67b6e5639126ab6e8ec5d2b303aa9736a626b609
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix7
1 files changed, 0 insertions, 7 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 924a007efc6..0fbc9cecb4d 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -500,13 +500,6 @@ in
 
   config = {
 
-    assertions = [
-      {
-        assertion = config.nix.distributedBuilds || config.nix.buildMachines == [];
-        message = "You must set `nix.distributedBuilds = true` to use nix.buildMachines";
-      }
-    ];
-
     nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
     nix.binaryCaches = [ "https://cache.nixos.org/" ];