From fc726e34948e35c47053514dab437b644fe9e047 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 29 Aug 2020 22:38:25 -0500 Subject: [PATCH] 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 --- nixos/modules/services/misc/nix-daemon.nix | 7 ------- 1 file changed, 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/" ];