pyrox.dev
lol
Merge pull request #193404 from evrim/master
nix-daemon module: fix mandatoryFeatures in nix.buildMachines
authored by
Linus Heckemann
and committed by
GitHub
3f7fa3fe
46fc0f49
+4
-2
+4
-2
nixos/modules/services/misc/nix-daemon.nix
+4
-2
nixos/modules/services/misc/nix-daemon.nix
···
685
685
(if machine.sshKey != null then machine.sshKey else "-")
686
686
(toString machine.maxJobs)
687
687
(toString machine.speedFactor)
688
-
(concatStringsSep "," (machine.supportedFeatures ++ machine.mandatoryFeatures))
689
-
(concatStringsSep "," machine.mandatoryFeatures)
688
+
(let res = (machine.supportedFeatures ++ machine.mandatoryFeatures);
689
+
in if (res == []) then "-" else (concatStringsSep "," res))
690
+
(let res = machine.mandatoryFeatures;
691
+
in if (res == []) then "-" else (concatStringsSep "," machine.mandatoryFeatures))
690
692
]
691
693
++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-")))
692
694
+ "\n"