From 0bac44db62148b531fd2cc73c47312aff0ab78b4 Mon Sep 17 00:00:00 2001 From: linj Date: Fri, 11 Feb 2022 02:55:17 +0800 Subject: nixos/nix-daemon: readd mandatoryFeatures to final supportedFeatures In #139075, mandatoryFeatures was removed from the generated supportedFeatures, which breaks backward compatibility and is different from what the description of supportedFeatures says. --- nixos/modules/services/misc/nix-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index ea57292fc4bf..a401458c4169 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -680,7 +680,7 @@ in (if machine.sshKey != null then machine.sshKey else "-") (toString machine.maxJobs) (toString machine.speedFactor) - (concatStringsSep "," machine.supportedFeatures) + (concatStringsSep "," (machine.supportedFeatures ++ machine.mandatoryFeatures)) (concatStringsSep "," machine.mandatoryFeatures) ] ++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-"))) -- cgit 1.4.1