gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/nix-daemon: readd mandatoryFeatures to final supportedFeatures

Browse Source 
In #139075, mandatoryFeatures was removed from the generated
supportedFeatures, which breaks backward compatibility and is
different from what the description of supportedFeatures says.
This commit is contained in:
linj
2022-02-11 02:55:17 +08:00
parent 5f0f509d22
commit 0bac44db62
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/nix-daemon.nix
View File

@@ -680,7 +680,7 @@ in
(if machine.sshKey != null then machine.sshKey else "-") (if machine.sshKey != null then machine.sshKey else "-")
(toString machine.maxJobs) (toString machine.maxJobs)
(toString machine.speedFactor) (toString machine.speedFactor)
(concatStringsSep "," machine.supportedFeatures) (concatStringsSep "," (machine.supportedFeatures ++ machine.mandatoryFeatures))
(concatStringsSep "," machine.mandatoryFeatures) (concatStringsSep "," machine.mandatoryFeatures)
] ]
++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-"))) ++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-")))