diff options
| author | linj <linj.dev@outlook.com> | 2022-02-11 02:55:17 +0800 |
|---|---|---|
| committer | linj <linj.dev@outlook.com> | 2022-02-11 02:55:17 +0800 |
| commit | 0bac44db62148b531fd2cc73c47312aff0ab78b4 (patch) | |
| tree | 5c1be71e69f0ee06dc656d65fe8b994d98299bed /nixos | |
| parent | 5f0f509d2216f5cd8ce52d8df7111c851e6f846f (diff) | |
| download | nixlib-0bac44db62148b531fd2cc73c47312aff0ab78b4.tar nixlib-0bac44db62148b531fd2cc73c47312aff0ab78b4.tar.gz nixlib-0bac44db62148b531fd2cc73c47312aff0ab78b4.tar.bz2 nixlib-0bac44db62148b531fd2cc73c47312aff0ab78b4.tar.lz nixlib-0bac44db62148b531fd2cc73c47312aff0ab78b4.tar.xz nixlib-0bac44db62148b531fd2cc73c47312aff0ab78b4.tar.zst nixlib-0bac44db62148b531fd2cc73c47312aff0ab78b4.zip | |
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.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 "-"))) |