nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-01 01:33:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #159014 from jian-lin/fix-nix.buildMachines.mandatoryFeatures

Browse Source
This commit is contained in:
Janne Heß 2022-02-12 22:20:22 +01:00 committed by GitHub
commit 828aab5608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats 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 "-")
(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 "-")))